donaldp 02/05/20 03:23:35
Modified: src/java/org/apache/avalon/phoenix/components/application
State.java
src/java/org/apache/avalon/phoenix/components/logger
SimpleLogKitManager.java
src/java/org/apache/avalon/phoenix/components/manager
AbstractSystemManager.java
src/java/org/apache/avalon/phoenix/frontends CLIMain.java
PhoenixServlet.java
src/java/org/apache/avalon/phoenix/launcher Main.java
src/java/org/apache/avalon/phoenix/tools/verifier
Verifier.java
src/java/org/apache/avalon/phoenix/tools/xdoclet
BlockInfoSubTask.java
Log:
final static to final static to comply with JLS recomendations.
Revision Changes Path
1.5 +6 -6
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/State.java
Index: State.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/State.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- State.java 19 May 2002 03:19:24 -0000 1.4
+++ State.java 20 May 2002 10:23:34 -0000 1.5
@@ -20,34 +20,34 @@
/**
* VOID is the initial state of all components.
*/
- public final static State VOID = new State( "VOID", 0 );
+ public static final State VOID = new State( "VOID", 0 );
/**
* CREATING indicates that the Component is in process of being created.
*/
- public final static State CREATING = new State( "CREATING", 0 );
+ public static final State CREATING = new State( "CREATING", 0 );
/**
* CREATED is the state the component exists in after it has been
* successfully created but before it has been prepared.
*/
- public final static State CREATED = new State( "CREATED", 0 );
+ public static final State CREATED = new State( "CREATED", 0 );
/**
* DESTROYING indicates that the component is being destroyed.
*/
- public final static State DESTROYING = new State( "DESTROYING", 0 );
+ public static final State DESTROYING = new State( "DESTROYING", 0 );
/**
* DESTROYED indicates that the component has been destroyed.
*/
- public final static State DESTROYED = new State( "DESTROYED", 0 );
+ public static final State DESTROYED = new State( "DESTROYED", 0 );
/**
* FAILED indicates that the component is in a FAILED state. This is
* usually the result of an error during one of the transition states.
*/
- public final static State FAILED = new State( "FAILED", 0 );
+ public static final State FAILED = new State( "FAILED", 0 );
protected State( final String name, final int value )
{
1.11 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/SimpleLogKitManager.java
Index: SimpleLogKitManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/SimpleLogKitManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SimpleLogKitManager.java 10 May 2002 02:43:03 -0000 1.10
+++ SimpleLogKitManager.java 20 May 2002 10:23:34 -0000 1.11
@@ -41,7 +41,7 @@
private static final Resources REZ =
ResourceManager.getPackageResources( SimpleLogKitManager.class );
- private final static String DEFAULT_FORMAT =
+ private static final String DEFAULT_FORMAT =
"%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): " +
"%{message}\n%{throwable}";
1.11 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java
Index: AbstractSystemManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/AbstractSystemManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractSystemManager.java 10 May 2002 11:08:57 -0000 1.10
+++ AbstractSystemManager.java 20 May 2002 10:23:34 -0000 1.11
@@ -30,7 +30,7 @@
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractSystemManager.class );
- protected final static class ManagedEntry
+ protected static final class ManagedEntry
{
///Object passed in for management
protected Object m_object;
1.36 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- CLIMain.java 18 May 2002 09:16:12 -0000 1.35
+++ CLIMain.java 20 May 2002 10:23:35 -0000 1.36
@@ -47,7 +47,7 @@
private static final String DEFAULT_CONF_FILE =
File.separator + "conf" + File.separator + "kernel.xml";
- private final static String DEFAULT_FORMAT =
+ private static final String DEFAULT_FORMAT =
"%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): " +
"%{message}\n%{throwable}";
1.17 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java
Index: PhoenixServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PhoenixServlet.java 18 May 2002 09:16:12 -0000 1.16
+++ PhoenixServlet.java 20 May 2002 10:23:35 -0000 1.17
@@ -42,7 +42,7 @@
ResourceManager.getPackageResources( PhoenixServlet.class );
private static final String DEFAULT_LOG_FILE = "/logs/phoenix.log";
- private final static String DEFAULT_FORMAT =
+ private static final String DEFAULT_FORMAT =
"%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): " +
"%{message}\n%{throwable}";
1.14 +8 -8
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Main.java 10 May 2002 02:43:04 -0000 1.13
+++ Main.java 20 May 2002 10:23:35 -0000 1.14
@@ -26,9 +26,9 @@
*/
public final class Main
{
- private final static String MAIN_CLASS =
"org.apache.avalon.phoenix.frontends.CLIMain";
- private final static String MAIN_JAR = "phoenix-engine.jar";
- private final static String LOADER_JAR = "phoenix-loader.jar";
+ private static final String MAIN_CLASS =
"org.apache.avalon.phoenix.frontends.CLIMain";
+ private static final String MAIN_JAR = "phoenix-engine.jar";
+ private static final String LOADER_JAR = "phoenix-loader.jar";
private static Object c_frontend;
@@ -38,7 +38,7 @@
* @param args the command line arguments
* @throws Exception if an error occurs
*/
- public final static void main( final String[] args )
+ public static final void main( final String[] args )
throws Exception
{
int exitCode = startup( args, new Hashtable(), true );
@@ -58,7 +58,7 @@
*
* @throws Exception if an error occurs
*/
- protected final static int startup( final String[] args,
+ protected static final int startup( final String[] args,
final Hashtable data,
final boolean blocking )
throws Exception
@@ -105,7 +105,7 @@
* external (calling) application. Protected to allow
* access from DaemonLauncher.
*/
- protected final static void shutdown()
+ protected static final void shutdown()
{
if( null == c_frontend ) return;
try
@@ -132,7 +132,7 @@
* @return the engine file
* @throws Exception if an error occurs
*/
- private final static File findEngineJar()
+ private static final File findEngineJar()
throws Exception
{
String phoenixHome = System.getProperty( "phoenix.home", null );
@@ -153,7 +153,7 @@
/**
* Finds the LOADER_JAR file in the classpath.
*/
- private final static File findLoaderDir()
+ private static final File findLoaderDir()
throws Exception
{
final String classpath = System.getProperty( "java.class.path" );
1.4 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Verifier.java
Index: Verifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Verifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Verifier.java 19 May 2002 05:24:58 -0000 1.3
+++ Verifier.java 20 May 2002 10:23:35 -0000 1.4
@@ -32,12 +32,12 @@
* rules of an Avalon component.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.3 $ $Date: 2002/05/19 05:24:58 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/20 10:23:35 $
*/
public class Verifier
extends AbstractLogEnabled
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( Verifier.class );
private static final Class[] EMPTY_TYPES = new Class[ 0 ];
1.7 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/BlockInfoSubTask.java
Index: BlockInfoSubTask.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/BlockInfoSubTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BlockInfoSubTask.java 18 May 2002 13:31:49 -0000 1.6
+++ BlockInfoSubTask.java 20 May 2002 10:23:35 -0000 1.7
@@ -18,12 +18,12 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vinay Chandrasekharan</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.6 $ $Date: 2002/05/18 13:31:49 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/20 10:23:35 $
*/
public class BlockInfoSubTask
extends TemplateSubTask
{
- public final static String SUBTASK_NAME = "blockinfo";
+ public static final String SUBTASK_NAME = "blockinfo";
private static final String GENERATED_FILE_NAME = "{0}.xinfo";
private static final String DEFAULT_TEMPLATE_FILE =
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
