donaldp 02/05/20 05:05:29
Modified: src/java/org/apache/avalon/framework/configuration
SAXConfigurationHandler.java
src/java/org/apache/avalon/framework/context
DefaultContext.java
Log:
final static to static final to comply with JLS recomendations.
Revision Changes Path
1.19 +3 -3
jakarta-avalon/src/java/org/apache/avalon/framework/configuration/SAXConfigurationHandler.java
Index: SAXConfigurationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/SAXConfigurationHandler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SAXConfigurationHandler.java 10 May 2002 03:00:48 -0000 1.18
+++ SAXConfigurationHandler.java 20 May 2002 12:05:29 -0000 1.19
@@ -30,7 +30,7 @@
* Likely number of nested configuration items. If more is
* encountered the lists will grow automatically.
*/
- private final static int EXPECTED_DEPTH = 5;
+ private static final int EXPECTED_DEPTH = 5;
private final ArrayList m_elements = new ArrayList(EXPECTED_DEPTH);
private final ArrayList m_values = new ArrayList(EXPECTED_DEPTH);
/**
@@ -107,9 +107,9 @@
final int depth = m_elements.size() - 1;
final DefaultConfiguration finishedConfiguration =
(DefaultConfiguration) m_elements.remove( depth );
- final String accumulatedValue =
+ final String accumulatedValue =
((StringBuffer) m_values.remove( depth )).toString();
-
+
if( finishedConfiguration.getChildren().length == 0 )
{
// leaf node
1.13 +7 -7
jakarta-avalon/src/java/org/apache/avalon/framework/context/DefaultContext.java
Index: DefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/DefaultContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultContext.java 13 May 2002 08:47:01 -0000 1.12
+++ DefaultContext.java 20 May 2002 12:05:29 -0000 1.13
@@ -24,10 +24,10 @@
public class DefaultContext
implements Context
{
- private final static class Hidden implements Serializable {}
-
- private final static Hidden m_hiddenMarker = new Hidden ();
-
+ private static final class Hidden implements Serializable {}
+
+ private static final Hidden m_hiddenMarker = new Hidden ();
+
private final Map m_contextData;
private final Context m_parent;
private boolean m_readOnly;
@@ -92,7 +92,7 @@
// Always fail.
throw new ContextException( "Unable to locate " + key );
}
-
+
if( data instanceof Resolvable )
{
return ( (Resolvable)data ).resolve( this );
@@ -141,13 +141,13 @@
* @param key the items key
* @throws IllegalStateException if context is read only
*/
- public void hide( final Object key )
+ public void hide( final Object key )
throws IllegalStateException
{
checkWriteable();
m_contextData.put( key, m_hiddenMarker );
}
-
+
/**
* Utility method to retrieve context data.
*
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
