henning 2002/07/24 08:48:21
Modified: src/java/org/apache/turbine/services/component
TurbineComponentService.java
Log:
Fix up all the checkstyle errors
Revision Changes Path
1.3 +14 -13
jakarta-turbine-2/src/java/org/apache/turbine/services/component/TurbineComponentService.java
Index: TurbineComponentService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/component/TurbineComponentService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineComponentService.java 24 Jul 2002 15:19:50 -0000 1.2
+++ TurbineComponentService.java 24 Jul 2002 15:48:21 -0000 1.3
@@ -55,7 +55,6 @@
*/
import java.util.Iterator;
-import java.util.Properties;
import javax.servlet.ServletConfig;
@@ -64,8 +63,6 @@
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.util.Log;
import org.apache.commons.configuration.BaseConfiguration;
@@ -114,6 +111,10 @@
/**
* Inits the service using servlet parameters to obtain path to the
* configuration file. Change relatives paths.
+ *
+ * @param config The ServletConfiguration from Turbine
+ *
+ * @throws InitializationException Something went wrong when starting up.
*/
public void init(ServletConfig config)
throws InitializationException
@@ -136,12 +137,12 @@
String subKey = (String) it.next();
Object subVal = subConf.getProperty(subKey);
- if(subKey.equals(CONFIG))
+ if (subKey.equals(CONFIG))
{
- Log.debug("Fixing up "+subVal);
+ Log.debug("Fixing up " + subVal);
subVal =
config.getServletContext().getRealPath((String)subVal);
- Log.debug("Now: "+subVal);
+ Log.debug("Now: " + subVal);
}
loaderConf.addProperty(subProperty + "." + subKey,
@@ -159,8 +160,8 @@
}
catch (Exception e)
{
- Log.error("Component Service failed: ",e);
- throw new InitializationException("ComponentService failed: ",e);
+ Log.error("Component Service failed: ", e);
+ throw new InitializationException("ComponentService failed: ", e);
}
}
@@ -172,14 +173,14 @@
public void shutdown()
{
- if(components != null)
+ if (components != null)
{
- for(int i = 0; i < components.length; i++)
+ for (int i = 0; i < components.length; i++)
{
if (components[i] instanceof Disposable)
{
- Log.debug("Disposing a "+ components[i].getClass().getName()+"
object");
- ((Disposable)components[i]).dispose();
+ Log.debug("Disposing a " + components[i].getClass().getName() +
" object");
+ ((Disposable) components[i]).dispose();
}
else
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
