You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/03/26 11:49:34 UTC

cvs commit: jakarta-avalon/src/java/org/apache/avalon/framework Enum.java ValuedEnum.java

donaldp     02/03/26 02:49:34

  Modified:    src/java/org/apache/avalon/framework Enum.java
                        ValuedEnum.java
  Log:
  final static --> static final
  
  as per JLS recomendations
  
  Revision  Changes    Path
  1.8       +8 -8      jakarta-avalon/src/java/org/apache/avalon/framework/Enum.java
  
  Index: Enum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/Enum.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Enum.java	21 Mar 2002 14:51:12 -0000	1.7
  +++ Enum.java	26 Mar 2002 10:49:34 -0000	1.8
  @@ -16,10 +16,10 @@
    * import org.apache.avalon.framework.Enum;
    *
    * public final class Color extends Enum {
  - *   public final static Color RED = new Color( "Red" );
  - *   public final static Color GREEN = new Color( "Green" );
  - *   public final static Color BLUE = new Color( "Blue" );
  - * 
  + *   public static final Color RED = new Color( "Red" );
  + *   public static final Color GREEN = new Color( "Green" );
  + *   public static final Color BLUE = new Color( "Blue" );
  + *
    *   private Color( final String color )
    *   {
    *     super( color );
  @@ -33,10 +33,10 @@
    * <pre>
    * public final class Color extends Enum {
    *   static final Map map = new HashMap();
  - * 
  - *   public final static Color RED = new Color( "Red", map );
  - *   public final static Color GREEN = new Color( "Green", map );
  - *   public final static Color BLUE = new Color( "Blue", map );
  + *
  + *   public static final Color RED = new Color( "Red", map );
  + *   public static final Color GREEN = new Color( "Green", map );
  + *   public static final Color BLUE = new Color( "Blue", map );
   
    *   private Color( final String color, final Map map )
    *   {
  
  
  
  1.9       +11 -11    jakarta-avalon/src/java/org/apache/avalon/framework/ValuedEnum.java
  
  Index: ValuedEnum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/ValuedEnum.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ValuedEnum.java	11 Dec 2001 09:00:44 -0000	1.8
  +++ ValuedEnum.java	26 Mar 2002 10:49:34 -0000	1.9
  @@ -15,16 +15,16 @@
    *
    * <pre>
    * import org.apache.avalon.framework.ValuedEnum;
  - * 
  + *
    * public final class JavaVersion
    *   extends ValuedEnum
    * {
    *   //standard enums for version of JVM
  - *   public final static JavaVersion  JAVA1_0  = new JavaVersion( "Java 1.0", 100 );
  - *   public final static JavaVersion  JAVA1_1  = new JavaVersion( "Java 1.1", 110 );
  - *   public final static JavaVersion  JAVA1_2  = new JavaVersion( "Java 1.2", 120 );
  - *   public final static JavaVersion  JAVA1_3  = new JavaVersion( "Java 1.3", 130 );
  - * 
  + *   public static final JavaVersion  JAVA1_0  = new JavaVersion( "Java 1.0", 100 );
  + *   public static final JavaVersion  JAVA1_1  = new JavaVersion( "Java 1.1", 110 );
  + *   public static final JavaVersion  JAVA1_2  = new JavaVersion( "Java 1.2", 120 );
  + *   public static final JavaVersion  JAVA1_3  = new JavaVersion( "Java 1.3", 130 );
  + *
    *   private JavaVersion( final String name, final int value )
    *   {
    *     super( name, value );
  @@ -37,11 +37,11 @@
    * import org.apache.avalon.framework.context.Context;
    * import org.apache.avalon.framework.context.Contextualizable;
    * import org.apache.avalon.framework.context.ContextException;
  - * 
  - * public class MyComponent implements Contextualizable 
  + *
  + * public class MyComponent implements Contextualizable
    * {
    *   JavaVersion requiredVer = JavaVersion.JAVA1_2;
  - * 
  + *
    *   public void contextualize(Context context)
    *       throws ContextException
    *   {
  @@ -53,7 +53,7 @@
    *   }
    * }
    * </pre>
  - * 
  + *
    * As with <code>Enum</code>, the {@link #ValuedEnum(String, int, Map)} constructor can be used to
    * populate a <code>Map</code>, from which further functionality can be derived.
    *
  @@ -100,7 +100,7 @@
        *
        * @param name the name of enum item.
        * @param value the value of enum item.
  -     * @param map the <code>Map</code> to add enum item to. 
  +     * @param map the <code>Map</code> to add enum item to.
        */
       protected ValuedEnum( final String name, final int value, final Map map )
       {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>