Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 13406 invoked from network); 5 Sep 2010 10:27:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Sep 2010 10:27:49 -0000 Received: (qmail 69930 invoked by uid 500); 5 Sep 2010 10:27:48 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 69877 invoked by uid 500); 5 Sep 2010 10:27:47 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 69870 invoked by uid 99); 5 Sep 2010 10:27:47 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Sep 2010 10:27:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Sep 2010 10:27:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1DFE82388A40; Sun, 5 Sep 2010 10:27:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r992753 [2/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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100905102706.1DFE82388A40@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -20,8 +20,8 @@ package org.apache.directory.shared.ldap.codec.extended.operations.gracefulShutdown; -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 Apache Directory Project */ -public class GracefulShutdownStatesEnum implements IStates +public class GracefulShutdownStatesEnum implements States { // ~ Static fields/initializers // ----------------------------------------------------------------- @@ -89,7 +89,7 @@ public class GracefulShutdownStatesEnum * * @return An instance on this class */ - public static IStates getInstance() + public static States getInstance() { return instance; } @@ -113,7 +113,7 @@ public class GracefulShutdownStatesEnum * @param grammar The grammar class * @return The grammar name */ - public String getGrammarName( IGrammar grammar ) + public String getGrammarName( Grammar grammar ) { if ( grammar instanceof GracefulShutdownGrammar ) { 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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -25,7 +25,7 @@ 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.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.codec.DecoderException; @@ -50,7 +50,7 @@ public class StoredProcedureGrammar exte static final Logger log = LoggerFactory.getLogger( StoredProcedureGrammar.class ); /** The instance of grammar. StoredProcedureGrammar is a singleton. */ - private static IGrammar instance = new StoredProcedureGrammar(); + private static Grammar instance = new StoredProcedureGrammar(); //~ Constructors ------------------------------------------------------------------------------- @@ -60,8 +60,8 @@ public class StoredProcedureGrammar exte */ private StoredProcedureGrammar() { - name = StoredProcedureGrammar.class.getName(); - statesEnum = StoredProcedureStatesEnum.getInstance(); + setName( StoredProcedureGrammar.class.getName() ); + setStatesEnum( StoredProcedureStatesEnum.getInstance() ); // Create the transitions table super.transitions = new GrammarTransition[StoredProcedureStatesEnum.LAST_STORED_PROCEDURE_STATE][256]; @@ -310,7 +310,7 @@ public class StoredProcedureGrammar exte * * @return An instance on the StoredProcedure 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/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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -21,8 +21,8 @@ package org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure; -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 Apache Directory Project */ -public class StoredProcedureStatesEnum implements IStates +public class StoredProcedureStatesEnum implements States { //~ Static fields/initializers ----------------------------------------------------------------- @@ -105,7 +105,7 @@ public class StoredProcedureStatesEnum i * Get an instance of this class * @return An instance on this class */ - public static IStates getInstance() + public static States getInstance() { return instance; } @@ -127,7 +127,7 @@ public class StoredProcedureStatesEnum i * @param grammar The grammar class * @return The grammar name */ - public String getGrammarName( IGrammar grammar ) + public String getGrammarName( Grammar grammar ) { if ( grammar instanceof StoredProcedureGrammar ) { 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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -24,7 +24,7 @@ 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.Grammar; 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,7 +56,7 @@ public class EntryChangeControlGrammar e static final boolean IS_DEBUG = log.isDebugEnabled(); /** The instance of grammar. EntryChangeControlGrammar is a singleton */ - private static IGrammar instance = new EntryChangeControlGrammar(); + private static Grammar instance = new EntryChangeControlGrammar(); /** @@ -64,8 +64,8 @@ public class EntryChangeControlGrammar e */ private EntryChangeControlGrammar() { - name = EntryChangeControlGrammar.class.getName(); - statesEnum = EntryChangeControlStatesEnum.getInstance(); + setName( EntryChangeControlGrammar.class.getName() ); + setStatesEnum( EntryChangeControlStatesEnum.getInstance() ); // Create the transitions table super.transitions = new GrammarTransition[EntryChangeControlStatesEnum.LAST_EC_STATE][256]; @@ -262,7 +262,7 @@ public class EntryChangeControlGrammar 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/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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -20,8 +20,8 @@ package org.apache.directory.shared.ldap.codec.search.controls.entryChange; -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 Apache Directory Project */ -public class EntryChangeControlStatesEnum implements IStates +public class EntryChangeControlStatesEnum implements States { // ~ Static fields/initializers // ----------------------------------------------------------------- @@ -93,7 +93,7 @@ public class EntryChangeControlStatesEnu * * @return An instance on this class */ - public static IStates getInstance() + public static States getInstance() { return instance; } @@ -117,7 +117,7 @@ public class EntryChangeControlStatesEnu * @param grammar The grammar class * @return The grammar name */ - public String getGrammarName( IGrammar grammar ) + public String getGrammarName( Grammar grammar ) { if ( grammar instanceof EntryChangeControlGrammar ) { 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=992753&r1=992752&r2=992753&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 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; @@ -59,7 +59,7 @@ public class PagedResultsControlGrammar static final boolean IS_DEBUG = log.isDebugEnabled(); /** The instance of grammar. PagedSearchControlGrammar is a singleton */ - private static IGrammar instance = new PagedResultsControlGrammar(); + private static Grammar instance = new PagedResultsControlGrammar(); /** @@ -67,8 +67,8 @@ public class PagedResultsControlGrammar */ private PagedResultsControlGrammar() { - name = PagedResultsControlGrammar.class.getName(); - statesEnum = PagedResultsControlStatesEnum.getInstance(); + setName( PagedResultsControlGrammar.class.getName() ); + setStatesEnum( PagedResultsControlStatesEnum.getInstance() ); // Create the transitions table super.transitions = new GrammarTransition[PagedResultsControlStatesEnum.LAST_PAGED_SEARCH_STATE][256]; @@ -80,8 +80,8 @@ public class PagedResultsControlGrammar * * Nothing to do */ - 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, PagedResultsControlStatesEnum.PAGED_SEARCH_SEQUENCE_STATE, UniversalTag.SEQUENCE_TAG, null ); @@ -174,7 +174,7 @@ public class PagedResultsControlGrammar * * @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/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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -20,8 +20,8 @@ package org.apache.directory.shared.ldap.codec.search.controls.pagedSearch; -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 Apache Directory Project */ -public class PagedResultsControlStatesEnum implements IStates +public class PagedResultsControlStatesEnum implements States { // ~ Static fields/initializers // ----------------------------------------------------------------- @@ -88,7 +88,7 @@ public class PagedResultsControlStatesEn * * @return An instance on this class */ - public static IStates getInstance() + public static States getInstance() { return instance; } @@ -112,7 +112,7 @@ public class PagedResultsControlStatesEn * @param grammar The grammar class * @return The grammar name */ - public String getGrammarName( IGrammar grammar ) + public String getGrammarName( Grammar grammar ) { if ( grammar instanceof PagedResultsControlGrammar ) { 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=992753&r1=992752&r2=992753&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 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; @@ -67,7 +67,7 @@ public class PersistentSearchControlGram static final boolean IS_DEBUG = log.isDebugEnabled(); /** The instance of grammar. PSearchControlGrammar is a singleton */ - private static IGrammar instance = new PersistentSearchControlGrammar(); + private static Grammar instance = new PersistentSearchControlGrammar(); /** @@ -75,8 +75,8 @@ public class PersistentSearchControlGram */ private PersistentSearchControlGrammar() { - name = PersistentSearchControlGrammar.class.getName(); - statesEnum = PersistentSearchControlStatesEnum.getInstance(); + setName( PersistentSearchControlGrammar.class.getName() ); + setStatesEnum( PersistentSearchControlStatesEnum.getInstance() ); // Create the transitions table super.transitions = new GrammarTransition[PersistentSearchControlStatesEnum.LAST_PSEARCH_STATE][256]; @@ -88,8 +88,8 @@ public class PersistentSearchControlGram * * Initialize the persistence search 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, PersistentSearchControlStatesEnum.PSEARCH_SEQUENCE_STATE, UniversalTag.SEQUENCE_TAG, null ); @@ -224,7 +224,7 @@ public class PersistentSearchControlGram * * @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/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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -20,8 +20,8 @@ package org.apache.directory.shared.ldap.codec.search.controls.persistentSearch; -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 Apache Directory Project */ -public class PersistentSearchControlStatesEnum implements IStates +public class PersistentSearchControlStatesEnum implements States { // ~ Static fields/initializers // ----------------------------------------------------------------- @@ -92,7 +92,7 @@ public class PersistentSearchControlStat * * @return An instance on this class */ - public static IStates getInstance() + public static States getInstance() { return instance; } @@ -116,7 +116,7 @@ public class PersistentSearchControlStat * @param grammar The grammar class * @return The grammar name */ - public String getGrammarName( IGrammar grammar ) + public String getGrammarName( Grammar grammar ) { if ( grammar instanceof PersistentSearchControlGrammar ) { 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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -24,7 +24,7 @@ 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.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; @@ -49,7 +49,7 @@ public class SubentriesControlGrammar ex static final Logger log = LoggerFactory.getLogger( SubentriesControlGrammar.class ); /** The instance of grammar. SubEntryControlGrammar is a singleton */ - private static IGrammar instance = new SubentriesControlGrammar(); + private static Grammar instance = new SubentriesControlGrammar(); /** @@ -57,8 +57,8 @@ public class SubentriesControlGrammar ex */ private SubentriesControlGrammar() { - name = SubentriesControlGrammar.class.getName(); - statesEnum = SubentriesControlStatesEnum.getInstance(); + setName( SubentriesControlGrammar.class.getName() ); + setStatesEnum( SubentriesControlStatesEnum.getInstance() ); // Create the transitions table super.transitions = new GrammarTransition[SubentriesControlStatesEnum.LAST_SUB_ENTRY_STATE][256]; @@ -107,7 +107,7 @@ public class SubentriesControlGrammar ex * * @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/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=992753&r1=992752&r2=992753&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 Sun Sep 5 10:27:03 2010 @@ -20,8 +20,8 @@ package org.apache.directory.shared.ldap.codec.search.controls.subentries; -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 Apache Directory Project */ -public class SubentriesControlStatesEnum implements IStates +public class SubentriesControlStatesEnum implements States { // ~ Static fields/initializers // ----------------------------------------------------------------- @@ -81,7 +81,7 @@ public class SubentriesControlStatesEnum * * @return An instance on this class */ - public static IStates getInstance() + public static States getInstance() { return instance; } @@ -105,7 +105,7 @@ public class SubentriesControlStatesEnum * @param grammar The grammar class * @return The grammar name */ - public String getGrammarName( IGrammar grammar ) + public String getGrammarName( Grammar grammar ) { if ( grammar instanceof SubentriesControlGrammar ) {