directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1083837 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/...
Date Mon, 21 Mar 2011 15:37:00 GMT
Author: elecharny
Date: Mon Mar 21 15:36:58 2011
New Revision: 1083837

URL: http://svn.apache.org/viewvc?rev=1083837&view=rev
Log:
Switched from OID to Oid

Added:
    directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid.java
      - copied, changed from r1083832, directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid1.java
Removed:
    directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid1.java
Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
    directory/shared/trunk/asn1/api/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java
    directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/AddControl.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedResponse/StoreResponseName.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/intermediateResponse/StoreIntermediateResponseName.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java
    directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Mon Mar 21 15:36:58 2011
@@ -30,7 +30,7 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -1093,7 +1093,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public ExtendedResponse extended( OID oid, byte[] value ) throws LdapException
+    public ExtendedResponse extended( Oid oid, byte[] value ) throws LdapException
     {
         return extended( ( String ) null );
     }
@@ -1102,7 +1102,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public ExtendedResponse extended( OID oid ) throws LdapException
+    public ExtendedResponse extended( Oid oid ) throws LdapException
     {
         return extended( ( String ) null );
     }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Mon Mar 21 15:36:58 2011
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -621,7 +621,7 @@ public abstract class AbstractStore<E, I
         // Check that the index ID is valid
         String oid = index.getAttributeId();
 
-        if ( !OID.isOID( oid ) )
+        if ( !Oid.isOid( oid ) )
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_309, oid ) );
         }

Copied: directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid.java (from r1083832, directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid1.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid.java?p2=directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid.java&p1=directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid1.java&r1=1083832&r2=1083837&rev=1083837&view=diff
==============================================================================
--- directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid1.java (original)
+++ directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/shared/asn1/util/Oid.java Mon Mar 21 15:36:58 2011
@@ -27,11 +27,11 @@ import org.apache.directory.shared.i18n.
 
 
 /**
- * This class implement an OID (Object Identifier).<br/>
+ * This class implement an Oid (Object Identifier).<br/>
  * <br/>
- * An OID is encoded as a list of bytes representing integers.<br/>
+ * An Oid is encoded as a list of bytes representing integers.<br/>
  * <br/>
- * An OID has a numeric representation where number are separated with dots :<br/>
+ * An Oid has a numeric representation where number are separated with dots :<br/>
  * SPNEGO Oid = 1.3.6.1.5.5.2<br/>
  * <br/>
  * Translating from a byte list to a dot separated list of number follows the rules :<br/>
@@ -63,9 +63,9 @@ import org.apache.directory.shared.i18n.
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class Oid1
+public class Oid
 {
-    /** The OID as a array of int */
+    /** The Oid as a array of int */
     private long[] oidValues;
 
     /** The hashcode, computed only once */
@@ -73,9 +73,9 @@ public class Oid1
 
 
     /**
-     * Creates a new OID object.
+     * Creates a new Oid object.
      */
-    public Oid1()
+    public Oid()
     {
         // We should not create this kind of object directly, it must
         // be created through the factory.
@@ -84,41 +84,41 @@ public class Oid1
 
 
     /**
-     * Create a new OID object from a byte array
+     * Create a new Oid object from a byte array
      *
-     * @param oid the byte array containing the OID
+     * @param oid the byte array containing the Oid
      * @throws org.apache.directory.shared.asn1.DecoderException if the byte array does not contain a
-     * valid OID
+     * valid Oid
      */
-    public Oid1( byte[] oid ) throws DecoderException
+    public Oid( byte[] oid ) throws DecoderException
     {
-        setOID( oid );
+        setOid( oid );
         hash = computeHashCode();
     }
 
 
     /**
-     * Create a new OID object from a String
+     * Create a new Oid object from a String
      *
-     * @param oid The String which is supposed to be an OID
+     * @param oid The String which is supposed to be an Oid
      * @throws DecoderException if the byte array does not contain a
-     * valid OID
+     * valid Oid
      */
-    public Oid1( String oid ) throws DecoderException
+    public Oid( String oid ) throws DecoderException
     {
-        setOID( oid );
+        setOid( oid );
         hash = computeHashCode();
     }
 
 
     /**
-     * Set the OID. It will be translated from a byte array to an internal
+     * Set the Oid. It will be translated from a byte array to an internal
      * representation.
      *
-     * @param oid The bytes containing the OID
-     * @throws org.apache.directory.shared.asn1.DecoderException if the byte array does not contains a valid OID
+     * @param oid The bytes containing the Oid
+     * @throws org.apache.directory.shared.asn1.DecoderException if the byte array does not contains a valid Oid
      */
-    public void setOID( byte[] oid ) throws DecoderException
+    public void setOid( byte[] oid ) throws DecoderException
     {
         if ( oid == null )
         {
@@ -206,16 +206,16 @@ public class Oid1
 
 
     /**
-     * Set the OID. It will be translated from a String to an internal
+     * Set the Oid. It will be translated from a String to an internal
      * representation.
      *
      * The syntax will be controled in respect with this rule :
-     * OID = ( [ '0' | '1' ] '.' [ 0 .. 39 ] | '2' '.' int) ( '.' int )*
+     * Oid = ( [ '0' | '1' ] '.' [ 0 .. 39 ] | '2' '.' int) ( '.' int )*
      *
-     * @param oid The String containing the OID
-     * @throws org.apache.directory.shared.asn1.DecoderException if the byte array does not contains a valid OID
+     * @param oid The String containing the Oid
+     * @throws org.apache.directory.shared.asn1.DecoderException if the byte array does not contains a valid Oid
      */
-    public void setOID( String oid ) throws DecoderException
+    public void setOid( String oid ) throws DecoderException
     {
         if ( ( oid == null ) || ( oid.length() == 0 ) )
         {
@@ -327,11 +327,11 @@ public class Oid1
 
 
     /**
-     * Get an array of long from the OID
+     * Get an array of long from the Oid
      *
-     * @return An array of long representing the OID
+     * @return An array of long representing the Oid
      */
-    public long[] getOIDValues()
+    public long[] getOidValues()
     {
         long[] copy = new long[oidValues.length];
 
@@ -342,11 +342,11 @@ public class Oid1
 
 
     /**
-     * Get the number of bytes necessary to store the OID
+     * Get the number of bytes necessary to store the Oid
      *
-     * @return An int representing the length of the OID
+     * @return An int representing the length of the Oid
      */
-    public int getOIDLength()
+    public int getOidLength()
     {
         long value = oidValues[0] * 40 + oidValues[1];
         int nbBytes = 0;
@@ -403,16 +403,16 @@ public class Oid1
 
 
     /**
-     * Get an array of bytes from the OID
+     * Get an array of bytes from the Oid
      *
-     * @return An array of int representing the OID
+     * @return An array of int representing the Oid
      */
-    public byte[] getOID()
+    public byte[] getOid()
     {
         long value = oidValues[0] * 40 + oidValues[1];
         long firstValues = value;
 
-        byte[] bytes = new byte[getOIDLength()];
+        byte[] bytes = new byte[getOidLength()];
         int pos = 0;
 
         if ( oidValues[0] < 2 )
@@ -495,10 +495,10 @@ public class Oid1
 
     /**
      * Compute the hash code for this object. No need to compute
-     * it live when calling the hashCode() method, as an OID
+     * it live when calling the hashCode() method, as an Oid
      * never change.
      *
-     * @return the OID's hash code
+     * @return the Oid's hash code
      */
     private int computeHashCode()
     {
@@ -517,11 +517,11 @@ public class Oid1
 
 
     /**
-     * Check that an OID is valid
+     * Check that an Oid is valid
      * @param oid The oid to be checked
-     * @return <code>true</code> if the OID is valid
+     * @return <code>true</code> if the Oid is valid
      */
-    public static boolean isOID( String oid )
+    public static boolean isOid( String oid )
     {
         if ( ( oid == null ) || ( oid.length() == 0 ) )
         {
@@ -628,9 +628,9 @@ public class Oid1
 
 
     /**
-     * Get the OID as a String
+     * Get the Oid as a String
      *
-     * @return A String representing the OID
+     * @return A String representing the Oid
      */
     @Override
     public String toString()
@@ -682,7 +682,7 @@ public class Oid1
             return false;
         }
 
-        Oid1 instance = ( Oid1 ) oid;
+        Oid instance = ( Oid ) oid;
 
         if ( instance.hash != hash )
         {

Modified: directory/shared/trunk/asn1/api/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/api/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/asn1/api/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java (original)
+++ directory/shared/trunk/asn1/api/src/test/java/org/apache/directory/shared/asn1/util/OIDTest.java Mon Mar 21 15:36:58 2011
@@ -52,11 +52,11 @@ public class OIDTest
     public void testOidNull()
     {
 
-        OID oid = new OID();
+        Oid oid = new Oid();
 
         try
         {
-            oid.setOID( ( byte[] ) null );
+            oid.setOid( ( byte[] ) null );
             fail( "Should not reach this point ..." );
         }
         catch ( DecoderException de )
@@ -73,11 +73,11 @@ public class OIDTest
     public void testOidEmpty()
     {
 
-        OID oid = new OID();
+        Oid oid = new Oid();
 
         try
         {
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 {} );
             fail( "Should not reach this point ..." );
         }
@@ -95,7 +95,7 @@ public class OIDTest
     public void testOidItuT()
     {
 
-        OID oid = new OID();
+        Oid oid = new Oid();
 
         try
         {
@@ -103,20 +103,20 @@ public class OIDTest
             // itu-t(0), recommendation(0), series a-z (0..26)
             for ( int i = 1; i < 27; i++ )
             {
-                oid.setOID( new byte[]
+                oid.setOid( new byte[]
                     { 0x00, ( byte ) i } );
                 assertEquals( "0.0." + i, oid.toString() );
             }
 
             // itu-t(0), question(1)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 0x01 } );
             assertEquals( "0.1", oid.toString() );
 
             // itu-t(0), administration(2), country(202 .. 748)
             for ( int i = 202; i < 748; i++ )
             {
-                oid.setOID( new byte[]
+                oid.setOid( new byte[]
                     { 0x02, ( byte ) ( ( i / 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
                 assertEquals( "0.2." + i, oid.toString() );
             }
@@ -127,13 +127,13 @@ public class OIDTest
 
                 if ( i < ( 128 * 128 ) )
                 {
-                    oid.setOID( new byte[]
+                    oid.setOid( new byte[]
                         { 0x03, ( byte ) ( ( i / 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
                     assertEquals( "0.3." + i, oid.toString() );
                 }
                 else
                 {
-                    oid.setOID( new byte[]
+                    oid.setOid( new byte[]
                         { 0x03, ( byte ) ( ( i / ( 128 * 128 ) ) | 0x0080 ),
                             ( byte ) ( ( ( i / 128 ) % 128 ) | 0x0080 ), ( byte ) ( i % 128 ) } );
                     assertEquals( "0.3." + i, oid.toString() );
@@ -155,28 +155,28 @@ public class OIDTest
     public void testOidIso()
     {
 
-        OID oid = new OID();
+        Oid oid = new Oid();
 
         try
         {
 
             // iso(1), standard(0)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 40 + 0 } );
             assertEquals( "1.0", oid.toString() );
 
             // iso(1), registration-authority(1)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 40 + 1 } );
             assertEquals( "1.1", oid.toString() );
 
             // iso(1), member-body(2)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 40 + 2 } );
             assertEquals( "1.2", oid.toString() );
 
             // iso(1), identified-organization(3) | org(3) | organization(3)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 40 + 3 } );
             assertEquals( "1.3", oid.toString() );
         }
@@ -194,40 +194,40 @@ public class OIDTest
     public void testOidJointIsoItuT()
     {
 
-        OID oid = new OID();
+        Oid oid = new Oid();
 
         try
         {
 
             // joint-iso-itu-t(2), presentation(0)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 80 + 0 } );
             assertEquals( "2.0", oid.toString() );
 
             // joint-iso-itu-t(2), asn1(1)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 80 + 1 } );
             assertEquals( "2.1", oid.toString() );
 
             // joint-iso-itu-t(2), association-control(2)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 80 + 2 } );
             assertEquals( "2.2", oid.toString() );
 
             // joint-iso-itu-t(2), reliable-transfer(3)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 80 + 3 } );
             assertEquals( "2.3", oid.toString() );
 
             // ...
             // joint-iso-itu-t(2), upu(40)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 80 + 40 } );
             assertEquals( "2.40", oid.toString() );
 
             // ...
             // joint-iso-itu-t(2), xxx(100)
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { ( byte ) ( 0x81 ), 0x34 } );
             assertEquals( "2.100", oid.toString() );
         }
@@ -245,23 +245,23 @@ public class OIDTest
     public void testOidStringGood()
     {
 
-        OID oid = new OID();
+        Oid oid = new Oid();
 
         try
         {
-            oid.setOID( "0.0" );
+            oid.setOid( "0.0" );
             assertEquals( "0.0", oid.toString() );
 
-            oid.setOID( "0.0.0.0.0" );
+            oid.setOid( "0.0.0.0.0" );
             assertEquals( "0.0.0.0.0", oid.toString() );
 
-            oid.setOID( "0.1.2.3.4" );
+            oid.setOid( "0.1.2.3.4" );
             assertEquals( "0.1.2.3.4", oid.toString() );
 
-            oid.setOID( "2.123456" );
+            oid.setOid( "2.123456" );
             assertEquals( "2.123456", oid.toString() );
 
-            oid.setOID( "1.2.840.113554.1.2.2" );
+            oid.setOid( "1.2.840.113554.1.2.2" );
             assertEquals( "1.2.840.113554.1.2.2", oid.toString() );
         }
         catch ( DecoderException de )
@@ -277,16 +277,16 @@ public class OIDTest
     @Test
     public void testOidStringBad()
     {
-        assertFalse( OID.isOID( "0" ) );
-        assertFalse( OID.isOID( "0." ) );
-        assertFalse( OID.isOID( "." ) );
-        assertFalse( OID.isOID( "0.1.2." ) );
-        assertFalse( OID.isOID( "3.1" ) );
-        assertFalse( OID.isOID( "0..1" ) );
-        assertFalse( OID.isOID( "0..12" ) );
-        assertFalse( OID.isOID( "0.a.2" ) );
-        assertTrue( OID.isOID( "0.123456" ) );
-        assertTrue( OID.isOID( "1.123456" ) );
+        assertFalse( Oid.isOid( "0" ) );
+        assertFalse( Oid.isOid( "0." ) );
+        assertFalse( Oid.isOid( "." ) );
+        assertFalse( Oid.isOid( "0.1.2." ) );
+        assertFalse( Oid.isOid( "3.1" ) );
+        assertFalse( Oid.isOid( "0..1" ) );
+        assertFalse( Oid.isOid( "0..12" ) );
+        assertFalse( Oid.isOid( "0.a.2" ) );
+        assertTrue( Oid.isOid( "0.123456" ) );
+        assertTrue( Oid.isOid( "1.123456" ) );
     }
 
 
@@ -297,11 +297,11 @@ public class OIDTest
     public void testOidSpnego()
     {
 
-        OID oid = new OID();
+        Oid oid = new Oid();
 
         try
         {
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 0x2b, 0x06, 0x01, 0x05, 0x05, 0x02 } );
 
             assertEquals( "1.3.6.1.5.5.2", oid.toString() );
@@ -320,11 +320,11 @@ public class OIDTest
     public void testOidKerberosV5()
     {
 
-        OID oid = new OID();
+        Oid oid = new Oid();
 
         try
         {
-            oid.setOID( new byte[]
+            oid.setOid( new byte[]
                 { 0x2a, ( byte ) 0x86, 0x48, ( byte ) 0x86, ( byte ) 0xf7, 0x12, 0x01, 0x02, 0x02 } );
 
             assertEquals( "1.2.840.113554.1.2.2", oid.toString() );
@@ -342,29 +342,29 @@ public class OIDTest
     @Test
     public void testOidBytes()
     {
-        OID oid = new OID();
-        OID oid2 = new OID();
+        Oid oid = new Oid();
+        Oid oid2 = new Oid();
 
         try
         {
-            oid.setOID( "0.0" );
-            oid2.setOID( oid.getOID() );
+            oid.setOid( "0.0" );
+            oid2.setOid( oid.getOid() );
             assertEquals( oid.toString(), oid2.toString() );
 
-            oid.setOID( "0.0.0.0.0" );
-            oid2.setOID( oid.getOID() );
+            oid.setOid( "0.0.0.0.0" );
+            oid2.setOid( oid.getOid() );
             assertEquals( oid.toString(), oid2.toString() );
 
-            oid.setOID( "0.1.2.3.4" );
-            oid2.setOID( oid.getOID() );
+            oid.setOid( "0.1.2.3.4" );
+            oid2.setOid( oid.getOid() );
             assertEquals( oid.toString(), oid2.toString() );
 
-            oid.setOID( "2.123456" );
-            oid2.setOID( oid.getOID() );
+            oid.setOid( "2.123456" );
+            oid2.setOid( oid.getOid() );
             assertEquals( oid.toString(), oid2.toString() );
 
-            oid.setOID( "1.2.840.113554.1.2.2" );
-            oid2.setOID( oid.getOID() );
+            oid.setOid( "1.2.840.113554.1.2.2" );
+            oid2.setOid( oid.getOid() );
             assertEquals( oid.toString(), oid2.toString() );
         }
         catch ( DecoderException de )
@@ -379,9 +379,9 @@ public class OIDTest
     @Test
     public void testOidEquals() throws DecoderException
     {
-        OID oid1 = new OID();
-        OID oid2 = new OID();
-        OID oid3 = new OID( "1.1" );
+        Oid oid1 = new Oid();
+        Oid oid2 = new Oid();
+        Oid oid3 = new Oid( "1.1" );
 
         assertTrue( oid1.equals( oid2 ) );
         assertFalse( oid1.equals( oid3 ) );
@@ -398,9 +398,9 @@ public class OIDTest
         String s2 = "1.2.840.113554.1.2.2.1.2.840.113554.1.2.2.1.2.840.113554.1.2.2";
         String s3 = "1.3.6.1.5.5.2";
         
-        OID oid1 = new OID( s1 );
-        OID oid2 = new OID( s2 );
-        OID oid3 = new OID( s3 );
+        Oid oid1 = new Oid( s1 );
+        Oid oid2 = new Oid( s2 );
+        Oid oid3 = new Oid( s3 );
         
         assertTrue( oid1.equals( oid2 ) );
         assertFalse( oid1.equals( oid3 ) );

Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java Mon Mar 21 15:36:58 2011
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.util.Asn1StringUtils;
 import org.apache.directory.shared.asn1.util.BitString;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 
 
@@ -741,7 +741,7 @@ public class Value
      * @throws EncoderException if the PDU in which the value should be encoded is
      * two small
      */
-    public static void encode( ByteBuffer buffer, OID oid ) throws EncoderException
+    public static void encode( ByteBuffer buffer, Oid oid ) throws EncoderException
     {
         if ( buffer == null )
         {
@@ -751,11 +751,11 @@ public class Value
         try
         {
             buffer.put( UniversalTag.OCTET_STRING.getValue() );
-            buffer.put( TLV.getBytes( oid.getOIDLength() ) );
+            buffer.put( TLV.getBytes( oid.getOidLength() ) );
 
-            if ( oid.getOIDLength() != 0 )
+            if ( oid.getOidLength() != 0 )
             {
-                buffer.put( oid.getOID() );
+                buffer.put( oid.getOid() );
             }
         }
         catch ( BufferOverflowException boe )

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Mon Mar 21 15:36:58 2011
@@ -27,16 +27,16 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.dsmlv2.AbstractDsmlMessageDecorator;
 import org.apache.directory.shared.dsmlv2.AbstractGrammar;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Container;
 import org.apache.directory.shared.dsmlv2.Dsmlv2StatesEnum;
+import org.apache.directory.shared.dsmlv2.Grammar;
 import org.apache.directory.shared.dsmlv2.GrammarAction;
 import org.apache.directory.shared.dsmlv2.GrammarTransition;
-import org.apache.directory.shared.dsmlv2.Grammar;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.dsmlv2.Tag;
 import org.apache.directory.shared.dsmlv2.reponse.ErrorResponse.ErrorResponseType;
@@ -1203,7 +1203,7 @@ public final class Dsmlv2ResponseGrammar
 
         if ( attributeValue != null )
         {
-            if ( !OID.isOID(attributeValue) )
+            if ( !Oid.isOid(attributeValue) )
             {
                 throw new XmlPullParserException( I18n.err( I18n.ERR_03006 ), xpp, null );
             }
@@ -1842,7 +1842,7 @@ public final class Dsmlv2ResponseGrammar
 
                 if ( !nextText.equals( "" ) )
                 {
-                    extendedResponse.setResponseName( new OID( nextText.trim() ).toString() );
+                    extendedResponse.setResponseName( new Oid( nextText.trim() ).toString() );
                 }
 
             }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java Mon Mar 21 15:36:58 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
@@ -146,7 +146,7 @@ public class ExtendedResponseDsml extend
      * 
      * @param responseName The name to set.
      */
-    public void setResponseName( OID responseName )
+    public void setResponseName( Oid responseName )
     {
         getDecorated().setResponseName( responseName.toString() );
     }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Mon Mar 21 15:36:58 2011
@@ -26,14 +26,14 @@ import java.lang.reflect.Array;
 import java.util.HashMap;
 
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.dsmlv2.AbstractGrammar;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Container;
 import org.apache.directory.shared.dsmlv2.Dsmlv2StatesEnum;
+import org.apache.directory.shared.dsmlv2.Grammar;
 import org.apache.directory.shared.dsmlv2.GrammarAction;
 import org.apache.directory.shared.dsmlv2.GrammarTransition;
-import org.apache.directory.shared.dsmlv2.Grammar;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.dsmlv2.Tag;
 import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml.OnError;
@@ -1577,7 +1577,7 @@ public final class Dsmlv2Grammar extends
                 {
                     String oid = nextText.trim();
 
-                    if ( OID.isOID( oid ) )
+                    if ( Oid.isOid( oid ) )
                     {
                         extendedRequest.setRequestName( nextText.trim() );
                     }
@@ -2760,7 +2760,7 @@ public final class Dsmlv2Grammar extends
 
             if ( attributeValue != null )
             {
-                if ( !OID.isOID( attributeValue ) )
+                if ( !Oid.isOid( attributeValue ) )
                 {
                     throw new XmlPullParserException( I18n.err( I18n.ERR_03034 ), xpp, null );
                 }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java Mon Mar 21 15:36:58 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.request;
 
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
@@ -109,7 +109,7 @@ public class ExtendedRequestDsml<Q exten
      * 
      * @param requestName The request name to set.
      */
-    public void setRequestName( OID requestName )
+    public void setRequestName( Oid requestName )
     {
         getDecorated().setRequestName( requestName.toString() );
     }

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Mon Mar 21 15:36:58 2011
@@ -32,7 +32,7 @@ import java.util.Collection;
 import java.util.Map;
 
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -570,7 +570,7 @@ public class ExtendedResponseTest extend
 
         try
         {
-            assertEquals( new OID( "1.2.3.4.5.6.7.8.9.0" ).toString(), extendedResponse.getResponseName().toString() );
+            assertEquals( new Oid( "1.2.3.4.5.6.7.8.9.0" ).toString(), extendedResponse.getResponseName().toString() );
         }
         catch ( DecoderException e )
         {
@@ -724,7 +724,7 @@ public class ExtendedResponseTest extend
 
         try
         {
-            assertEquals( new OID( "1.2.3.4.5.6.7.8.9.0" ).toString(), extendedResponse.getResponseName().toString() );
+            assertEquals( new Oid( "1.2.3.4.5.6.7.8.9.0" ).toString(), extendedResponse.getResponseName().toString() );
         }
         catch ( DecoderException e )
         {

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Mon Mar 21 15:36:58 2011
@@ -23,7 +23,7 @@ package org.apache.directory.ldap.client
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -549,7 +549,7 @@ public interface LdapConnection
      * @param oid the object identifier of the extended operation
      * @return extended operation's response
      * @throws LdapException if some error occurred
-     * @see #extended(org.apache.directory.shared.asn1.util.OID, byte[])
+     * @see #extended(org.apache.directory.shared.asn1.util.Oid, byte[])
      */
     ExtendedResponse extended( String oid ) throws LdapException;
 
@@ -561,7 +561,7 @@ public interface LdapConnection
      * @param value value to be used by the extended operation, can be a null value
      * @return extended operation's response
      * @throws LdapException if some error occurred
-     * @see #extended(org.apache.directory.shared.asn1.util.OID, byte[])
+     * @see #extended(org.apache.directory.shared.asn1.util.Oid, byte[])
      */
     ExtendedResponse extended( String oid, byte[] value ) throws LdapException;
 
@@ -572,9 +572,9 @@ public interface LdapConnection
      * @param oid the object identifier of the extended operation
      * @return extended operation's response
      * @throws LdapException if some error occurred
-     * @see #extended(org.apache.directory.shared.asn1.util.OID, byte[])
+     * @see #extended(org.apache.directory.shared.asn1.util.Oid, byte[])
      */
-    ExtendedResponse extended( OID oid ) throws LdapException;
+    ExtendedResponse extended( Oid oid ) throws LdapException;
 
 
     /**
@@ -585,7 +585,7 @@ public interface LdapConnection
      * @return extended operation's response
      * @throws LdapException if some error occurred
      */
-    ExtendedResponse extended( OID oid, byte[] value ) throws LdapException;
+    ExtendedResponse extended( Oid oid, byte[] value ) throws LdapException;
 
 
     /**

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Mon Mar 21 15:36:58 2011
@@ -57,7 +57,7 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.ldap.client.api.future.ResponseFuture;
 import org.apache.directory.ldap.client.api.future.SearchFuture;
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.codec.api.BinaryAttributeDetector;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
@@ -2905,7 +2905,7 @@ public class LdapNetworkConnection exten
     {
         try
         {
-            return extended( new OID( oid ), value );
+            return extended( new Oid( oid ), value );
         }
         catch ( DecoderException e )
         {
@@ -2919,7 +2919,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ExtendedResponse extended( OID oid ) throws LdapException
+    public ExtendedResponse extended( Oid oid ) throws LdapException
     {
         return extended( oid, null );
     }
@@ -2928,7 +2928,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public ExtendedResponse extended( OID oid, byte[] value ) throws LdapException
+    public ExtendedResponse extended( Oid oid, byte[] value ) throws LdapException
     {
         ExtendedRequest<?> extendedRequest =
             LdapCodecServiceFactory.getSingleton().newExtendedRequest( oid.toString(), value );

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/AddControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/AddControl.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/AddControl.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/controls/AddControl.java Mon Mar 21 15:36:58 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
@@ -84,7 +84,7 @@ public class AddControl extends GrammarA
         String oidValue = Strings.asciiBytesToString(value);
 
         // The OID is encoded as a String, not an Object Id
-        if ( !OID.isOID(oidValue) )
+        if ( !Oid.isOid(oidValue) )
         {
             LOG.error( I18n.err( I18n.ERR_04098, Strings.dumpBytes(value) ) );
 

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java Mon Mar 21 15:36:58 2011
@@ -23,11 +23,11 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
@@ -87,7 +87,7 @@ public class StoreExtendedRequestName ex
             {
                 String requestName = Strings.utf8ToString(requestNameBytes);
 
-                if ( !OID.isOID( requestName ) )
+                if ( !Oid.isOid( requestName ) )
                 {
 
                     String msg = "The Request name is not a valid OID : "

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedResponse/StoreResponseName.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedResponse/StoreResponseName.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedResponse/StoreResponseName.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedResponse/StoreResponseName.java Mon Mar 21 15:36:58 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator;
@@ -83,7 +83,7 @@ public class StoreResponseName extends G
         }
         else
         {
-            extendedResponse.setResponseName( new OID( Strings.asciiBytesToString(tlv.getValue().getData()) )
+            extendedResponse.setResponseName( new Oid( Strings.asciiBytesToString(tlv.getValue().getData()) )
                 .toString() );
         }
 

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/intermediateResponse/StoreIntermediateResponseName.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/intermediateResponse/StoreIntermediateResponseName.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/intermediateResponse/StoreIntermediateResponseName.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/intermediateResponse/StoreIntermediateResponseName.java Mon Mar 21 15:36:58 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.IntermediateResponseDecorator;
@@ -85,9 +85,9 @@ public class StoreIntermediateResponseNa
 
             String oidStr = Strings.utf8ToString(responseNameBytes);
 
-            if ( OID.isOID( oidStr ) )
+            if ( Oid.isOid( oidStr ) )
             {
-                OID.isOID( oidStr );
+                Oid.isOid( oidStr );
                 intermediateResponse.setResponseName( oidStr );
             }
             else

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java Mon Mar 21 15:36:58 2011
@@ -26,7 +26,7 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
@@ -620,7 +620,7 @@ public class DefaultEntryAttribute imple
         }
         
         // Not found in names, check the OID
-        return OID.isOID(id) && attributeType.getOid().equals(id);
+        return Oid.isOid(id) && attributeType.getOid().equals(id);
     }
     
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java Mon Mar 21 15:36:58 2011
@@ -41,7 +41,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
@@ -759,7 +759,7 @@ public class LdifReader implements Itera
         // Create and check the OID
         String oidString = lowerLine.substring( 0, pos );
 
-        if ( !OID.isOID(oidString) )
+        if ( !Oid.isOid(oidString) )
         {
             String message = I18n.err( I18n.ERR_12031_INVALID_OID, oidString );
             LOG.error( message );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java Mon Mar 21 15:36:58 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.model.schema.comparators;
 
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.util.Chars;
 import org.apache.directory.shared.util.Strings;
@@ -78,7 +78,7 @@ public class ObjectIdentifierFirstCompon
         
         String numericOid = s.substring( start, pos );
         
-        if ( OID.isOID(numericOid) )
+        if ( Oid.isOid(numericOid) )
         {
             return numericOid;
         }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java Mon Mar 21 15:36:58 2011
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapSchemaException;
@@ -91,7 +91,7 @@ public abstract class DefaultSchemaObjec
      */
     public String getSchemaName( String oid ) throws LdapException
     {
-        if ( !OID.isOID( oid ) )
+        if ( !Oid.isOid( oid ) )
         {
             String msg = I18n.err( I18n.ERR_04267 );
             LOG.warn( msg );
@@ -242,7 +242,7 @@ public abstract class DefaultSchemaObjec
      */
     public T unregister( String numericOid ) throws LdapException
     {
-        if ( !OID.isOID( numericOid ) )
+        if ( !Oid.isOid( numericOid ) )
         {
             String msg = I18n.err( I18n.ERR_04272, numericOid );
             LOG.error( msg );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/OidRegistry.java Mon Mar 21 15:36:58 2011
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -187,7 +187,7 @@ public class OidRegistry<T extends Schem
 
         String oid = schemaObject.getOid();
 
-        if ( !OID.isOID( oid ) )
+        if ( !Oid.isOid( oid ) )
         {
             String message = I18n.err( I18n.ERR_04290 );
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java Mon Mar 21 15:36:58 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.shared.util.Strings;
@@ -92,7 +92,7 @@ public class NumericOidSyntaxChecker ext
         }
 
         // Just check that the value is a valid OID
-        boolean result = ( OID.isOID( strValue ) );
+        boolean result = ( Oid.isOid( strValue ) );
         
         if ( result )
         {

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java Mon Mar 21 15:36:58 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
 
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.shared.util.Strings;
@@ -102,7 +102,7 @@ public class OidLenSyntaxChecker extends
         if ( pos < 0 )
         {
             // Not found ... but it may still be a valid OID
-            boolean result = OID.isOID(strValue);
+            boolean result = Oid.isOid(strValue);
             
             if ( result )
             {
@@ -120,7 +120,7 @@ public class OidLenSyntaxChecker extends
             // we should have a len value. First check that the OID is valid
             String oid = strValue.substring( 0, pos );
             
-            if ( !OID.isOID( oid ) )
+            if ( !Oid.isOid( oid ) )
             {
                 LOG.debug( "Syntax invalid for '{}'", value );
                 return false;

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java Mon Mar 21 15:36:58 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
 
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.shared.util.Chars;
@@ -101,7 +101,7 @@ public class OidSyntaxChecker extends Sy
         // checked to make sure there are no other chars except '.' and digits.
         if ( Chars.isDigit(strValue.charAt(0)) )
         {
-            if ( ! OID.isOID(strValue) )
+            if ( ! Oid.isOid(strValue) )
             {
                 LOG.debug( "Syntax invalid for '{}'", value );
                 return false;

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Mon Mar 21 15:36:58 2011
@@ -26,14 +26,14 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
@@ -51,12 +51,12 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
-import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
-import org.apache.directory.shared.ldap.model.schema.registries.Registries;
-import org.apache.directory.shared.ldap.model.schema.registries.Schema;
 import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
+import org.apache.directory.shared.ldap.model.schema.parsers.NormalizerDescription;
 import org.apache.directory.shared.ldap.model.schema.parsers.SyntaxCheckerDescription;
 import org.apache.directory.shared.ldap.model.schema.registries.DefaultSchema;
+import org.apache.directory.shared.ldap.model.schema.registries.Registries;
+import org.apache.directory.shared.ldap.model.schema.registries.Schema;
 import org.apache.directory.shared.util.Base64;
 import org.apache.directory.shared.util.StringConstants;
 import org.apache.directory.shared.util.Strings;
@@ -112,7 +112,7 @@ public class SchemaEntityFactory impleme
 
         String oid = mOid.getString();
 
-        if ( !OID.isOID(oid) )
+        if ( !Oid.isOid(oid) )
         {
             String msg = I18n.err( I18n.ERR_10006, oid );
             LOG.warn( msg );
@@ -139,7 +139,7 @@ public class SchemaEntityFactory impleme
             throw new IllegalArgumentException( msg );
         }
 
-        if ( !OID.isOID( oid ) )
+        if ( !Oid.isOid( oid ) )
         {
             String msg = I18n.err( I18n.ERR_10006, oid );
             LOG.warn( msg );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Mon Mar 21 15:36:58 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.sche
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
@@ -323,7 +323,7 @@ public class AttributeTypeEditorOverview
 
             String oid = oidText.getText();
 
-            if ( OID.isOID( oid ) )
+            if ( Oid.isOid( oid ) )
             {
                 if ( ( originalAttributeType.getOid().equals( oid ) )
                     || !( schemaHandler.isAliasOrOidAlreadyTaken( oid ) ) )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Mon Mar 21 15:36:58 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.sche
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
@@ -324,7 +324,7 @@ public class ObjectClassEditorOverviewPa
 
             String oid = oidText.getText();
 
-            if ( OID.isOID( oid ) )
+            if ( Oid.isOid( oid ) )
             {
                 if ( ( originalObjectClass.getOid().equals( oid ) )
                     || !( schemaHandler.isAliasOrOidAlreadyTaken( oid ) ) )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java Mon Mar 21 15:36:58 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -330,12 +330,12 @@ public class NewAttributeTypeGeneralWiza
             displayErrorMessage( Messages.getString( "NewAttributeTypeGeneralWizardPage.ErrorNoOIDSpecified" ) ); //$NON-NLS-1$
             return;
         }
-        if ( ( !oidCombo.getText().equals( "" ) ) && ( !OID.isOID( oidCombo.getText() ) ) ) //$NON-NLS-1$
+        if ( ( !oidCombo.getText().equals( "" ) ) && ( !Oid.isOid( oidCombo.getText() ) ) ) //$NON-NLS-1$
         {
             displayErrorMessage( Messages.getString( "NewAttributeTypeGeneralWizardPage.ErrorIncorrectOID" ) ); //$NON-NLS-1$
             return;
         }
-        if ( ( !oidCombo.getText().equals( "" ) ) && ( OID.isOID( oidCombo.getText() ) ) //$NON-NLS-1$
+        if ( ( !oidCombo.getText().equals( "" ) ) && ( Oid.isOid( oidCombo.getText() ) ) //$NON-NLS-1$
             && ( schemaHandler.isAliasOrOidAlreadyTaken( oidCombo.getText() ) ) )
         {
             displayErrorMessage( Messages.getString( "NewAttributeTypeGeneralWizardPage.ErrorObjectOIDExists" ) ); //$NON-NLS-1$

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java?rev=1083837&r1=1083836&r2=1083837&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java Mon Mar 21 15:36:58 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.shared.asn1.util.OID;
+import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -331,12 +331,12 @@ public class NewObjectClassGeneralPageWi
             displayErrorMessage( Messages.getString( "NewObjectClassGeneralPageWizardPage.ErrorNoOIDSpecified" ) ); //$NON-NLS-1$
             return;
         }
-        if ( ( !oidCombo.getText().equals( "" ) ) && ( !OID.isOID( oidCombo.getText() ) ) ) //$NON-NLS-1$
+        if ( ( !oidCombo.getText().equals( "" ) ) && ( !Oid.isOid( oidCombo.getText() ) ) ) //$NON-NLS-1$
         {
             displayErrorMessage( Messages.getString( "NewObjectClassGeneralPageWizardPage.ErrorIncorrectOID" ) ); //$NON-NLS-1$
             return;
         }
-        if ( ( !oidCombo.getText().equals( "" ) ) && ( OID.isOID( oidCombo.getText() ) ) //$NON-NLS-1$
+        if ( ( !oidCombo.getText().equals( "" ) ) && ( Oid.isOid( oidCombo.getText() ) ) //$NON-NLS-1$
             && ( schemaHandler.isAliasOrOidAlreadyTaken( oidCombo.getText() ) ) )
         {
             displayErrorMessage( Messages.getString( "NewObjectClassGeneralPageWizardPage.ErrorObjectOIDExists" ) ); //$NON-NLS-1$



Mime
View raw message