directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r992753 [1/2] - in /directory/shared/trunk: asn1/src/main/java/org/apache/directory/shared/asn1/ber/ asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/ i18n/src/main/java/org/apache/directory/shared/i18n/ i18n/src/main/resourc...
Date Sun, 05 Sep 2010 10:27:05 GMT
Author: elecharny
Date: Sun Sep  5 10:27:03 2010
New Revision: 992753

URL: http://svn.apache.org/viewvc?rev=992753&view=rev
Log:
o Reviewed some asn1 files
o Renamed Ixxx interfaces to xxx
o Fixed some error messages

Added:
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Action.java
      - copied, changed from r992571, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Grammar.java
      - copied, changed from r992571, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java
      - copied, changed from r992571, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java
Removed:
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java
Modified:
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java
    directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
    directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlStates.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/certGeneration/CertGenerationGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationStatesEnum.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/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

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.asn1.ber;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
 
@@ -36,7 +36,7 @@ import org.apache.directory.shared.asn1.
 public abstract class AbstractContainer implements IAsn1Container
 {
     /** All the possible grammars */
-    protected IGrammar grammar;
+    protected Grammar grammar;
 
     /** Store a stack of the current states used when switching grammars */
     protected int[] stateStack;
@@ -51,7 +51,7 @@ public abstract class AbstractContainer 
     private TLV tlv;
 
     /** Store the different states for debug purpose */
-    protected IStates states;
+    protected States states;
 
     /** The parent TLV */
     private TLV parentTLV;
@@ -73,7 +73,7 @@ public abstract class AbstractContainer 
      * 
      * @return Returns the grammar used to decode a LdapMessage.
      */
-    public IGrammar getGrammar()
+    public Grammar getGrammar()
     {
         return grammar;
     }
@@ -173,7 +173,7 @@ public abstract class AbstractContainer 
      * 
      * @return Returns the states.
      */
-    public IStates getStates()
+    public States getStates()
     {
         return states;
     }

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java Sun Sep  5 10:27:03 2010
@@ -22,7 +22,7 @@ package org.apache.directory.shared.asn1
 
 import java.nio.ByteBuffer;
 
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.ITLVBerDecoderMBean;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
@@ -604,7 +604,7 @@ public class Asn1Decoder implements ITLV
         // Check if the PDU has been fully decoded.
         if ( isTLVDecoded( container ) )
         {
-            if ( container.getState() == IStates.GRAMMAR_END )
+            if ( container.getState() == States.GRAMMAR_END )
             {
                 // Change the state to DECODED
                 container.setState( TLVStateEnum.PDU_DECODED );

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.asn1.ber;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 
 
@@ -32,10 +32,6 @@ import org.apache.directory.shared.asn1.
  */
 public interface IAsn1Container
 {
-    // ~ Methods
-    // ------------------------------------------------------------------------------------
-
-    // State accessors
     /**
      * Get the current grammar state
      * 
@@ -53,19 +49,19 @@ public interface IAsn1Container
 
 
     /**
-     * Set the current TLV
+     * Get the currentTLV
      * 
-     * @param tlv The current TLV
+     * @return Returns the current TLV being decoded
      */
-    void setCurrentTLV( TLV tlv );
+    TLV getCurrentTLV();
 
 
     /**
-     * Get the currentTLV
+     * Set the current TLV
      * 
-     * @return Returns the current TLV being decoded
+     * @param tlv The current TLV
      */
-    TLV getCurrentTLV();
+    void setCurrentTLV( TLV tlv );
 
 
     /**
@@ -73,7 +69,7 @@ public interface IAsn1Container
      * 
      * @return Returns the grammar used to decode a LdapMessage.
      */
-    IGrammar getGrammar();
+    Grammar getGrammar();
 
 
     /**
@@ -91,10 +87,11 @@ public interface IAsn1Container
      */
     void setTransition( int transition );
 
+    
     /**
      * @return Returns the states.
      */
-    IStates getStates();
+    States getStates();
 
 
     /**
@@ -127,12 +124,14 @@ public interface IAsn1Container
      */
     void grammarEndAllowed( boolean grammarEndAllowed );
     
+    
     /**
      * Get a new TLV id
      * @return a unique value representing the current TLV id
      */
     int getNewTlvId();
 
+    
     /**
      * Get the current TLV id
      * @return a unique value representing the current TLV id

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java Sun Sep  5 10:27:03 2010
@@ -29,24 +29,18 @@ import org.slf4j.LoggerFactory;
 
 
 /**
- * The abstract IGrammar which is the Mother of all the grammars. It contains
+ * The abstract Grammar which is the Mother of all the grammars. It contains
  * the transitions table.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AbstractGrammar implements IGrammar
+public abstract class AbstractGrammar implements Grammar
 {
-    // ~ Static fields/initializers
-    // -----------------------------------------------------------------
-
     /** The logger */
-    private static final Logger log = LoggerFactory.getLogger( AbstractGrammar.class );
+    private static final Logger LOG = LoggerFactory.getLogger( AbstractGrammar.class );
 
     /** Speedup for logs */
-    private static final boolean IS_DEBUG = log.isDebugEnabled();
-
-    // ~ Instance fields
-    // ----------------------------------------------------------------------------
+    private static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /**
      * Table of transitions. It's a two dimension array, the first dimension
@@ -56,10 +50,10 @@ public abstract class AbstractGrammar im
     protected GrammarTransition[][] transitions;
 
     /** The grammar name */
-    protected String name;
+    private String name;
 
     /** The grammar's states */
-    protected IStates statesEnum;
+    private States statesEnum;
 
 
     /** Default constructor */
@@ -68,9 +62,6 @@ public abstract class AbstractGrammar im
     }
 
 
-    // ~ Methods
-    // ------------------------------------------------------------------------------------
-
     /**
      * Return the grammar's name
      * 
@@ -117,10 +108,10 @@ public abstract class AbstractGrammar im
     {
 
         int currentState = container.getTransition();
-        IGrammar currentGrammar = container.getGrammar();
+        Grammar currentGrammar = container.getGrammar();
 
         // We have to deal with the special case of a GRAMMAR_END state
-        if ( currentState == IStates.END_STATE )
+        if ( currentState == States.END_STATE )
         {
             return;
         }
@@ -133,25 +124,24 @@ public abstract class AbstractGrammar im
 
         if ( transition == null )
         {
-
-            String errorMessage = I18n.err( I18n.ERR_00001, currentGrammar.getStatesEnum().getState( currentState ),
+            String errorMessage = I18n.err( I18n.ERR_BAD_TRANSITION_FROM_STATE_00001, currentGrammar.getStatesEnum().getState( currentState ),
                 Asn1StringUtils.dumpByte( tagByte ) );
 
-            log.error( errorMessage );
+            LOG.error( errorMessage );
 
             // If we have no more grammar on the stack, then this is an
             // error
-            throw new DecoderException( I18n.err( I18n.ERR_00002 ) );
+            throw new DecoderException( I18n.err( I18n.ERR_BAD_TRANSITION_00002 ) );
         }
 
         if ( IS_DEBUG )
         {
-            log.debug( transition.toString( currentGrammar.getStatesEnum() ) );
+            LOG.debug( transition.toString( currentGrammar.getStatesEnum() ) );
         }
 
         if ( transition.hasAction() )
         {
-            IAction action = transition.getAction();
+            Action action = transition.getAction();
             action.action( container );
         }
 
@@ -164,7 +154,7 @@ public abstract class AbstractGrammar im
      * 
      * @return Returns the statesEnum.
      */
-    public IStates getStatesEnum()
+    public States getStatesEnum()
     {
         return statesEnum;
     }
@@ -175,7 +165,7 @@ public abstract class AbstractGrammar im
      * 
      * @param statesEnum The statesEnum to set.
      */
-    public void setStatesEnum( IStates statesEnum )
+    public void setStatesEnum( States statesEnum )
     {
         this.statesEnum = statesEnum;
     }

Copied: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Action.java (from r992571, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Action.java?p2=directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Action.java&p1=directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java&r1=992571&r2=992753&rev=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Action.java Sun Sep  5 10:27:03 2010
@@ -25,23 +25,18 @@ import org.apache.directory.shared.asn1.
 
 
 /**
- * IAction interface just contains the method 'action' which must be implemented
+ * Action interface just contains the method 'action' which must be implemented
  * in all the implementong classes.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface IAction
+public interface Action
 {
-    // ~ Methods
-    // ------------------------------------------------------------------------------------
-
     /**
      * The action to be executed.
      * 
-     * @param container
-     *            The container which stores the current data
-     * @throws DecoderException
-     *             Thrown if something went wrong.
+     * @param container The container which stores the current data
+     * @throws DecoderException Thrown if something went wrong.
      */
     void action( IAsn1Container container ) throws DecoderException;
 }

Copied: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Grammar.java (from r992571, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Grammar.java?p2=directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Grammar.java&p1=directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java&r1=992571&r2=992753&rev=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/Grammar.java Sun Sep  5 10:27:03 2010
@@ -29,19 +29,14 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface IGrammar
+public interface Grammar
 {
-    // ~ Methods
-    // ------------------------------------------------------------------------------------
-
     /**
      * This method, when called, execute an action on the current data stored in
      * the container.
      * 
-     * @param asn1Container
-     *            Store the data being processed.
-     * @throws DecoderException
-     *             Thrown when an unrecoverable error occurs.
+     * @param asn1Container Store the data being processed.
+     * @throws DecoderException Thrown when an unrecoverable error occurs.
      */
     void executeAction( IAsn1Container asn1Container ) throws DecoderException;
 
@@ -59,14 +54,13 @@ public interface IGrammar
      * 
      * @return The specific States Enum for the current grammar
      */
-    IStates getStatesEnum();
+    States getStatesEnum();
 
 
     /**
      * Set the grammar's name
      * 
-     * @param name
-     *            The grammar name
+     * @param name The grammar name
      */
     void setName( String name );
 }

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java Sun Sep  5 10:27:03 2010
@@ -26,11 +26,8 @@ package org.apache.directory.shared.asn1
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class GrammarAction implements IAction
+public abstract class GrammarAction implements Action
 {
-    // ~ Instance fields
-    // ----------------------------------------------------------------------------
-
     /** The action's name */
     protected String name;
 
@@ -51,9 +48,6 @@ public abstract class GrammarAction impl
     }
 
 
-    // ~ Methods
-    // ------------------------------------------------------------------------------------
-
     /**
      * Print the action's name
      * 

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java Sun Sep  5 10:27:03 2010
@@ -25,14 +25,14 @@ import org.apache.directory.shared.asn1.
 
 /**
  * Define a transition between two states of a grammar. It stores the next
- * state, and the action to execute while transiting.
+ * state, and the action to execute while executing the transition.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class GrammarTransition
 {
     /** The action associated to the transition */
-    private IAction action;
+    private Action action;
 
     /** The previous state */
     private int previousState;
@@ -43,9 +43,6 @@ public class GrammarTransition
     /** The current tag */
     private int currentTag;
 
-    // ~ Constructors
-    // -------------------------------------------------------------------------------
-
     /**
      * Creates a new GrammarTransition object.
      * 
@@ -54,7 +51,7 @@ public class GrammarTransition
      * @param currentTag the current TLV's tag
      * @param action The action to execute. It could be null.
      */
-    public GrammarTransition( int previousState, int currentState, int currentTag, IAction action )
+    public GrammarTransition( int previousState, int currentState, int currentTag, Action action )
     {
         this.previousState = previousState;
         this.currentState = currentState;
@@ -62,42 +59,27 @@ public class GrammarTransition
         this.currentTag = currentTag;
     }
 
+    
     /**
      * Tells if the transition has an associated action.
      * 
-     * @return <code>true</code> if an action has been asociated to the
-     *         transition
+     * @return <code>true</code> if an action has been associated to the transition
      */
     public boolean hasAction()
     {
         return action != null;
     }
 
+    
     /**
      * @return Returns the action associated with the transition
      */
-    public IAction getAction()
+    public Action getAction()
     {
         return action;
     }
 
-    /**
-     * @param statesEnum Starting state.
-     * @return A representation of the transition as a string.
-     */
-    public String toString( IStates statesEnum )
-    {
-
-        StringBuffer sb = new StringBuffer();
-
-        sb.append( "Transition from state <" ).append( statesEnum.getState( previousState ) ).append( "> " );
-        sb.append( "to state <" ).append( statesEnum.getState( currentState ) ).append( ">, " );
-        sb.append( "tag <" ).append(  Asn1StringUtils.dumpByte( (byte)currentTag ) ).append( ">, " );
-        sb.append( "action : " ).append( ( ( action == null ) ? "no action" : action.toString() ) ).append( ">" );
-
-        return sb.toString();
-    }
-
+    
     /**
      * @return The current state
      */
@@ -106,6 +88,7 @@ public class GrammarTransition
         return currentState;
     }
 
+    
     /**
      * @return The previous state
      */
@@ -113,4 +96,30 @@ public class GrammarTransition
     {
         return previousState;
     }
+
+    
+    /**
+     * @param statesEnum Starting state.
+     * @return A representation of the transition as a string.
+     */
+    public String toString( States statesEnum )
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append( "Transition from state <" ).append( statesEnum.getState( previousState ) ).append( "> " );
+        sb.append( "to state <" ).append( statesEnum.getState( currentState ) ).append( ">, " );
+        sb.append( "tag <" ).append( Asn1StringUtils.dumpByte( (byte)currentTag ) ).append( ">, " );
+        sb.append( "action : " );
+        
+        if ( action == null )
+        {
+            sb.append( "no action" );
+        }
+        else
+        {
+            sb.append( action );
+        }
+        
+        return sb.toString();
+    }
 }

Copied: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java (from r992571, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java?p2=directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java&p1=directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java&r1=992571&r2=992753&rev=992753&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/States.java Sun Sep  5 10:27:03 2010
@@ -27,7 +27,7 @@ package org.apache.directory.shared.asn1
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface IStates
+public interface States
 {
     /** The initial state of every grammar */
     int INIT_GRAMMAR_STATE = 0;
@@ -46,14 +46,16 @@ public interface IStates
      */
     String getState( int state );
 
+    
     /** 
      * Return the grammar name of a grammar
      * 
      * @param grammar the grammar from which we want the name
      * @return the grammar's name
      */
-    String getGrammarName( IGrammar grammar );
+    String getGrammarName( Grammar grammar );
 
+    
     /** 
      * Return the grammar name from a grammar number 
      * 

Modified: directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java (original)
+++ directory/shared/trunk/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java Sun Sep  5 10:27:03 2010
@@ -35,8 +35,8 @@ import java.util.ResourceBundle;
 public enum I18n
 {
     // asn1
-    ERR_00001( "ERR_00001" ),
-    ERR_00002( "ERR_00002" ),
+    ERR_BAD_TRANSITION_FROM_STATE_00001( "ERR_BAD_TRANSITION_FROM_STATE_00001" ),
+    ERR_BAD_TRANSITION_00002( "ERR_BAD_TRANSITION_00002" ),
     ERR_00003( "ERR_00003" ),
     ERR_00004( "ERR_00004" ),
     ERR_LENGTH_OVERFLOW_00005( "ERR_LENGTH_OVERFLOW_00005" ),

Modified: directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties (original)
+++ directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties Sun Sep  5 10:27:03 2010
@@ -19,8 +19,8 @@
 #
 
 # asn1
-ERR_00001=Bad transition from state {0}, tag {1}
-ERR_00002=Bad transition !
+ERR_BAD_TRANSITION_FROM_STATE_00001=Bad transition from state {0}, tag {1}
+ERR_BAD_TRANSITION_00002=Bad transition !
 ERR_00003=Cannot put a PDU in a null buffer !
 ERR_00004=The PDU buffer size is too small !
 ERR_LENGTH_OVERFLOW_00005=Overflow : can't have more than 4 bytes long length

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IAction;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
+import org.apache.directory.shared.asn1.ber.grammar.Action;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
@@ -153,7 +153,7 @@ public class LdapMessageGrammar extends 
     static final boolean IS_DEBUG = log.isDebugEnabled();
 
     /** The instance of grammar. LdapMessageGrammar is a singleton */
-    private static IGrammar instance = new LdapMessageGrammar();
+    private static Grammar instance = new LdapMessageGrammar();
 
 
     // ~ Constructors
@@ -165,8 +165,8 @@ public class LdapMessageGrammar extends 
     private LdapMessageGrammar()
     {
 
-        name = LdapMessageGrammar.class.getName();
-        statesEnum = LdapStatesEnum.getInstance();
+        setName( LdapMessageGrammar.class.getName() );
+        setStatesEnum( LdapStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[LdapStatesEnum.LAST_LDAP_STATE][256];
@@ -3376,7 +3376,7 @@ public class LdapMessageGrammar extends 
         // --------------------------------------------------------------------------------------------
         // Controls
         // --------------------------------------------------------------------------------------------
-        IAction addControl = new GrammarAction( "Add Control" )
+        Action addControl = new GrammarAction( "Add Control" )
         {
             public void action( IAsn1Container container ) throws DecoderException
             {
@@ -6605,7 +6605,7 @@ public class LdapMessageGrammar extends 
      * 
      * @return An instance on the LdapMessage Grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapStatesEnum implements IStates
+public class LdapStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -301,7 +301,7 @@ public class LdapStatesEnum implements I
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -327,7 +327,7 @@ public class LdapStatesEnum implements I
      *            The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof LdapMessageGrammar )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlGrammar.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlGrammar.java Sun Sep  5 10:27:03 2010
@@ -25,8 +25,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -56,13 +56,13 @@ public class PasswordPolicyResponseContr
 
     private PasswordPolicyResponseControlGrammar()
     {
-        name = PasswordPolicyResponseControlGrammar.class.getName();
-        statesEnum = PasswordPolicyResponseControlStates.getInstance();
+        setName( PasswordPolicyResponseControlGrammar.class.getName() );
+        setStatesEnum( PasswordPolicyResponseControlStates.getInstance() );
 
         super.transitions = new GrammarTransition[PasswordPolicyResponseControlStates.END_STATE][256];
 
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
-            IStates.INIT_GRAMMAR_STATE, PasswordPolicyResponseControlStates.START_STATE, UniversalTag.SEQUENCE_TAG,
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
+            States.INIT_GRAMMAR_STATE, PasswordPolicyResponseControlStates.START_STATE, UniversalTag.SEQUENCE_TAG,
             new GrammarAction( "Initialization" )
             {
                 public void action( IAsn1Container container ) throws DecoderException
@@ -201,7 +201,7 @@ public class PasswordPolicyResponseContr
 
     }
 
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return INSTANCE;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlStates.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlStates.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlStates.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ppolicy/PasswordPolicyResponseControlStates.java Sun Sep  5 10:27:03 2010
@@ -21,8 +21,8 @@
 package org.apache.directory.shared.ldap.codec.controls.ppolicy;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class PasswordPolicyResponseControlStates implements IStates
+public class PasswordPolicyResponseControlStates implements States
 {
 
     public static final int START_STATE = 0;
@@ -64,7 +64,7 @@ public class PasswordPolicyResponseContr
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -73,7 +73,7 @@ public class PasswordPolicyResponseContr
     /**
      * {@inheritDoc}
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if( grammar instanceof PasswordPolicyResponseControlGrammar )
         {

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -72,8 +72,8 @@ public class SyncDoneValueControlGrammar
      */
     private SyncDoneValueControlGrammar()
     {
-        name = SyncDoneValueControlGrammar.class.getName();
-        statesEnum = SyncDoneValueControlStatesEnum.getInstance();
+        setName( SyncDoneValueControlGrammar.class.getName() );
+        setStatesEnum( SyncDoneValueControlStatesEnum.getInstance() );
 
         super.transitions = new GrammarTransition[SyncDoneValueControlStatesEnum.LAST_SYNC_DONE_VALUE_STATE][256];
 
@@ -84,8 +84,8 @@ public class SyncDoneValueControlGrammar
          *     
          * Initialize the syncDoneValue object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
-            IStates.INIT_GRAMMAR_STATE, SyncDoneValueControlStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE, UniversalTag.SEQUENCE_TAG,
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
+            States.INIT_GRAMMAR_STATE, SyncDoneValueControlStatesEnum.SYNC_DONE_VALUE_SEQUENCE_STATE, UniversalTag.SEQUENCE_TAG,
             new GrammarAction( "Initiaization" )
             {
                 public void action( IAsn1Container container ) throws DecoderException
@@ -184,7 +184,7 @@ public class SyncDoneValueControlGrammar
     /**
      * @return the singleton instance of the SyncDoneValueControlGrammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return INSTANCE;
     }

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -19,8 +19,8 @@
  */
 package org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue;
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 /**
  * 
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncDoneValueControlStatesEnum implements IStates
+public class SyncDoneValueControlStatesEnum implements States
 {
     /***/
     public static final int START_STATE = 0;
@@ -64,7 +64,7 @@ public class SyncDoneValueControlStatesE
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -88,7 +88,7 @@ public class SyncDoneValueControlStatesE
      * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof SyncDoneValueControlGrammar )
         {

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -72,7 +72,7 @@ public class SyncInfoValueControlGrammar
     static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. SyncInfoValueControlGrammar is a singleton */
-    private static IGrammar instance = new SyncInfoValueControlGrammar();
+    private static Grammar instance = new SyncInfoValueControlGrammar();
 
 
     /**
@@ -80,8 +80,8 @@ public class SyncInfoValueControlGrammar
      */
     private SyncInfoValueControlGrammar()
     {
-        name = SyncInfoValueControlGrammar.class.getName();
-        statesEnum = SyncInfoValueControlStatesEnum.getInstance();
+        setName( SyncInfoValueControlGrammar.class.getName() );
+        setStatesEnum( SyncInfoValueControlStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[SyncInfoValueControlStatesEnum.LAST_SYNC_INFO_VALUE_STATE][256];
@@ -94,8 +94,8 @@ public class SyncInfoValueControlGrammar
          *     
          * Initialize the syncInfoValue object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][SyncInfoValueTags.NEW_COOKIE_TAG.getValue()] = 
-            new GrammarTransition( IStates.INIT_GRAMMAR_STATE, 
+        super.transitions[States.INIT_GRAMMAR_STATE][SyncInfoValueTags.NEW_COOKIE_TAG.getValue()] = 
+            new GrammarTransition( States.INIT_GRAMMAR_STATE, 
                                     SyncInfoValueControlStatesEnum.NEW_COOKIE_STATE, 
                                     SyncInfoValueTags.NEW_COOKIE_TAG.getValue(), 
                 new GrammarAction( "NewCookie choice for SyncInfoValueControl" )
@@ -135,8 +135,8 @@ public class SyncInfoValueControlGrammar
          *     
          * Initialize the syncInfoValue object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][SyncInfoValueTags.REFRESH_DELETE_TAG.getValue()] = 
-            new GrammarTransition( IStates.INIT_GRAMMAR_STATE, 
+        super.transitions[States.INIT_GRAMMAR_STATE][SyncInfoValueTags.REFRESH_DELETE_TAG.getValue()] = 
+            new GrammarTransition( States.INIT_GRAMMAR_STATE, 
                                     SyncInfoValueControlStatesEnum.REFRESH_DELETE_STATE, 
                                     SyncInfoValueTags.REFRESH_DELETE_TAG.getValue(), 
                 new GrammarAction( "RefreshDelete choice for SyncInfoValueControl" )
@@ -309,8 +309,8 @@ public class SyncInfoValueControlGrammar
          *     
          * Initialize the syncInfoValue object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][SyncInfoValueTags.REFRESH_PRESENT_TAG.getValue()] = 
-            new GrammarTransition( IStates.INIT_GRAMMAR_STATE, 
+        super.transitions[States.INIT_GRAMMAR_STATE][SyncInfoValueTags.REFRESH_PRESENT_TAG.getValue()] = 
+            new GrammarTransition( States.INIT_GRAMMAR_STATE, 
                                     SyncInfoValueControlStatesEnum.REFRESH_PRESENT_STATE, 
                                     SyncInfoValueTags.REFRESH_PRESENT_TAG.getValue(), 
                 new GrammarAction( "RefreshDelete choice for SyncInfoValueControl" )
@@ -484,8 +484,8 @@ public class SyncInfoValueControlGrammar
          *     
          * Initialize the syncInfoValue object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][SyncInfoValueTags.SYNC_ID_SET_TAG.getValue()] = 
-            new GrammarTransition( IStates.INIT_GRAMMAR_STATE, 
+        super.transitions[States.INIT_GRAMMAR_STATE][SyncInfoValueTags.SYNC_ID_SET_TAG.getValue()] = 
+            new GrammarTransition( States.INIT_GRAMMAR_STATE, 
                                     SyncInfoValueControlStatesEnum.SYNC_ID_SET_STATE, 
                                     SyncInfoValueTags.SYNC_ID_SET_TAG.getValue(), 
                 new GrammarAction( "SyncIdSet choice for SyncInfoValueControl" )
@@ -807,7 +807,7 @@ public class SyncInfoValueControlGrammar
      * 
      * @return An instance on this grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncInfoValueControlStatesEnum implements IStates
+public class SyncInfoValueControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -124,7 +124,7 @@ public class SyncInfoValueControlStatesE
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -148,7 +148,7 @@ public class SyncInfoValueControlStatesE
      * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof SyncInfoValueControlGrammar )
         {

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -68,7 +68,7 @@ public class SyncRequestValueControlGram
     static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. SyncRequestValueControlGrammar is a singleton */
-    private static IGrammar instance = new SyncRequestValueControlGrammar();
+    private static Grammar instance = new SyncRequestValueControlGrammar();
 
 
     /**
@@ -76,8 +76,8 @@ public class SyncRequestValueControlGram
      */
     private SyncRequestValueControlGrammar()
     {
-        name = SyncRequestValueControlGrammar.class.getName();
-        statesEnum = SyncRequestValueControlStatesEnum.getInstance();
+        setName( SyncRequestValueControlGrammar.class.getName() );
+        setStatesEnum( SyncRequestValueControlStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[SyncRequestValueControlStatesEnum.LAST_SYNC_REQUEST_VALUE_STATE][256];
@@ -89,8 +89,8 @@ public class SyncRequestValueControlGram
          *     
          * Initialize the syncRequestValue object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = 
-            new GrammarTransition( IStates.INIT_GRAMMAR_STATE, 
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = 
+            new GrammarTransition( States.INIT_GRAMMAR_STATE, 
                                     SyncRequestValueControlStatesEnum.SYNC_REQUEST_VALUE_SEQUENCE_STATE, 
                                     UniversalTag.SEQUENCE_TAG, 
                 null );
@@ -275,7 +275,7 @@ public class SyncRequestValueControlGram
      * 
      * @return An instance on this grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncRequestValueControlStatesEnum implements IStates
+public class SyncRequestValueControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -92,7 +92,7 @@ public class SyncRequestValueControlStat
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -116,7 +116,7 @@ public class SyncRequestValueControlStat
      * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof SyncRequestValueControlGrammar )
         {

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -66,7 +66,7 @@ public class SyncStateValueControlGramma
     static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. SyncStateValueControlGrammar is a singleton */
-    private static IGrammar instance = new SyncStateValueControlGrammar();
+    private static Grammar instance = new SyncStateValueControlGrammar();
 
 
     /**
@@ -74,8 +74,8 @@ public class SyncStateValueControlGramma
      */
     private SyncStateValueControlGrammar()
     {
-        name = SyncStateValueControlGrammar.class.getName();
-        statesEnum = SyncStateValueControlStatesEnum.getInstance();
+        setName( SyncStateValueControlGrammar.class.getName() );
+        setStatesEnum( SyncStateValueControlStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[SyncStateValueControlStatesEnum.LAST_SYNC_STATE_VALUE_STATE][256];
@@ -87,8 +87,8 @@ public class SyncStateValueControlGramma
          *     
          * Initialize the syncStateValue object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
-            IStates.INIT_GRAMMAR_STATE, SyncStateValueControlStatesEnum.SYNC_STATE_VALUE_SEQUENCE_STATE,
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
+            States.INIT_GRAMMAR_STATE, SyncStateValueControlStatesEnum.SYNC_STATE_VALUE_SEQUENCE_STATE,
             UniversalTag.SEQUENCE_TAG, null );
 
         /** 
@@ -212,7 +212,7 @@ public class SyncStateValueControlGramma
      * 
      * @return An instance on this grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncStateValueControlStatesEnum implements IStates
+public class SyncStateValueControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -92,7 +92,7 @@ public class SyncStateValueControlStates
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -116,7 +116,7 @@ public class SyncStateValueControlStates
      * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof SyncStateValueControlGrammar )
         {

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -74,7 +74,7 @@ public class SyncModifyDnControlGrammar 
     static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. SyncStateValueControlGrammar is a singleton */
-    private static IGrammar instance = new SyncModifyDnControlGrammar();
+    private static Grammar instance = new SyncModifyDnControlGrammar();
 
 
     /**
@@ -82,8 +82,8 @@ public class SyncModifyDnControlGrammar 
      */
     private SyncModifyDnControlGrammar()
     {
-        name = SyncModifyDnControlGrammar.class.getName();
-        statesEnum = SyncModifyDnControlStatesEnum.getInstance();
+        setName( SyncModifyDnControlGrammar.class.getName() );
+        setStatesEnum( SyncModifyDnControlStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[SyncModifyDnControlStatesEnum.LAST_SYNC_MODDN_VALUE_STATE][256];
@@ -95,8 +95,8 @@ public class SyncModifyDnControlGrammar 
          *     
          * Initialize the SyncModifyDnControl object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
-            IStates.INIT_GRAMMAR_STATE, SyncModifyDnControlStatesEnum.SYNC_MODDN_VALUE_SEQUENCE_STATE,
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
+            States.INIT_GRAMMAR_STATE, SyncModifyDnControlStatesEnum.SYNC_MODDN_VALUE_SEQUENCE_STATE,
             UniversalTag.SEQUENCE_TAG, null );
 
         /** 
@@ -382,7 +382,7 @@ public class SyncModifyDnControlGrammar 
      * 
      * @return An instance on this grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SyncModifyDnControlStatesEnum implements IStates
+public class SyncModifyDnControlStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -116,7 +116,7 @@ public class SyncModifyDnControlStatesEn
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -140,7 +140,7 @@ public class SyncModifyDnControlStatesEn
      * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof SyncModifyDnControlGrammar )
         {

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -60,7 +60,7 @@ public class CancelGrammar extends Abstr
     static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. CancelGrammar is a singleton */
-    private static IGrammar instance = new CancelGrammar();
+    private static Grammar instance = new CancelGrammar();
 
 
     /**
@@ -68,8 +68,8 @@ public class CancelGrammar extends Abstr
      */
     private CancelGrammar()
     {
-        name = CancelGrammar.class.getName();
-        statesEnum = CancelStatesEnum.getInstance();
+        setName( CancelGrammar.class.getName() );
+        setStatesEnum( CancelStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[CancelStatesEnum.LAST_CANCEL_STATE][256];
@@ -81,8 +81,8 @@ public class CancelGrammar extends Abstr
          * 
          * Creates the Cancel object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = 
-            new GrammarTransition( IStates.INIT_GRAMMAR_STATE,
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = 
+            new GrammarTransition( States.INIT_GRAMMAR_STATE,
                                     CancelStatesEnum.CANCEL_SEQUENCE_STATE, 
                                     UniversalTag.SEQUENCE_TAG,
                 new GrammarAction(
@@ -144,7 +144,7 @@ public class CancelGrammar extends Abstr
      * 
      * @return An instance on this grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.extended.operations.cancel;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CancelStatesEnum implements IStates
+public class CancelStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -84,7 +84,7 @@ public class CancelStatesEnum implements
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -108,7 +108,7 @@ public class CancelStatesEnum implements
      * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof CancelGrammar )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -64,13 +64,13 @@ public class CertGenerationGrammar exten
     static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The instance of grammar. CertGenerationObjectGrammar is a singleton */
-    private static IGrammar instance = new CertGenerationGrammar();
+    private static Grammar instance = new CertGenerationGrammar();
 
 
     public CertGenerationGrammar()
     {
-        name = CertGenerationGrammar.class.getName();
-        statesEnum = CertGenerationStatesEnum.getInstance();
+        setName( CertGenerationGrammar.class.getName() );
+        setStatesEnum( CertGenerationStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[CertGenerationStatesEnum.LAST_CERT_GENERATION_STATE][256];
@@ -83,8 +83,8 @@ public class CertGenerationGrammar exten
          *     
          * Creates the CertGenerationObject object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
-            IStates.INIT_GRAMMAR_STATE, CertGenerationStatesEnum.CERT_GENERATION_REQUEST_SEQUENCE_STATE,
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = new GrammarTransition(
+            States.INIT_GRAMMAR_STATE, CertGenerationStatesEnum.CERT_GENERATION_REQUEST_SEQUENCE_STATE,
             UniversalTag.SEQUENCE_TAG, new GrammarAction( "Init CertGenerationObject" )
             {
                 public void action( IAsn1Container container )
@@ -268,7 +268,7 @@ public class CertGenerationGrammar exten
      * 
      * @return An instance on this grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationStatesEnum.java?rev=992753&r1=992752&r2=992753&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationStatesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationStatesEnum.java Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.extended.operations.certGeneration;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 /**
  * This class store the CertGeneration's grammar constants. It is also used
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CertGenerationStatesEnum implements IStates
+public class CertGenerationStatesEnum implements States
 {
 
     /** start state*/
@@ -72,7 +72,7 @@ public class CertGenerationStatesEnum im
      * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof CertGenerationGrammar )
         {
@@ -111,7 +111,7 @@ public class CertGenerationStatesEnum im
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -70,7 +70,7 @@ public class GracefulDisconnectGrammar e
     static final boolean IS_DEBUG = log.isDebugEnabled();
 
     /** The instance of grammar. GracefulDisconnectnGrammar is a singleton */
-    private static IGrammar instance = new GracefulDisconnectGrammar();
+    private static Grammar instance = new GracefulDisconnectGrammar();
 
 
     /**
@@ -170,8 +170,8 @@ public class GracefulDisconnectGrammar e
      */
     private GracefulDisconnectGrammar()
     {
-        name = GracefulDisconnectGrammar.class.getName();
-        statesEnum = GracefulDisconnectStatesEnum.getInstance();
+        setName( GracefulDisconnectGrammar.class.getName() );
+        setStatesEnum( GracefulDisconnectStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[GracefulDisconnectStatesEnum.LAST_GRACEFUL_DISCONNECT_STATE][256];
@@ -183,8 +183,8 @@ public class GracefulDisconnectGrammar e
          * 
          * Creates the GracefulDisconnect object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = 
-            new GrammarTransition( IStates.INIT_GRAMMAR_STATE,
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = 
+            new GrammarTransition( States.INIT_GRAMMAR_STATE,
                                     GracefulDisconnectStatesEnum.GRACEFUL_DISCONNECT_SEQUENCE_STATE, 
                                     UniversalTag.SEQUENCE_TAG,
                 new GrammarAction(
@@ -337,7 +337,7 @@ public class GracefulDisconnectGrammar e
      * 
      * @return An instance on this grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect;
 
 
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class GracefulDisconnectStatesEnum implements IStates
+public class GracefulDisconnectStatesEnum implements States
 {
     // ~ Static fields/initializers
     // -----------------------------------------------------------------
@@ -96,7 +96,7 @@ public class GracefulDisconnectStatesEnu
      * 
      * @return An instance on this class
      */
-    public static IStates getInstance()
+    public static States getInstance()
     {
         return instance;
     }
@@ -120,7 +120,7 @@ public class GracefulDisconnectStatesEnu
      * @param grammar The grammar class
      * @return The grammar name
      */
-    public String getGrammarName( IGrammar grammar )
+    public String getGrammarName( Grammar grammar )
     {
         if ( grammar instanceof GracefulDisconnectGrammar )
         {

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=992753&r1=992752&r2=992753&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 Sun Sep  5 10:27:03 2010
@@ -24,8 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-import org.apache.directory.shared.asn1.ber.grammar.IStates;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
+import org.apache.directory.shared.asn1.ber.grammar.States;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -61,7 +61,7 @@ public class GracefulShutdownGrammar ext
     static final boolean IS_DEBUG = log.isDebugEnabled();
 
     /** The instance of grammar. GracefulShutdownGrammar is a singleton */
-    private static IGrammar instance = new GracefulShutdownGrammar();
+    private static Grammar instance = new GracefulShutdownGrammar();
 
 
     /**
@@ -69,8 +69,8 @@ public class GracefulShutdownGrammar ext
      */
     private GracefulShutdownGrammar()
     {
-        name = GracefulShutdownGrammar.class.getName();
-        statesEnum = GracefulShutdownStatesEnum.getInstance();
+        setName( GracefulShutdownGrammar.class.getName() );
+        setStatesEnum( GracefulShutdownStatesEnum.getInstance() );
 
         // Create the transitions table
         super.transitions = new GrammarTransition[GracefulShutdownStatesEnum.LAST_GRACEFUL_SHUTDOWN_STATE][256];
@@ -83,8 +83,8 @@ public class GracefulShutdownGrammar ext
          *     
          * Creates the GracefulShutdown object
          */
-        super.transitions[IStates.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = 
-            new GrammarTransition( IStates.INIT_GRAMMAR_STATE, 
+        super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] = 
+            new GrammarTransition( States.INIT_GRAMMAR_STATE, 
                 GracefulShutdownStatesEnum.GRACEFUL_SHUTDOWN_SEQUENCE_STATE, 
                 UniversalTag.SEQUENCE_TAG,
                 new GrammarAction( "Init GracefulShutdown" )
@@ -234,7 +234,7 @@ public class GracefulShutdownGrammar ext
      * 
      * @return An instance on this grammar
      */
-    public static IGrammar getInstance()
+    public static Grammar getInstance()
     {
         return instance;
     }



Mime
View raw message