directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1003144 [1/2] - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap: aci/ codec/ codec/controls/replication/syncDoneValue/ codec/controls/replication/syncInfoValue/ codec/controls/replication/syncRequestValue/ co...
Date Thu, 30 Sep 2010 16:31:50 GMT
Author: seelmann
Date: Thu Sep 30 16:31:49 2010
New Revision: 1003144

URL: http://svn.apache.org/viewvc?rev=1003144&view=rev
Log:
Fix checkstyle errors: use of final keywords

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/ChangeType.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/UndefinedNode.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java Thu Sep 30 16:31:49 2010
@@ -25,7 +25,7 @@ package org.apache.directory.shared.ldap
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class GrantAndDenial
+public final class GrantAndDenial
 {
     // Permissions that may be used in conjunction with any component of
     // <tt>ProtectedItem</tt>s.

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java Thu Sep 30 16:31:49 2010
@@ -68,7 +68,7 @@ public abstract class UserClass implemen
      * Every directory user (with possible requirements for
      * authenticationLevel).
      */
-    public static class AllUsers extends UserClass
+    public static final class AllUsers extends UserClass
     {
         private static final long serialVersionUID = 8967984720792510292L;
 
@@ -78,6 +78,10 @@ public abstract class UserClass implemen
         }
 
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
         public String toString()
         {
             return "allUsers";
@@ -89,7 +93,7 @@ public abstract class UserClass implemen
      * if the entry is a member of a family, then additionally the user with the
      * distinguished name of the ancestor.
      */
-    public static class ThisEntry extends UserClass
+    public static final class ThisEntry extends UserClass
     {
         private static final long serialVersionUID = -8189325270233754470L;
 
@@ -108,7 +112,7 @@ public abstract class UserClass implemen
     /**
      * The user as parent (ancestor) of accessed entry.
      */
-    public static class ParentOfEntry extends UserClass
+    public static final class ParentOfEntry extends UserClass
     {
         private static final long serialVersionUID = 5247207736068086476L;
 
@@ -118,6 +122,10 @@ public abstract class UserClass implemen
         }
 
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
         public String toString()
         {
             return "parentOfEntry";
@@ -128,7 +136,7 @@ public abstract class UserClass implemen
     /**
      * A base class for all user classes which has a set of DNs.
      */
-    private static abstract class NamedUserClass extends UserClass
+    private abstract static class NamedUserClass extends UserClass
     {
         private static final long serialVersionUID = 8571875984468893621L;
         protected final Set<DN> names;
@@ -253,6 +261,10 @@ public abstract class UserClass implemen
         }
 
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
         public String toString()
         {
             return "name " + super.toString();
@@ -282,6 +294,10 @@ public abstract class UserClass implemen
         }
 
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
         public String toString()
         {
             return "userGroup " + super.toString();
@@ -313,6 +329,8 @@ public abstract class UserClass implemen
 
         /**
          * Returns the collection of unrefined {@link SubtreeSpecification}s.
+         *
+         * @return the subtree specifications
          */
         public Set<SubtreeSpecification> getSubtreeSpecifications()
         {
@@ -354,6 +372,10 @@ public abstract class UserClass implemen
         }
 
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
         public String toString()
         {
             StringBuilder buffer = new StringBuilder();

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java Thu Sep 30 16:31:49 2010
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  *         $Rev: 903719 $
  */
-public class LdapProvider extends Provider
+public final class LdapProvider extends Provider
 {
     /**
      * Creates an instance of a LDAP BER Provider.

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
  *  
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncDoneValueControlGrammar extends AbstractGrammar
+public final class SyncDoneValueControlGrammar extends AbstractGrammar
 {
 
     /** the logger */

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncDoneValue/SyncDoneValueControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -19,46 +19,53 @@
  */
 package org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue;
 
+
 import org.apache.directory.shared.asn1.ber.grammar.Grammar;
 import org.apache.directory.shared.asn1.ber.grammar.States;
 
+
 /**
- * 
  * ASN.1 grammer constants of SyncDoneValueControl.
+ * 
+ * TODO: should this be an enum?
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncDoneValueControlStatesEnum implements States
+public final class SyncDoneValueControlStatesEnum implements States
 {
     /***/
     public static final int START_STATE = 0;
-    
+
     /** sequence start state */
     public static final int SYNC_DONE_VALUE_SEQUENCE_STATE = 1;
-    
+
     /** cookie value state */
     public static final int COOKIE_STATE = 2;
-    
+
     /** refreshDeletes value state */
     public static final int REFRESH_DELETES_STATE = 3;
-    
+
     /** terminal state */
     public static final int LAST_SYNC_DONE_VALUE_STATE = 4;
-    
-    public static final String[] syncDoneValueString = new String[]
+
+    /** A string representation of all the states */
+    public static final String[] SYNC_DONE_VALUE_STRING = new String[]
        {
-       "START_STATE",
-       "SYNC_DONE_VALUE_SEQUENCE_STATE",
-       "COOKIE_STATE",
-       "REFRESH_DELETES_STATE",
+           "START_STATE",
+           "SYNC_DONE_VALUE_SEQUENCE_STATE",
+           "COOKIE_STATE",
+           "REFRESH_DELETES_STATE",
        };
-    
+
+    /** The instance */
     private static SyncDoneValueControlStatesEnum instance = new SyncDoneValueControlStatesEnum();
-    
+
+
     private SyncDoneValueControlStatesEnum()
     {
     }
-    
+
+
     /**
      * Get an instance of this class
      * 
@@ -107,7 +114,7 @@ public class SyncDoneValueControlStatesE
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "SYNC_DONE_VALUE_GRAMMAR" : syncDoneValueString[state] );
+        return ( ( state == GRAMMAR_END ) ? "SYNC_DONE_VALUE_GRAMMAR" : SYNC_DONE_VALUE_STRING[state] );
     }
-    
+
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncInfoValueControlGrammar extends AbstractGrammar
+public final class SyncInfoValueControlGrammar extends AbstractGrammar
 {
     /** The logger */
     static final Logger LOG = LoggerFactory.getLogger( SyncInfoValueControlGrammar.class );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncInfoValue/SyncInfoValueControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the SyncInfoValueControl's grammar constants. It is also used for
  * debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncInfoValueControlStatesEnum implements States
+public final class SyncInfoValueControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -84,7 +86,7 @@ public class SyncInfoValueControlStatesE
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] syncInfoValueString = new String[]
+    private static final String[] SYNC_INFO_VALUE_STRING = new String[]
         { 
             "START_STATE",
             "NEW_COOKIE_STATE",
@@ -167,6 +169,6 @@ public class SyncInfoValueControlStatesE
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "SYNC_INFO_VALUE_END_STATE" : syncInfoValueString[state] );
+        return ( ( state == GRAMMAR_END ) ? "SYNC_INFO_VALUE_END_STATE" : SYNC_INFO_VALUE_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncRequestValueControlGrammar extends AbstractGrammar
+public final class SyncRequestValueControlGrammar extends AbstractGrammar
 {
     /** The logger */
     static final Logger LOG = LoggerFactory.getLogger( SyncRequestValueControlGrammar.class );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the SyncRequestValueControl's grammar constants. It is also used for
  * debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncRequestValueControlStatesEnum implements States
+public final class SyncRequestValueControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -60,7 +62,7 @@ public class SyncRequestValueControlStat
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] syncRequestValueString = new String[]
+    private static final String[] SYNC_REQUEST_VALUE_STRING = new String[]
         { 
         "START_STATE", 
         "SYNC_REQUEST_VALUE_SEQUENCE_STATE", 
@@ -135,6 +137,6 @@ public class SyncRequestValueControlStat
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "SYNC_REQUEST_VALUE_END_STATE" : syncRequestValueString[state] );
+        return ( ( state == GRAMMAR_END ) ? "SYNC_REQUEST_VALUE_END_STATE" : SYNC_REQUEST_VALUE_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncStateValueControlGrammar extends AbstractGrammar
+public final class SyncStateValueControlGrammar extends AbstractGrammar
 {
     /** The logger */
     static final Logger LOG = LoggerFactory.getLogger( SyncStateValueControlGrammar.class );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the SyncStateValueControl's grammar constants. It is also used for
  * debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncStateValueControlStatesEnum implements States
+public final class SyncStateValueControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -60,7 +62,7 @@ public class SyncStateValueControlStates
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] syncStatetValueString = new String[]
+    private static final String[] SYNC_STATE_VALUE_STRING = new String[]
         { 
         "START_STATE", 
         "SYNC_STATE_VALUE_SEQUENCE_STATE", 
@@ -135,6 +137,6 @@ public class SyncStateValueControlStates
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "SYNC_STATE_VALUE_END_STATE" : syncStatetValueString[state] );
+        return ( ( state == GRAMMAR_END ) ? "SYNC_STATE_VALUE_END_STATE" : SYNC_STATE_VALUE_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncModifyDnControlGrammar extends AbstractGrammar
+public final class SyncModifyDnControlGrammar extends AbstractGrammar
 {
     /** The logger */
     static final Logger LOG = LoggerFactory.getLogger( SyncModifyDnControlGrammar.class );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncmodifydn/SyncModifyDnControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the SyncModifyDnControl's grammar constants. It is also used for
  * debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncModifyDnControlStatesEnum implements States
+public final class SyncModifyDnControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -78,7 +80,7 @@ public class SyncModifyDnControlStatesEn
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] syncModifyDnString = new String[]
+    private static final String[] SYNC_MODIFY_DN_STRING = new String[]
         { 
         "START_SYNC_MODDN", 
         "SYNC_MODDN_VALUE_SEQUENCE_STATE", 
@@ -159,6 +161,6 @@ public class SyncModifyDnControlStatesEn
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "SYNC_MODDN_VALUE_END_STATE" : syncModifyDnString[state] );
+        return ( ( state == GRAMMAR_END ) ? "SYNC_MODDN_VALUE_END_STATE" : SYNC_MODIFY_DN_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelGrammar.java Thu Sep 30 16:31:49 2010
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CancelGrammar extends AbstractGrammar
+public final class CancelGrammar extends AbstractGrammar
 {
     /** The logger */
     static final Logger LOG = LoggerFactory.getLogger( CancelGrammar.class );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/cancel/CancelStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the Cancel's grammar constants. It is also used
  * for debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CancelStatesEnum implements States
+public final class CancelStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -54,7 +56,7 @@ public class CancelStatesEnum implements
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] CancelString = new String[]
+    private static final String[] CANCEL_STRING = new String[]
         { 
         "START_STATE", 
         "CANCEL_SEQUENCE_STATE",
@@ -127,6 +129,6 @@ public class CancelStatesEnum implements
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "CANCEL_END_STATE" : CancelString[state] );
+        return ( ( state == GRAMMAR_END ) ? "CANCEL_END_STATE" : CANCEL_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectGrammar.java Thu Sep 30 16:31:49 2010
@@ -61,13 +61,13 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class GracefulDisconnectGrammar extends AbstractGrammar
+public final class GracefulDisconnectGrammar extends AbstractGrammar
 {
     /** The logger */
-    static final Logger log = LoggerFactory.getLogger( GracefulDisconnectGrammar.class );
+    static final Logger LOG = LoggerFactory.getLogger( GracefulDisconnectGrammar.class );
 
     /** Speedup for logs */
-    static final boolean IS_DEBUG = log.isDebugEnabled();
+    static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. GracefulDisconnectnGrammar is a singleton */
     private static Grammar instance = new GracefulDisconnectGrammar();
@@ -76,7 +76,7 @@ public class GracefulDisconnectGrammar e
     /**
      * The action used to store a Time Offline.
      */
-    GrammarAction storeDelay = new GrammarAction( "Set Graceful Disconnect Delay" )
+    private GrammarAction storeDelay = new GrammarAction( "Set Graceful Disconnect Delay" )
     {
         public void action( Asn1Container container ) throws DecoderException
         {
@@ -89,7 +89,7 @@ public class GracefulDisconnectGrammar e
     
                 if ( IS_DEBUG )
                 {
-                    log.debug( "Delay = " + delay );
+                    LOG.debug( "Delay = " + delay );
                 }
     
                 gracefulDisconnectContainer.getGracefulDisconnect().setDelay( delay );
@@ -98,7 +98,7 @@ public class GracefulDisconnectGrammar e
             catch ( IntegerDecoderException e )
             {
                 String msg = I18n.err( I18n.ERR_04036, StringTools.dumpBytes( value.getData() ) );
-                log.error( msg );
+                LOG.error( msg );
                 throw new DecoderException( msg );
             }
         }
@@ -107,7 +107,7 @@ public class GracefulDisconnectGrammar e
     /**
      * The action used to store a referral.
      */
-    GrammarAction storeReferral = new GrammarAction( "Stores a referral" )
+    private GrammarAction storeReferral = new GrammarAction( "Stores a referral" )
     {
         public void action( Asn1Container container ) throws DecoderException
         {
@@ -122,13 +122,13 @@ public class GracefulDisconnectGrammar e
                 
                 if ( IS_DEBUG )
                 {
-                    log.debug( "Stores a referral : {}", url );
+                    LOG.debug( "Stores a referral : {}", url );
                 }
             }
             catch ( LdapURLEncodingException e )
             {
                 String msg = "failed to decode the URL '" + StringTools.dumpBytes( value.getData() ) + "'";
-                log.error( msg );
+                LOG.error( msg );
                 throw new DecoderException( msg );
             }
         }
@@ -137,7 +137,7 @@ public class GracefulDisconnectGrammar e
     /**
      * The action used to store a Time Offline.
      */
-    GrammarAction storeTimeOffline = new GrammarAction( "Set Graceful Disconnect time offline" )
+    private GrammarAction storeTimeOffline = new GrammarAction( "Set Graceful Disconnect time offline" )
     {
         public void action( Asn1Container container ) throws DecoderException
         {
@@ -150,7 +150,7 @@ public class GracefulDisconnectGrammar e
 
                 if ( IS_DEBUG )
                 {
-                    log.debug( "Time Offline = " + timeOffline );
+                    LOG.debug( "Time Offline = " + timeOffline );
                 }
 
                 gracefulDisconnectContainer.getGracefulDisconnect().setTimeOffline( timeOffline );
@@ -159,7 +159,7 @@ public class GracefulDisconnectGrammar e
             catch ( IntegerDecoderException e )
             {
                 String msg = I18n.err( I18n.ERR_04037, StringTools.dumpBytes( value.getData() ) );
-                log.error( msg );
+                LOG.error( msg );
                 throw new DecoderException( msg );
             }
         }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulDisconnect/GracefulDisconnectStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the GracefulDisconnect's grammar constants. It is also used
  * for debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class GracefulDisconnectStatesEnum implements States
+public final class GracefulDisconnectStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -63,7 +65,7 @@ public class GracefulDisconnectStatesEnu
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] GracefulDisconnectString = new String[]
+    private static final String[] GRACEFUL_DISCONNECT_STRING = new String[]
         { 
         "START_STATE", 
         "GRACEFUL_DISCONNECT_SEQUENCE_STATE",
@@ -139,6 +141,6 @@ public class GracefulDisconnectStatesEnu
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "GRACEFUL_DISCONNECT_END_STATE" : GracefulDisconnectString[state] );
+        return ( ( state == GRAMMAR_END ) ? "GRACEFUL_DISCONNECT_END_STATE" : GRACEFUL_DISCONNECT_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownGrammar.java Thu Sep 30 16:31:49 2010
@@ -52,13 +52,13 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class GracefulShutdownGrammar extends AbstractGrammar
+public final class GracefulShutdownGrammar extends AbstractGrammar
 {
     /** The logger */
-    static final Logger log = LoggerFactory.getLogger( GracefulShutdownGrammar.class );
+    static final Logger LOG = LoggerFactory.getLogger( GracefulShutdownGrammar.class );
 
     /** Speedup for logs */
-    static final boolean IS_DEBUG = log.isDebugEnabled();
+    static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. GracefulShutdownGrammar is a singleton */
     private static Grammar instance = new GracefulShutdownGrammar();
@@ -125,7 +125,7 @@ public class GracefulShutdownGrammar ext
 
                         if ( IS_DEBUG )
                         {
-                            log.debug( "Time Offline = " + timeOffline );
+                            LOG.debug( "Time Offline = " + timeOffline );
                         }
 
                         gracefulShutdownContainer.getGracefulShutdown().setTimeOffline( timeOffline );
@@ -134,7 +134,7 @@ public class GracefulShutdownGrammar ext
                     catch ( IntegerDecoderException e )
                     {
                         String msg = I18n.err( I18n.ERR_04037, StringTools.dumpBytes( value.getData() ) );
-                        log.error( msg );
+                        LOG.error( msg );
                         throw new DecoderException( msg );
                     }
                 }
@@ -168,7 +168,7 @@ public class GracefulShutdownGrammar ext
 
                         if ( IS_DEBUG )
                         {
-                            log.debug( "Delay = " + delay );
+                            LOG.debug( "Delay = " + delay );
                         }
 
                         gracefulShutdownContainer.getGracefulShutdown().setDelay( delay );
@@ -177,7 +177,7 @@ public class GracefulShutdownGrammar ext
                     catch ( IntegerDecoderException e )
                     {
                         String msg = I18n.err( I18n.ERR_04036, StringTools.dumpBytes( value.getData() ) );
-                        log.error( msg );
+                        LOG.error( msg );
                         throw new DecoderException( msg );
                     }
                 }
@@ -212,7 +212,7 @@ public class GracefulShutdownGrammar ext
 
                         if ( IS_DEBUG )
                         {
-                            log.debug( "Delay = " + delay );
+                            LOG.debug( "Delay = " + delay );
                         }
 
                         gracefulShutdownContainer.getGracefulShutdown().setDelay( delay );
@@ -221,7 +221,7 @@ public class GracefulShutdownGrammar ext
                     catch ( IntegerDecoderException e )
                     {
                         String msg = I18n.err( I18n.ERR_04036, StringTools.dumpBytes( value.getData() ) );
-                        log.error( msg );
+                        LOG.error( msg );
                         throw new DecoderException( msg );
                     }
                 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/gracefulShutdown/GracefulShutdownStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the GracefulShutdown's grammar constants. It is also used
  * for debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class GracefulShutdownStatesEnum implements States
+public final class GracefulShutdownStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -58,7 +60,7 @@ public class GracefulShutdownStatesEnum 
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] GracefulShutdownString = new String[]
+    private static final String[] GRACEFUL_SHUTDOWN_STRING = new String[]
         { 
         "START_STATE",
         "GRACEFUL_SHUTDOWN_SEQUENCE_STATE", 
@@ -132,6 +134,6 @@ public class GracefulShutdownStatesEnum 
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "GRACEFUL_SHUTDOWN_END_STATE" : GracefulShutdownString[state] );
+        return ( ( state == GRAMMAR_END ) ? "GRACEFUL_SHUTDOWN_END_STATE" : GRACEFUL_SHUTDOWN_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureGrammar.java Thu Sep 30 16:31:49 2010
@@ -41,13 +41,13 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class StoredProcedureGrammar extends AbstractGrammar
+public final class StoredProcedureGrammar extends AbstractGrammar
 {
     //~ Static fields/initializers -----------------------------------------------------------------
 
     /** The logger */
     //private static final Logger log = LoggerFactory.getLogger( StoredProcedureGrammar.class );
-    static final Logger log = LoggerFactory.getLogger( StoredProcedureGrammar.class );
+    static final Logger LOG = LoggerFactory.getLogger( StoredProcedureGrammar.class );
 
     /** The instance of grammar. StoredProcedureGrammar is a singleton. */
     private static Grammar instance = new StoredProcedureGrammar();
@@ -102,7 +102,7 @@ public class StoredProcedureGrammar exte
                     {
                         // We can't have a void language !
                         String msg = I18n.err( I18n.ERR_04038 );
-                        log.error( msg );
+                        LOG.error( msg );
                         throw new DecoderException( msg );
                     }
                     else
@@ -110,9 +110,9 @@ public class StoredProcedureGrammar exte
                         // Only this field's type is String by default
                         String language = StringTools.utf8ToString( tlv.getValue().getData() );
 
-                        if ( log.isDebugEnabled() )
+                        if ( LOG.isDebugEnabled() )
                         {
-                            log.debug( "SP language found: " + language );
+                            LOG.debug( "SP language found: " + language );
                         }
 
                         storedProcedure = new StoredProcedure();
@@ -146,7 +146,7 @@ public class StoredProcedureGrammar exte
                     {
                         // We can't have a void procedure !
                         String msg = I18n.err( I18n.ERR_04039 );
-                        log.error( msg );
+                        LOG.error( msg );
                         throw new DecoderException( msg );
                     }
                     else
@@ -156,9 +156,9 @@ public class StoredProcedureGrammar exte
                         storedProcedure.setProcedure( procedure );
                     }
 
-                    if ( log.isDebugEnabled() )
+                    if ( LOG.isDebugEnabled() )
                     {
-                        log.debug( "Procedure found : " + StringTools.utf8ToString( storedProcedure.getProcedure() ) );
+                        LOG.debug( "Procedure found : " + StringTools.utf8ToString( storedProcedure.getProcedure() ) );
                     }
                 }
             } );
@@ -213,7 +213,7 @@ public class StoredProcedureGrammar exte
                     {
                         // We can't have a void parameter type !
                         String msg = I18n.err( I18n.ERR_04040 );
-                        log.error( msg );
+                        LOG.error( msg );
                         throw new DecoderException( msg );
                     }
                     else
@@ -227,9 +227,9 @@ public class StoredProcedureGrammar exte
                         // We store the type in the current parameter.
                         storedProcedure.setCurrentParameter( parameter );
 
-                        if ( log.isDebugEnabled() )
+                        if ( LOG.isDebugEnabled() )
                         {
-                            log.debug( "Parameter type found : " + StringTools.dumpBytes( parameterType ) );
+                            LOG.debug( "Parameter type found : " + StringTools.dumpBytes( parameterType ) );
                         }
 
                     }
@@ -259,7 +259,7 @@ public class StoredProcedureGrammar exte
                     {
                         // We can't have a void parameter value !
                         String msg = I18n.err( I18n.ERR_04041 );
-                        log.error( msg );
+                        LOG.error( msg );
                         throw new DecoderException( msg );
                     }
                     else
@@ -274,15 +274,15 @@ public class StoredProcedureGrammar exte
                             // We can now add a new Parameter to the procedure
                             storedProcedure.addParameter( parameter );
 
-                            if ( log.isDebugEnabled() )
+                            if ( LOG.isDebugEnabled() )
                             {
-                                log.debug( "Parameter value found : " + StringTools.dumpBytes( parameterValue ) );
+                                LOG.debug( "Parameter value found : " + StringTools.dumpBytes( parameterValue ) );
                             }
                         }
                         else
                         {
                             String msg = I18n.err( I18n.ERR_04042 );
-                            log.error( msg );
+                            LOG.error( msg );
                             throw new DecoderException( msg );
                         }
                     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/storedProcedure/StoredProcedureStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -26,11 +26,13 @@ import org.apache.directory.shared.asn1.
 
 
 /**
- * Constants for StoredProcedureGrammar
+ * Constants for StoredProcedureGrammar.
+ * 
+ * TODO: should this be an enum?
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class StoredProcedureStatesEnum implements States
+public final class StoredProcedureStatesEnum implements States
 {
     //~ Static fields/initializers -----------------------------------------------------------------
 
@@ -67,13 +69,14 @@ public class StoredProcedureStatesEnum i
     /** Parameter value */
     public static final int PARAMETER_VALUE_STATE = 7;
 
+    /** Last Stored Procedure */
     public static final int LAST_STORED_PROCEDURE_STATE = 8;
 
     //=========================================================================
     // States debug strings 
     //=========================================================================
     /** A string representation of all the states */
-    private static String[] StoredProcedureString = new String[]
+    private static final String[] STORED_PROCEDURE_STRING = new String[]
         { 
         "START_STATE", 
         "STORED_PROCEDURE_STATE", 
@@ -148,6 +151,6 @@ public class StoredProcedureStatesEnum i
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "STORED_PROCEDURE_END_STATE" : StoredProcedureString[state] );
+        return ( ( state == GRAMMAR_END ) ? "STORED_PROCEDURE_END_STATE" : STORED_PROCEDURE_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/ChangeType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/ChangeType.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/ChangeType.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/ChangeType.java Thu Sep 30 16:31:49 2010
@@ -37,9 +37,11 @@ import org.apache.directory.shared.i18n.
  *   }
  * </pre>
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ChangeType
+public final class ChangeType
 {
     public static final int ADD_VALUE = 1;
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -47,13 +47,13 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class EntryChangeControlGrammar extends AbstractGrammar
+public final class EntryChangeControlGrammar extends AbstractGrammar
 {
     /** The logger */
-    static final Logger log = LoggerFactory.getLogger( EntryChangeControlGrammar.class );
+    static final Logger LOG = LoggerFactory.getLogger( EntryChangeControlGrammar.class );
 
     /** Speedup for logs */
-    static final boolean IS_DEBUG = log.isDebugEnabled();
+    static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. EntryChangeControlGrammar is a singleton */
     private static Grammar instance = new EntryChangeControlGrammar();
@@ -115,7 +115,7 @@ public class EntryChangeControlGrammar e
 
                             if ( IS_DEBUG )
                             {
-                                log.debug( "changeType = " + changeType );
+                                LOG.debug( "changeType = " + changeType );
                             }
 
                             entryChangeContainer.getEntryChangeControl().setChangeType( changeType );
@@ -123,7 +123,7 @@ public class EntryChangeControlGrammar e
 
                         default:
                             String msg = I18n.err( I18n.ERR_04044 );
-                            log.error( msg );
+                            LOG.error( msg );
                             throw new DecoderException( msg );
                     }
 
@@ -133,7 +133,7 @@ public class EntryChangeControlGrammar e
                 catch ( IntegerDecoderException e )
                 {
                     String msg = I18n.err( I18n.ERR_04044 );
-                    log.error( msg, e );
+                    LOG.error( msg, e );
                     throw new DecoderException( msg );
                 }
             }
@@ -163,7 +163,7 @@ public class EntryChangeControlGrammar e
 
                 if ( changeType != ChangeType.MODDN )
                 {
-                    log.error( I18n.err( I18n.ERR_04045 ) );
+                    LOG.error( I18n.err( I18n.ERR_04045 ) );
                     throw new DecoderException( I18n.err( I18n.ERR_04046 ));
                 }
                 else
@@ -177,13 +177,13 @@ public class EntryChangeControlGrammar e
                     }
                     catch ( LdapInvalidDnException ine )
                     {
-                        log.error( I18n.err( I18n.ERR_04047, StringTools.dumpBytes( value.getData() ) ) );
+                        LOG.error( I18n.err( I18n.ERR_04047, StringTools.dumpBytes( value.getData() ) ) );
                         throw new DecoderException( I18n.err( I18n.ERR_04048 ) );
                     }
 
                     if ( IS_DEBUG )
                     {
-                        log.debug( "previousDN = " + previousDn );
+                        LOG.debug( "previousDN = " + previousDn );
                     }
 
                     entryChangeContainer.getEntryChangeControl().setPreviousDn( previousDn );
@@ -208,7 +208,7 @@ public class EntryChangeControlGrammar e
 
                     if ( IS_DEBUG )
                     {
-                        log.debug( "changeNumber = " + changeNumber );
+                        LOG.debug( "changeNumber = " + changeNumber );
                     }
 
                     entryChangeContainer.getEntryChangeControl().setChangeNumber( changeNumber );
@@ -219,7 +219,7 @@ public class EntryChangeControlGrammar e
                 catch ( LongDecoderException e )
                 {
                     String msg = I18n.err( I18n.ERR_04049 );
-                    log.error( msg, e );
+                    LOG.error( msg, e );
                     throw new DecoderException( msg );
                 }
             }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the EntryChangeControl's grammar constants. It is also used
  * for debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class EntryChangeControlStatesEnum implements States
+public final class EntryChangeControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -61,7 +63,7 @@ public class EntryChangeControlStatesEnu
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] EcString = new String[]
+    private static final String[] E_C_STRING = new String[]
         { 
         "START_STATE",
         "EC_SEQUENCE_STATE", 
@@ -136,6 +138,6 @@ public class EntryChangeControlStatesEnu
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "EC_END_STATE" : EcString[state] );
+        return ( ( state == GRAMMAR_END ) ? "EC_END_STATE" : E_C_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -50,13 +50,13 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class PagedResultsControlGrammar extends AbstractGrammar
+public final class PagedResultsControlGrammar extends AbstractGrammar
 {
     /** The logger */
-    static final Logger log = LoggerFactory.getLogger( PagedResultsControlGrammar.class );
+    static final Logger LOG = LoggerFactory.getLogger( PagedResultsControlGrammar.class );
 
     /** Speedup for logs */
-    static final boolean IS_DEBUG = log.isDebugEnabled();
+    static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. PagedSearchControlGrammar is a singleton */
     private static Grammar instance = new PagedResultsControlGrammar();
@@ -120,7 +120,7 @@ public class PagedResultsControlGrammar 
                         
                         if ( IS_DEBUG )
                         {
-                            log.debug( "size = " + size );
+                            LOG.debug( "size = " + size );
                         }
 
                         pagedSearchContainer.getPagedSearchControl().setSize( size );
@@ -128,7 +128,7 @@ public class PagedResultsControlGrammar 
                     catch ( IntegerDecoderException e )
                     {
                         String msg = I18n.err( I18n.ERR_04050 );
-                        log.error( msg, e );
+                        LOG.error( msg, e );
                         throw new DecoderException( msg );
                     }
                 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedResultsControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the PagedSearchControl's grammar constants. It is also used for
  * debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class PagedResultsControlStatesEnum implements States
+public final class PagedResultsControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -57,8 +59,8 @@ public class PagedResultsControlStatesEn
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] PagedSearchString = new String[]
-        { 
+    private static final String[] PAGED_SEARCH_STRING = new String[]
+        {
         "START_STATE", 
         "PAGED_SEARCH_SEQUENCE_VALUE", 
         "SIZE_STATE",
@@ -131,6 +133,6 @@ public class PagedResultsControlStatesEn
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "PAGED_SEARCH_END_STATE" : PagedSearchString[state] );
+        return ( ( state == GRAMMAR_END ) ? "PAGED_SEARCH_END_STATE" : PAGED_SEARCH_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -58,13 +58,13 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class PersistentSearchControlGrammar extends AbstractGrammar
+public final class PersistentSearchControlGrammar extends AbstractGrammar
 {
     /** The logger */
-    static final Logger log = LoggerFactory.getLogger( PersistentSearchControlGrammar.class );
+    static final Logger LOG = LoggerFactory.getLogger( PersistentSearchControlGrammar.class );
 
     /** Speedup for logs */
-    static final boolean IS_DEBUG = log.isDebugEnabled();
+    static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. PSearchControlGrammar is a singleton */
     private static Grammar instance = new PersistentSearchControlGrammar();
@@ -122,7 +122,7 @@ public class PersistentSearchControlGram
                         
                         if ( IS_DEBUG )
                         {
-                            log.debug( "changeTypes = " + changeTypes );
+                            LOG.debug( "changeTypes = " + changeTypes );
                         }
 
                         psearchContainer.getPSearchControl().setChangeTypes( changeTypes );
@@ -130,7 +130,7 @@ public class PersistentSearchControlGram
                     catch ( IntegerDecoderException e )
                     {
                         String msg = I18n.err( I18n.ERR_04051 );
-                        log.error( msg, e );
+                        LOG.error( msg, e );
                         throw new DecoderException( msg );
                     }
                 }
@@ -161,7 +161,7 @@ public class PersistentSearchControlGram
 
                         if ( IS_DEBUG )
                         {
-                            log.debug( "changesOnly = " + changesOnly );
+                            LOG.debug( "changesOnly = " + changesOnly );
                         }
 
                         psearchContainer.getPSearchControl().setChangesOnly( changesOnly );
@@ -169,7 +169,7 @@ public class PersistentSearchControlGram
                     catch ( BooleanDecoderException e )
                     {
                         String msg = I18n.err( I18n.ERR_04052 );
-                        log.error( msg, e );
+                        LOG.error( msg, e );
                         throw new DecoderException( msg );
                     }
                 }
@@ -200,7 +200,7 @@ public class PersistentSearchControlGram
 
                         if ( IS_DEBUG )
                         {
-                            log.debug( "returnECs = " + returnECs );
+                            LOG.debug( "returnECs = " + returnECs );
                         }
 
                         psearchContainer.getPSearchControl().setReturnECs( returnECs );
@@ -211,7 +211,7 @@ public class PersistentSearchControlGram
                     catch ( BooleanDecoderException e )
                     {
                         String msg = I18n.err( I18n.ERR_04053 );
-                        log.error( msg, e );
+                        LOG.error( msg, e );
                         throw new DecoderException( msg );
                     }
                 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -28,9 +28,11 @@ import org.apache.directory.shared.asn1.
  * This class store the PSearchControl's grammar constants. It is also used for
  * debugging purposes.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class PersistentSearchControlStatesEnum implements States
+public final class PersistentSearchControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -60,7 +62,7 @@ public class PersistentSearchControlStat
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] PSearchString = new String[]
+    private static final String[] PSEARCH_STRING = new String[]
         { 
         "START_STATE", 
         "PSEARCH_SEQUENCE_VALUE", 
@@ -135,6 +137,6 @@ public class PersistentSearchControlStat
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "PSEARCH_END_STATE" : PSearchString[state] );
+        return ( ( state == GRAMMAR_END ) ? "PSEARCH_END_STATE" : PSEARCH_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java Thu Sep 30 16:31:49 2010
@@ -43,10 +43,10 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SubentriesControlGrammar extends AbstractGrammar
+public final class SubentriesControlGrammar extends AbstractGrammar
 {
     /** The logger */
-    static final Logger log = LoggerFactory.getLogger( SubentriesControlGrammar.class );
+    static final Logger LOG = LoggerFactory.getLogger( SubentriesControlGrammar.class );
 
     /** The instance of grammar. SubEntryControlGrammar is a singleton */
     private static Grammar instance = new SubentriesControlGrammar();
@@ -92,7 +92,7 @@ public class SubentriesControlGrammar ex
                     }
                     catch ( BooleanDecoderException bde )
                     {
-                        log.error( I18n.err( I18n.ERR_04054, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) );
+                        LOG.error( I18n.err( I18n.ERR_04054, StringTools.dumpBytes( value.getData() ), bde.getMessage() ) );
 
                         // This will generate a PROTOCOL_ERROR
                         throw new DecoderException( bde.getMessage() );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlStatesEnum.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlStatesEnum.java Thu Sep 30 16:31:49 2010
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SubentriesControlStatesEnum implements States
+public final class SubentriesControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -52,10 +52,10 @@ public class SubentriesControlStatesEnum
     // States debug strings
     // =========================================================================
     /** A string representation of all the states */
-    private static String[] SubEntryString = new String[]
-        { 
-        "START_STATE", 
-        "SUB_ENTRY_VISIBILITY_STATE" 
+    private static final String[] SUB_ENTRY_STRING = new String[]
+        {
+            "START_STATE",
+            "SUB_ENTRY_VISIBILITY_STATE"
         };
 
     /** The instance */
@@ -124,6 +124,6 @@ public class SubentriesControlStatesEnum
      */
     public String getState( int state )
     {
-        return ( ( state == GRAMMAR_END ) ? "SUB_ENTRY_END_STATE" : SubEntryString[state] );
+        return ( ( state == GRAMMAR_END ) ? "SUB_ENTRY_END_STATE" : SUB_ENTRY_STRING[state] );
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/UndefinedNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/UndefinedNode.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/UndefinedNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/UndefinedNode.java Thu Sep 30 16:31:49 2010
@@ -19,18 +19,19 @@
  */
 package org.apache.directory.shared.ldap.filter;
 
+
 /**
  * An empty class used for Undefined Nodes.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class UndefinedNode extends  AbstractExprNode
+public final class UndefinedNode extends AbstractExprNode
 {
     /** A static instance of this node */
     public static final ExprNode UNDEFINED_NODE = new UndefinedNode();
-    
-    
+
+
     /**
      * Creates a new instance of UndefinedNode.
      */
@@ -40,21 +41,32 @@ public class UndefinedNode extends  Abst
     }
 
 
+    /**
+     * {@inheritDoc}
+     * 
+     * This implementation always returns false.
+     */
     public boolean isLeaf()
     {
         return false;
     }
 
 
+    /**
+     * {@inheritDoc}
+     * 
+     * This implementation always returns null.
+     */
     public Object accept( FilterVisitor visitor )
     {
         return null;
     }
-    
-    
+
+
     /**
-     * @see Object#toString()
+     * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         return "Undefined";

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/NoticeOfDisconnect.java Thu Sep 30 16:31:49 2010
@@ -101,18 +101,25 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class NoticeOfDisconnect extends ExtendedResponseImpl
+public final class NoticeOfDisconnect extends ExtendedResponseImpl
 {
+    
+    /** The serialVersionUID. */
     private static final long serialVersionUID = -4682291068700593492L;
 
+    /** The OID of the NotiveOfDisconnect extended operation. */
     public static final String EXTENSION_OID = "1.3.6.1.4.1.1466.20036";
 
+    /** The empty response */
     private static final byte[] EMPTY_RESPONSE = new byte[0];
 
+    /** The single instance with unavailable result code. */
     public static final NoticeOfDisconnect UNAVAILABLE = new NoticeOfDisconnect( ResultCodeEnum.UNAVAILABLE );
 
+    /** The single instance with protocolError result code. */
     public static final NoticeOfDisconnect PROTOCOLERROR = new NoticeOfDisconnect( ResultCodeEnum.PROTOCOL_ERROR );
 
+    /** The single instance with strongAuthRequired result code. */
     public static final NoticeOfDisconnect STRONGAUTHREQUIRED = new NoticeOfDisconnect(
         ResultCodeEnum.STRONG_AUTH_REQUIRED );
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java Thu Sep 30 16:31:49 2010
@@ -115,7 +115,7 @@ public class DN implements Cloneable, Se
     /**
      * An iterator over RDNs
      */
-    private class RdnIterator implements Iterator<RDN>
+    private final class RdnIterator implements Iterator<RDN>
     {
         // The current index
         int index;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/PrepareString.java Thu Sep 30 16:31:49 2010
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class PrepareString
+public final class PrepareString
 {
     /** A flag used to lowercase chars during the map process */
     private static final boolean CASE_SENSITIVE = true;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java Thu Sep 30 16:31:49 2010
@@ -27,15 +27,17 @@ package org.apache.directory.shared.ldap
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ActionTime
+public final class ActionTime
 {
     //public static final ActionTime BEFORE = new ActionTime( "BEFORE" );
 
+    /** The AFTER instance. */
     public static final ActionTime AFTER = new ActionTime( "AFTER" );
 
     //public static final ActionTime INSTEADOF = new ActionTime( "INSTEADOF" );
 
     
+    /** The name. */
     private final String name;
 
 
@@ -47,6 +49,8 @@ public class ActionTime
 
     /**
      * Returns the name of this action time.
+     *
+     * @return the name of this action time.
      */
     public String getName()
     {
@@ -55,8 +59,9 @@ public class ActionTime
 
 
     /**
-     * @see java.lang.Object#toString()
+     * {@inheritDoc}
      */
+    @Override
     public String toString()
     {
         return name;
@@ -64,9 +69,9 @@ public class ActionTime
 
 
     /**
-     * @see java.lang.Object#hashCode()
-     * @return the instance's hash code 
+     * {@inheritDoc}
      */
+    @Override
     public int hashCode()
     {
         int h = 37;
@@ -77,24 +82,35 @@ public class ActionTime
 
 
     /**
-     * @see java.lang.Object#equals(java.lang.Object)
+     * {@inheritDoc}
      */
+    @Override
     public boolean equals( Object obj )
     {
         if ( this == obj )
+        {
             return true;
+        }
         if ( obj == null )
+        {
             return false;
+        }
         if ( getClass() != obj.getClass() )
+        {
             return false;
+        }
         final ActionTime other = ( ActionTime ) obj;
         if ( name == null )
         {
             if ( other.name != null )
+            {
                 return false;
+            }
         }
         else if ( !name.equals( other.name ) )
+        {
             return false;
+        }
         return true;
     }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java?rev=1003144&r1=1003143&r2=1003144&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java Thu Sep 30 16:31:49 2010
@@ -24,9 +24,11 @@ package org.apache.directory.shared.ldap
 /**
  * An enumeration that represents change inducing LDAP operations.
  * 
+ * TODO: should this be an enum?
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapOperation
+public final class LdapOperation
 {
     public static final LdapOperation MODIFY = new LdapOperation( "Modify" );
 



Mime
View raw message