quintonm 2003/03/08 23:16:45
Modified: src/java/org/apache/turbine/services ServiceBroker.java
BaseInitableBroker.java Initable.java
InitializationException.java InitableBroker.java
BaseServiceBroker.java InstantiationException.java
TurbineBaseService.java ServiceManager.java
Log:
style fixes
Revision Changes Path
1.8 +3 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/ServiceBroker.java
Index: ServiceBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/ServiceBroker.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceBroker.java 9 Mar 2003 03:06:24 -0000 1.7
+++ ServiceBroker.java 9 Mar 2003 07:16:45 -0000 1.8
@@ -97,8 +97,7 @@
* @exception InitializationException if the service is unknown
* or can't be initialized.
*/
- void initService(String name)
- throws InitializationException;
+ void initService(String name) throws InitializationException;
/**
* Shutdowns a Service.
@@ -126,8 +125,7 @@
* @exception InstantiationException if the service is unknown or
* can't be initialized.
*/
- Service getService(String name)
- throws InstantiationException;
+ Service getService(String name) throws InstantiationException;
/**
* Returns the configuration of a specific service. Services
1.8 +8 -7
jakarta-turbine-2/src/java/org/apache/turbine/services/BaseInitableBroker.java
Index: BaseInitableBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/BaseInitableBroker.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseInitableBroker.java 9 Mar 2003 03:06:23 -0000 1.7
+++ BaseInitableBroker.java 9 Mar 2003 07:16:45 -0000 1.8
@@ -124,8 +124,7 @@
* @param data An Object to be used for initialization activities.
* @exception InitializationException Initialization was not successful.
*/
- public void initClass(String className,
- Object data)
+ public void initClass(String className, Object data)
throws InitializationException
{
// make sure that only one thread calls this method recursively
@@ -221,12 +220,14 @@
}
if (!initable.getInit())
{
- // this exception will be caught & rethrown by this very
method.
- // getInit() returning false indicates some initialization
issue,
- // which in turn prevents the InitableBroker from passing a
working
+ // this exception will be caught & rethrown by this
+ // very method. getInit() returning false indicates
+ // some initialization issue, which in turn prevents
+ // the InitableBroker from passing a working
// instance of the initable to the client.
throw new InitializationException(
- "init() failed to initialize class " + className);
+ "init() failed to initialize class "
+ + className);
}
}
}
1.5 +4 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/Initable.java
Index: Initable.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/Initable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Initable.java 9 Mar 2003 03:06:24 -0000 1.4
+++ Initable.java 9 Mar 2003 07:16:45 -0000 1.5
@@ -93,11 +93,10 @@
* throw an exception and complain.
*
* @param data An Object to use for initialization activities.
- * @exception InitializationException, if initilaization of this
+ * @exception InitializationException if initilaization of this
* class was not successful.
*/
- void init(Object data)
- throws InitializationException;
+ void init(Object data) throws InitializationException;
/**
* Performs late initialization of an Initable.
@@ -106,7 +105,7 @@
* will call getInit(), and if it returns false, this method will
* be invoked.
*
- * @exception InitializationException, if initialization of this
+ * @exception InitializationException if initialization of this
* class was not successful.
*/
void init() throws InitializationException;
1.5 +2 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/InitializationException.java
Index: InitializationException.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/InitializationException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InitializationException.java 9 Mar 2003 03:06:24 -0000 1.4
+++ InitializationException.java 9 Mar 2003 07:16:45 -0000 1.5
@@ -65,8 +65,7 @@
* @version $Id$
* @see org.apache.turbine.services.Initable
*/
-public class InitializationException
- extends TurbineException
+public class InitializationException extends TurbineException
{
/**
* Construct an InitializationException with specified detail message.
1.5 +5 -7
jakarta-turbine-2/src/java/org/apache/turbine/services/InitableBroker.java
Index: InitableBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/InitableBroker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InitableBroker.java 9 Mar 2003 03:06:24 -0000 1.4
+++ InitableBroker.java 9 Mar 2003 07:16:45 -0000 1.5
@@ -97,11 +97,10 @@
*
* @param className The name of the class to be initailized.
* @param data An object to be used for initialization activities.
- * @exception InitializationException, if initialization of this
+ * @exception InitializationException if initialization of this
* class was not successful.
*/
- void initClass(String className,
- Object data)
+ void initClass(String className, Object data)
throws InitializationException;
/**
@@ -125,9 +124,8 @@
*
* @param className The name of the Initable requested.
* @return An instance of requested Initable.
- * @exception InstantiationException, if there was a problem
+ * @exception InstantiationException if there was a problem
* during instantiation or initialization of the Initable.
*/
- Initable getInitable(String className)
- throws InstantiationException;
+ Initable getInitable(String className) throws InstantiationException;
}
1.14 +10 -9
jakarta-turbine-2/src/java/org/apache/turbine/services/BaseServiceBroker.java
Index: BaseServiceBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/BaseServiceBroker.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BaseServiceBroker.java 9 Mar 2003 03:06:23 -0000 1.13
+++ BaseServiceBroker.java 9 Mar 2003 07:16:45 -0000 1.14
@@ -83,8 +83,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public abstract class BaseServiceBroker
- implements ServiceBroker
+public abstract class BaseServiceBroker implements ServiceBroker
{
/**
* Mapping of Service names to class names.
@@ -475,8 +474,7 @@
* @exception InstantiationException if the service is unknown or
* can't be initialized.
*/
- public Service getService(String name)
- throws InstantiationException
+ public Service getService(String name) throws InstantiationException
{
Service service;
try
@@ -540,7 +538,8 @@
if (StringUtils.isEmpty(className))
{
throw new InstantiationException(
- "ServiceBroker: unknown service " + name + " requested");
+ "ServiceBroker: unknown service " + name
+ + " requested");
}
try
{
@@ -550,9 +549,10 @@
{
try
{
- service = (Service) Class.forName(className).newInstance();
+ service = (Service)
+ Class.forName(className).newInstance();
}
- // those two errors must be passed to the VM
+ // those two errors must be passed to the VM
catch (ThreadDeath t)
{
throw t;
@@ -593,7 +593,8 @@
catch (ClassCastException e)
{
throw new InstantiationException("ServiceBroker: Class "
- + className + " does not implement Service interface.", e);
+ + className
+ + " does not implement Service interface.", e);
}
catch (InstantiationException e)
{
1.4 +2 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/InstantiationException.java
Index: InstantiationException.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/InstantiationException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InstantiationException.java 9 Mar 2003 03:06:24 -0000 1.3
+++ InstantiationException.java 9 Mar 2003 07:16:45 -0000 1.4
@@ -66,8 +66,7 @@
* @version $Id$
* @see org.apache.turbine.services.Initable
*/
-public class InstantiationException
- extends TurbineRuntimeException
+public class InstantiationException extends TurbineRuntimeException
{
/**
* Construct an InstantiationException with specified detail
1.5 +5 -8
jakarta-turbine-2/src/java/org/apache/turbine/services/TurbineBaseService.java
Index: TurbineBaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/TurbineBaseService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineBaseService.java 9 Mar 2003 03:06:24 -0000 1.4
+++ TurbineBaseService.java 9 Mar 2003 07:16:45 -0000 1.5
@@ -123,8 +123,7 @@
* class was not successful.
* @deprecated Use init() instead
*/
- public void init(ServletConfig config)
- throws InitializationException
+ public void init(ServletConfig config) throws InitializationException
{
}
@@ -132,11 +131,10 @@
* Performs early initialization.
*
* @param data An RunData to use for initialization activities.
- * @exception InitializationException, if initialization of this
+ * @exception InitializationException if initialization of this
* class was not successful.
*/
- public void init(RunData data)
- throws InitializationException
+ public void init(RunData data) throws InitializationException
{
}
@@ -150,8 +148,7 @@
* @exception InitializationException, if initialization of this
* class was not successful.
*/
- public void init()
- throws InitializationException
+ public void init() throws InitializationException
{
setInit(true);
}
1.4 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/ServiceManager.java
Index: ServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/ServiceManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceManager.java 9 Mar 2003 03:06:24 -0000 1.3
+++ ServiceManager.java 9 Mar 2003 07:16:45 -0000 1.4
@@ -96,7 +96,7 @@
/**
* Set the application root.
*
- * @param String application root
+ * @param applicationRoot application root
*/
void setApplicationRoot(String applicationRoot);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
