cmlenz 2004/01/09 05:51:36
Modified: framework/src/java/share/org/apache/cactus/configuration
ConfigurationInitializer.java
integration/ant/src/java/org/apache/cactus/integration/ant/container
AbstractJavaContainer.java
Log:
Fix checkstyle warnings about unnecessary 'final' modifiers
Revision Changes Path
1.2 +4 -4
jakarta-cactus/framework/src/java/share/org/apache/cactus/configuration/ConfigurationInitializer.java
Index: ConfigurationInitializer.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/configuration/ConfigurationInitializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurationInitializer.java 19 Oct 2003 18:06:47 -0000 1.1
+++ ConfigurationInitializer.java 9 Jan 2004 13:51:35 -0000 1.2
@@ -105,7 +105,7 @@
/**
* Read Cactus configuration files.
*/
- public static final synchronized void initialize()
+ public static synchronized void initialize()
{
if (!isInitialized)
{
@@ -122,7 +122,7 @@
* read the DEFAULT_CONFIG_NAME file from the classpath. All properties
* found are exported as java system properties.
*/
- private static final void initializeConfig()
+ private static void initializeConfig()
{
ResourceBundle config;
@@ -167,7 +167,7 @@
/**
* Initialize logging configuration.
*/
- private static final void initializeLoggingConfig()
+ private static void initializeLoggingConfig()
{
String logConfig = System.getProperty(CACTUS_LOGGING_CONFIG_PROPERTY);
if (logConfig != null)
1.7 +21 -21
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/AbstractJavaContainer.java
Index: AbstractJavaContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/AbstractJavaContainer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractJavaContainer.java 7 Dec 2003 09:46:54 -0000 1.6
+++ AbstractJavaContainer.java 9 Jan 2004 13:51:36 -0000 1.7
@@ -197,6 +197,25 @@
}
/**
+ * Returns the file containing the JDK tools (such as the compiler). This
+ * method must not be called on Mac OSX as there is no tools.jar file on
+ * that platform (everything is included in classes.jar).
+ *
+ * @return The tools.jar file
+ * @throws FileNotFoundException If the tools.jar file could not be found
+ */
+ protected final File getToolsJar() throws FileNotFoundException
+ {
+ String javaHome = System.getProperty("java.home");
+ File toolsJar = new File(javaHome, "../lib/tools.jar");
+ if (!toolsJar.isFile())
+ {
+ throw new FileNotFoundException(toolsJar.getAbsolutePath());
+ }
+ return toolsJar;
+ }
+
+ /**
* Adds the tools.jar to the classpath, except for Mac OSX as it is not
* needed.
*
@@ -229,28 +248,9 @@
*
* @return true if the user's system is determined to be Mac OS X.
*/
- private final boolean isOSX()
+ private boolean isOSX()
{
return (System.getProperty("mrj.version") != null);
}
- /**
- * Returns the file containing the JDK tools (such as the compiler). This
- * method must not be called on Mac OSX as there is no tools.jar file on
- * that platform (everything is included in classes.jar).
- *
- * @return The tools.jar file
- * @throws FileNotFoundException If the tools.jar file could not be found
- */
- protected final File getToolsJar() throws FileNotFoundException
- {
- String javaHome = System.getProperty("java.home");
- File toolsJar = new File(javaHome, "../lib/tools.jar");
- if (!toolsJar.isFile())
- {
- throw new FileNotFoundException(toolsJar.getAbsolutePath());
- }
- return toolsJar;
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
