directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1080949 [2/2] - in /directory: apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/ apacheds/branches/akarasu...
Date Sat, 12 Mar 2011 17:19:18 GMT
Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java Sat Mar 12 17:19:15 2011
@@ -28,7 +28,7 @@ import java.util.List;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.SchemaUtils;
 import org.junit.Test;
@@ -43,12 +43,12 @@ import org.junit.runner.RunWith;
 @Concurrency()
 public class SchemaUtilsTest
 {
-    public static LdapSyntax[] getSyntaxes()
+    public static MutableLdapSyntaxImpl[] getSyntaxes()
     {
-        LdapSyntax[] syntaxes = new LdapSyntax[3];
-        syntaxes[0] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.12", "Dn syntax", true );
-        syntaxes[1] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.15", "Directory String syntax", true );
-        syntaxes[2] = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.58", "Substring assertion syntax", true );
+        MutableLdapSyntaxImpl[] syntaxes = new MutableLdapSyntaxImpl[3];
+        syntaxes[0] = new MutableLdapSyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.12", "Dn syntax", true );
+        syntaxes[1] = new MutableLdapSyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.15", "Directory String syntax", true );
+        syntaxes[2] = new MutableLdapSyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.58", "Substring assertion syntax", true );
         
         return syntaxes;
     }

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/LdapSyntaxDescriptionSchemaParserTest.java Sat Mar 12 17:19:15 2011
@@ -27,7 +27,7 @@ import java.text.ParseException;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
 import org.junit.After;
 import org.junit.Before;
@@ -118,7 +118,7 @@ public class LdapSyntaxDescriptionSchema
     public void testFull() throws ParseException
     {
         String value = null;
-        LdapSyntax ldapSyntax = null;
+        MutableLdapSyntaxImpl ldapSyntax = null;
 
         value = "( 1.2.3.4.5.6.7.8.9.0 DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )";
         ldapSyntax = parser.parseLdapSyntaxDescription( value );
@@ -160,7 +160,7 @@ public class LdapSyntaxDescriptionSchema
     public void testRfcBinary() throws ParseException
     {
         String value = "( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' X-NOT-HUMAN-READABLE 'TRUE' )";
-        LdapSyntax ldapSyntax = parser.parseLdapSyntaxDescription( value );
+        MutableLdapSyntaxImpl ldapSyntax = parser.parseLdapSyntaxDescription( value );
 
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.5", ldapSyntax.getOid() );
         assertEquals( "Binary", ldapSyntax.getDescription() );
@@ -179,7 +179,7 @@ public class LdapSyntaxDescriptionSchema
     public void testSyntaxWithExtensions() throws ParseException
     {
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 DESC 'bogus description' X-SCHEMA 'blah' X-IS-HUMAN-READABLE 'true' )";
-        LdapSyntax ldapSyntax = parser.parseLdapSyntaxDescription( substrate );
+        MutableLdapSyntaxImpl ldapSyntax = parser.parseLdapSyntaxDescription( substrate );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", ldapSyntax.getOid() );
         assertEquals( "bogus description", ldapSyntax.getDescription() );
         assertNotNull( ldapSyntax.getExtensions().get( "X-IS-HUMAN-READABLE" ) );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Sat Mar 12 17:19:15 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.EntityFactory;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -674,7 +674,7 @@ public class SchemaEntityFactory impleme
      * @throws LdapInvalidAttributeValueException 
      * @throws LdapUnwillingToPerformException 
      */
-    public LdapSyntax getSyntax( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
+    public MutableLdapSyntaxImpl getSyntax( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
         String schemaName ) throws LdapInvalidAttributeValueException, LdapUnwillingToPerformException
     {
         checkEntry( entry, SchemaConstants.SYNTAX );
@@ -702,7 +702,7 @@ public class SchemaEntityFactory impleme
         }
 
         // Create the new LdapSyntax instance
-        LdapSyntax syntax = new LdapSyntax( oid );
+        MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( oid );
 
         // The isHumanReadable field
         EntryAttribute mHumanReadable = entry.get( MetaSchemaConstants.X_HUMAN_READABLE_AT );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Sat Mar 12 17:19:15 2011
@@ -44,7 +44,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.EntityFactory;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.MutableLoadableSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
@@ -920,7 +921,7 @@ public class DefaultSchemaManager implem
     {
         for ( Entry entry : schemaLoader.loadSyntaxes( schema ) )
         {
-            LdapSyntax syntax = factory.getSyntax( this, entry, registries, schema.getSchemaName() );
+            MutableLdapSyntaxImpl syntax = factory.getSyntax( this, entry, registries, schema.getSchemaName() );
 
             addSchemaObject( registries, syntax, schema );
         }
@@ -1581,7 +1582,7 @@ public class DefaultSchemaManager implem
     /**
      * {@inheritDoc}
      */
-    public LdapSyntax lookupLdapSyntaxRegistry( String oid ) throws LdapException
+    public MutableLdapSyntax lookupLdapSyntaxRegistry( String oid ) throws LdapException
     {
         return registries.getLdapSyntaxRegistry().lookup( Strings.toLowerCase( oid ).trim() );
     }

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java Sat Mar 12 17:19:15 2011
@@ -40,6 +40,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -1866,12 +1868,12 @@ public class SchemaManagerAddTest
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        LdapSyntax syntax = new LdapSyntax( "1.1.0" );
+        MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.1.0" );
 
         // It should not fail
         assertTrue( schemaManager.add( syntax ) );
 
-        LdapSyntax added = schemaManager.lookupLdapSyntaxRegistry( "1.1.0" );
+        MutableLdapSyntax added = schemaManager.lookupLdapSyntaxRegistry( "1.1.0" );
 
         assertNotNull( added );
         assertEquals( OctetStringSyntaxChecker.class.getName(), added.getSyntaxChecker().getClass().getName() );
@@ -1895,7 +1897,7 @@ public class SchemaManagerAddTest
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        LdapSyntax syntax = new LdapSyntax( "2.5.4.3" );
+        MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "2.5.4.3" );
 
         // It should fail
         assertFalse( schemaManager.add( syntax ) );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java Sat Mar 12 17:19:15 2011
@@ -38,6 +38,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MutableSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -780,14 +782,14 @@ public class SchemaManagerDelTest
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // delete a existing syntax not used by AT and MR
-        LdapSyntax syntax = schemaManager.lookupLdapSyntaxRegistry( "1.3.6.1.4.1.1466.115.121.1.10" );
+        MutableLdapSyntax syntax = schemaManager.lookupLdapSyntaxRegistry( "1.3.6.1.4.1.1466.115.121.1.10" );
         assertTrue( schemaManager.delete( syntax ) );
         
         assertEquals( sSize - 1, schemaManager.getLdapSyntaxRegistry().size() );
         assertEquals( goidSize -1, schemaManager.getGlobalOidRegistry().size() );
 
         // add a syntax and then delete (should behave same as above )
-        syntax = new LdapSyntax( "0.1.1" );
+        syntax = new MutableLdapSyntaxImpl( "0.1.1" );
         assertTrue( schemaManager.add( syntax ) );
 
         assertEquals( sSize, schemaManager.getLdapSyntaxRegistry().size() );
@@ -818,7 +820,7 @@ public class SchemaManagerDelTest
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        LdapSyntax syntax = new LdapSyntax( "0.1.1" );
+        MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "0.1.1" );
         
         assertFalse( schemaManager.delete( syntax ) );
         
@@ -836,11 +838,11 @@ public class SchemaManagerDelTest
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         //1.3.6.1.4.1.1466.115.121.1.26 is used by MR 1.3.6.1.4.1.1466.109.114.2
-        LdapSyntax syntax = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.26" );
+        MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.26" );
         assertFalse( schemaManager.delete( syntax ) );
         
         // syntax 1.3.6.1.4.1.1466.115.121.1.12 is used by MR 2.5.13.1 and many AT
-        syntax = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.12" );
+        syntax = new MutableLdapSyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.12" );
         
         assertFalse( schemaManager.delete( syntax ) );
         
@@ -858,7 +860,7 @@ public class SchemaManagerDelTest
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        LdapSyntax syntax = new LdapSyntax( "1.3.6.1.4.1.1466.115.121.1.15" );
+        MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.3.6.1.4.1.1466.115.121.1.15" );
         
         assertFalse( schemaManager.delete( syntax ) );
         
@@ -887,7 +889,7 @@ public class SchemaManagerDelTest
         assertTrue( isSyntaxPresent( schemaManager, S_OID ) );
 
         // Now try to remove the S
-        LdapSyntax syntax = schemaManager.lookupLdapSyntaxRegistry( S_OID );
+        MutableLdapSyntax syntax = schemaManager.lookupLdapSyntaxRegistry( S_OID );
         
         // shouldn't be deleted cause there is a MR associated with it
         assertFalse( schemaManager.delete( syntax ) );
@@ -934,7 +936,7 @@ public class SchemaManagerDelTest
         assertTrue( isSyntaxPresent( schemaManager, S_OID ) );
 
         // Now try to remove the S
-        LdapSyntax syntax = schemaManager.lookupLdapSyntaxRegistry( S_OID );
+        MutableLdapSyntax syntax = schemaManager.lookupLdapSyntaxRegistry( S_OID );
         
         // shouldn't be deleted cause there is a AT associated with it
         assertFalse( schemaManager.delete( syntax ) );
@@ -990,7 +992,7 @@ public class SchemaManagerDelTest
         assertTrue( errors.get( 0 ) instanceof LdapProtocolErrorException );
 
         // Now delete the using S : it should be OK
-        LdapSyntax syntax = new LdapSyntax( OID );
+        MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( OID );
         assertTrue( schemaManager.delete( syntax ) );
 
         assertEquals( srSize - 1, schemaManager.getLdapSyntaxRegistry().size() );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java Sat Mar 12 17:19:15 2011
@@ -29,7 +29,7 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.connection.core.Utils;
 import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
@@ -80,10 +80,10 @@ public class BinaryAttributesAndSyntaxes
     private String[] attributeNamesAndOids;
 
     /** Map with syntax OID => syntax description */
-    private SortedMap<String, LdapSyntax> syntaxOid2LsdMap;
+    private SortedMap<String, MutableLdapSyntaxImpl> syntaxOid2LsdMap;
 
     /** Map with syntax DESC => syntax description */
-    private SortedMap<String, LdapSyntax> syntaxDesc2LsdMap;
+    private SortedMap<String, MutableLdapSyntaxImpl> syntaxDesc2LsdMap;
 
     /** The syntax OIDs. */
     private String[] syntaxOids;
@@ -164,8 +164,8 @@ public class BinaryAttributesAndSyntaxes
             .size(), attributeOid2AtdMap.size() );
 
         // init available syntaxes
-        syntaxOid2LsdMap = new TreeMap<String, LdapSyntax>();
-        syntaxDesc2LsdMap = new TreeMap<String, LdapSyntax>();
+        syntaxOid2LsdMap = new TreeMap<String, MutableLdapSyntaxImpl>();
+        syntaxDesc2LsdMap = new TreeMap<String, MutableLdapSyntaxImpl>();
         for ( IBrowserConnection browserConnection : connections )
         {
             Schema schema = browserConnection.getSchema();
@@ -214,8 +214,8 @@ public class BinaryAttributesAndSyntaxes
 
     private void createSyntaxMaps( Schema schema )
     {
-        Collection<LdapSyntax> lsds = schema.getLdapSyntaxDescriptions();
-        for ( LdapSyntax lsd : lsds )
+        Collection<MutableLdapSyntaxImpl> lsds = schema.getLdapSyntaxDescriptions();
+        for ( MutableLdapSyntaxImpl lsd : lsds )
         {
             syntaxOid2LsdMap.put( lsd.getOid(), lsd );
 
@@ -543,7 +543,7 @@ public class BinaryAttributesAndSyntaxes
                     {
                         if ( syntaxOid2LsdMap.containsKey( syntax.getSyntaxNumericOid() ) )
                         {
-                            LdapSyntax lsd = ( LdapSyntax ) syntaxOid2LsdMap.get( syntax
+                            MutableLdapSyntaxImpl lsd = ( MutableLdapSyntaxImpl ) syntaxOid2LsdMap.get( syntax
                                 .getSyntaxNumericOid() );
                             return SchemaUtils.toString( lsd );
                         }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Sat Mar 12 17:19:15 2011
@@ -31,7 +31,7 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
@@ -87,10 +87,10 @@ public class ValueEditorsPreferencePage 
     private String[] attributeTypesAndOids;
 
     /** Map with syntax OID => syntax description */
-    private SortedMap<String, LdapSyntax> syntaxOid2LsdMap;
+    private SortedMap<String, MutableLdapSyntaxImpl> syntaxOid2LsdMap;
 
     /** Map with syntax DESC => syntax description */
-    private SortedMap<String, LdapSyntax> syntaxDesc2LsdMap;
+    private SortedMap<String, MutableLdapSyntaxImpl> syntaxDesc2LsdMap;
 
     /** The syntax DESCs and OIDs. */
     private String[] syntaxDescsAndOids;
@@ -204,8 +204,8 @@ public class ValueEditorsPreferencePage 
             .size(), attributeOid2AtdMap.size() );
 
         // init available syntaxes
-        syntaxOid2LsdMap = new TreeMap<String, LdapSyntax>();
-        syntaxDesc2LsdMap = new TreeMap<String, LdapSyntax>();
+        syntaxOid2LsdMap = new TreeMap<String, MutableLdapSyntaxImpl>();
+        syntaxDesc2LsdMap = new TreeMap<String, MutableLdapSyntaxImpl>();
         for ( IBrowserConnection browserConnection : connections )
         {
             Schema schema = browserConnection.getSchema();
@@ -258,8 +258,8 @@ public class ValueEditorsPreferencePage 
 
     private void createSyntaxMaps( Schema schema )
     {
-        Collection<LdapSyntax> lsds = schema.getLdapSyntaxDescriptions();
-        for ( LdapSyntax lsd : lsds )
+        Collection<MutableLdapSyntaxImpl> lsds = schema.getLdapSyntaxDescriptions();
+        for ( MutableLdapSyntaxImpl lsd : lsds )
         {
             syntaxOid2LsdMap.put( lsd.getOid(), lsd );
 
@@ -621,7 +621,7 @@ public class ValueEditorsPreferencePage 
                     {
                         if ( syntaxOid2LsdMap.containsKey( relation.getSyntaxOID() ) )
                         {
-                            LdapSyntax lsd = ( LdapSyntax ) syntaxOid2LsdMap.get( relation
+                            MutableLdapSyntaxImpl lsd = ( MutableLdapSyntaxImpl ) syntaxOid2LsdMap.get( relation
                                 .getSyntaxOID() );
                             return SchemaUtils.toString( lsd );
                         }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java Sat Mar 12 17:19:15 2011
@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.Set;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
 import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
@@ -269,7 +269,7 @@ public class ValueEditorManager
         }
 
         // return default
-        LdapSyntax lsd = schema.getLdapSyntaxDescription( syntaxNumericOid );
+        MutableLdapSyntaxImpl lsd = schema.getLdapSyntaxDescription( syntaxNumericOid );
         if ( SchemaUtils.isBinary( lsd ) )
         {
             return defaultBinaryValueEditor;

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Sat Mar 12 17:19:15 2011
@@ -38,7 +38,7 @@ import org.apache.commons.lang.StringUti
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.name.Dn;
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -72,10 +72,10 @@ public class Schema
 
     public static final String DN_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.12";
 
-    public static final LdapSyntax DUMMY_LDAP_SYNTAX;
+    public static final MutableLdapSyntaxImpl DUMMY_LDAP_SYNTAX;
     static
     {
-        DUMMY_LDAP_SYNTAX = new LdapSyntax( "", "" );
+        DUMMY_LDAP_SYNTAX = new MutableLdapSyntaxImpl( "", "" );
     }
 
     public static final HashMap<String, List<String>> DUMMY_EXTENSIONS;
@@ -130,7 +130,7 @@ public class Schema
 
     private Map<String, AttributeType> atdMapByNameOrNumericOid;
 
-    private Map<String, LdapSyntax> lsdMapByNumericOid;
+    private Map<String, MutableLdapSyntaxImpl> lsdMapByNumericOid;
 
     private Map<String, MatchingRule> mrdMapByNameOrNumericOid;
 
@@ -148,7 +148,7 @@ public class Schema
         this.modifyTimestamp = null;
         this.ocdMapByNameOrNumericOid = new HashMap<String, ObjectClass>();
         this.atdMapByNameOrNumericOid = new HashMap<String, AttributeType>();
-        this.lsdMapByNumericOid = new HashMap<String, LdapSyntax>();
+        this.lsdMapByNumericOid = new HashMap<String, MutableLdapSyntaxImpl>();
         this.mrdMapByNameOrNumericOid = new HashMap<String, MatchingRule>();
         this.mrudMapByNameOrNumericOid = new HashMap<String, MatchingRuleUse>();
     }
@@ -270,7 +270,7 @@ public class Schema
                 }
                 else if ( attributeName.equalsIgnoreCase( SchemaConstants.LDAP_SYNTAXES_AT ) )
                 {
-                    LdapSyntax lsd = lsdParser.parseLdapSyntaxDescription( value );
+                    MutableLdapSyntaxImpl lsd = lsdParser.parseLdapSyntaxDescription( value );
                     if ( StringUtils.isEmpty( lsd.getDescription() )
                         && Utils.getOidDescription( lsd.getOid() ) != null )
                     {
@@ -314,7 +314,7 @@ public class Schema
             String syntaxOid = atd.getSyntaxOid();
             if ( syntaxOid != null && !hasLdapSyntaxDescription( syntaxOid ) )
             {
-                LdapSyntax lsd = new LdapSyntax( syntaxOid );
+                MutableLdapSyntaxImpl lsd = new MutableLdapSyntaxImpl( syntaxOid );
                 lsd.setDescription( Utils.getOidDescription( syntaxOid ) );
                 addLdapSyntax( lsd );
             }
@@ -623,7 +623,7 @@ public class Schema
      * 
      * @param lsd the LDAP syntax description
      */
-    private void addLdapSyntax( LdapSyntax lsd )
+    private void addLdapSyntax( MutableLdapSyntaxImpl lsd )
     {
         if ( lsd.getOid() != null )
         {
@@ -637,9 +637,9 @@ public class Schema
      * 
      * @return the LDAP syntax descriptions
      */
-    public Collection<LdapSyntax> getLdapSyntaxDescriptions()
+    public Collection<MutableLdapSyntaxImpl> getLdapSyntaxDescriptions()
     {
-        Set<LdapSyntax> set = new HashSet<LdapSyntax>( lsdMapByNumericOid.values() );
+        Set<MutableLdapSyntaxImpl> set = new HashSet<MutableLdapSyntaxImpl>( lsdMapByNumericOid.values() );
         return set;
     }
 
@@ -670,7 +670,7 @@ public class Schema
      * 
      * @return the attribute type description or the default or a dummy
      */
-    public LdapSyntax getLdapSyntaxDescription( String numericOid )
+    public MutableLdapSyntaxImpl getLdapSyntaxDescription( String numericOid )
     {
         if ( numericOid == null )
         {
@@ -687,7 +687,7 @@ public class Schema
         else
         {
             // DUMMY
-            LdapSyntax lsd = new LdapSyntax( numericOid );
+            MutableLdapSyntaxImpl lsd = new MutableLdapSyntaxImpl( numericOid );
             lsd.setExtensions( DUMMY_EXTENSIONS );
             return lsd;
         }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java Sat Mar 12 17:19:15 2011
@@ -35,6 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject;
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -428,7 +429,7 @@ public class SchemaUtils
      * 
      * @return false if the syntax is defined as binary
      */
-    public static boolean isString( LdapSyntax lsd )
+    public static boolean isString( MutableLdapSyntaxImpl lsd )
     {
         return !isBinary( lsd );
     }
@@ -442,7 +443,7 @@ public class SchemaUtils
      * 
      * @return true if the syntax is defined as binary
      */
-    public static boolean isBinary( LdapSyntax lsd )
+    public static boolean isBinary( MutableLdapSyntaxImpl lsd )
     {
         // check user-defined binary syntaxes
         Set<String> binarySyntaxOids = BrowserCorePlugin.getDefault().getCorePreferences()
@@ -496,7 +497,7 @@ public class SchemaUtils
         String syntax = getSyntaxNumericOidTransitive( atd, schema );
         if ( syntax != null && schema.hasLdapSyntaxDescription( syntax ) )
         {
-            LdapSyntax lsd = schema.getLdapSyntaxDescription( syntax );
+            MutableLdapSyntaxImpl lsd = schema.getLdapSyntaxDescription( syntax );
             return isBinary( lsd );
         }
 
@@ -512,7 +513,7 @@ public class SchemaUtils
      * 
      * @return all attribute type description using this syntax description
      */
-    public static Collection<AttributeType> getUsedFromAttributeTypeDescriptions( LdapSyntax lsd,
+    public static Collection<AttributeType> getUsedFromAttributeTypeDescriptions( MutableLdapSyntaxImpl lsd,
         Schema schema )
     {
         Set<AttributeType> usedFroms = new TreeSet<AttributeType>( schemaElementNameComparator );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java Sat Mar 12 17:19:15 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.ldap
 
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.connection.core.Connection;
@@ -281,7 +281,7 @@ public class OpenSchemaBrowserAction ext
      * @return
      *      the LDAP Syntax Description
      */
-    private LdapSyntax getLsd()
+    private MutableLdapSyntaxImpl getLsd()
     {
         if ( getConnection() != null )
         {

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java Sat Mar 12 17:19:15 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
 import java.util.Collection;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -362,7 +362,7 @@ public class AttributeTypeDescriptionDet
 
         // set syntax content
         String lsdOid = null;
-        LdapSyntax lsd = null;
+        MutableLdapSyntaxImpl lsd = null;
         long lsdLength = 0;
         if ( atd != null )
         {

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java Sat Mar 12 17:19:15 2011
@@ -25,6 +25,7 @@ import java.util.Collection;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -110,10 +111,10 @@ public class LdapSyntaxDescriptionDetail
      */
     public void setInput( Object input )
     {
-        LdapSyntax lsd = null;
+        MutableLdapSyntaxImpl lsd = null;
         if ( input instanceof LdapSyntax )
         {
-            lsd = ( LdapSyntax ) input;
+            lsd = ( MutableLdapSyntaxImpl ) input;
         }
 
         createMainContent( lsd );
@@ -131,7 +132,7 @@ public class LdapSyntaxDescriptionDetail
      *
      * @param lsd the syntax description
      */
-    private void createMainContent( LdapSyntax lsd )
+    private void createMainContent( MutableLdapSyntaxImpl lsd )
     {
         // dispose old content
         if ( mainSection.getClient() != null )
@@ -175,7 +176,7 @@ public class LdapSyntaxDescriptionDetail
      *
      * @param lsd the syntax description
      */
-    private void createUsedFromContents( LdapSyntax lsd )
+    private void createUsedFromContents( MutableLdapSyntaxImpl lsd )
     {
         // dispose old content
         if ( usedFromSection.getClient() != null && !usedFromSection.getClient().isDisposed() )

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java Sat Mar 12 17:19:15 2011
@@ -22,6 +22,7 @@ package org.apache.directory.studio.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -169,7 +170,7 @@ public class LdapSyntaxDescriptionPage e
         {
             if ( obj instanceof LdapSyntax )
             {
-                return SchemaUtils.toString( ( LdapSyntax ) obj );
+                return SchemaUtils.toString( ( MutableLdapSyntaxImpl ) obj );
             }
             return obj.toString();
         }
@@ -198,11 +199,11 @@ public class LdapSyntaxDescriptionPage e
         {
             if ( e1 instanceof LdapSyntax )
             {
-                e1 = SchemaUtils.toString( ( LdapSyntax ) e1 );
+                e1 = SchemaUtils.toString( ( MutableLdapSyntaxImpl ) e1 );
             }
             if ( e2 instanceof LdapSyntax )
             {
-                e2 = SchemaUtils.toString( ( LdapSyntax ) e2 );
+                e2 = SchemaUtils.toString( ( MutableLdapSyntaxImpl ) e2 );
             }
             return e1.toString().compareTo( e2.toString() );
         }
@@ -222,7 +223,7 @@ public class LdapSyntaxDescriptionPage e
         {
             if ( element instanceof LdapSyntax )
             {
-                LdapSyntax lsd = ( LdapSyntax ) element;
+                MutableLdapSyntaxImpl lsd = ( MutableLdapSyntaxImpl ) element;
                 boolean matched = SchemaUtils.toString( lsd ).toLowerCase()
                     .indexOf( filterText.getText().toLowerCase() ) != -1
                     || lsd.getOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java Sat Mar 12 17:19:15 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
 import java.util.Collection;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
@@ -201,7 +201,7 @@ public class MatchingRuleDescriptionDeta
 
         // set syntax content
         String lsdOid = null;
-        LdapSyntax lsd = null;
+        MutableLdapSyntaxImpl lsd = null;
         if ( mrd != null )
         {
             Schema schema = getSchema();

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java Sat Mar 12 17:19:15 2011
@@ -24,6 +24,7 @@ package org.apache.directory.studio.ldap
 import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject;
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -127,7 +128,7 @@ public class SchemaBrowserNavigationLoca
         {
             schemaElement = connection.getSchema().getAttributeTypeDescription( schemaElementOid );
         }
-        else if ( LdapSyntax.class.getName().equals( schemaElementType ) )
+        else if ( MutableLdapSyntaxImpl.class.getName().equals( schemaElementType ) )
         {
             schemaElement = connection.getSchema().getLdapSyntaxDescription( schemaElementOid );
         }

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java Sat Mar 12 17:19:15 2011
@@ -27,6 +27,7 @@ import org.apache.commons.collections.Mu
 import org.apache.commons.collections.map.MultiValueMap;
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -55,7 +56,7 @@ public class SchemaHandler
     /** The object classes List */
     private List<ObjectClass> objectClassesList;
     /** The syntaxes List */
-    private List<LdapSyntax> syntaxesList;
+    private List<MutableLdapSyntaxImpl> syntaxesList;
 
     //
     // The MultiMap (for fast searching)
@@ -90,7 +91,7 @@ public class SchemaHandler
         attributeTypesList = new ArrayList<AttributeType>();
         matchingRulesList = new ArrayList<MatchingRule>();;
         objectClassesList = new ArrayList<ObjectClass>();
-        syntaxesList = new ArrayList<LdapSyntax>();
+        syntaxesList = new ArrayList<MutableLdapSyntaxImpl>();
 
         // Maps
         schemasMap = new MultiValueMap();
@@ -161,7 +162,7 @@ public class SchemaHandler
      * @return
      *      the List of all the matching rules
      */
-    public List<LdapSyntax> getSyntaxes()
+    public List<MutableLdapSyntaxImpl> getSyntaxes()
     {
         return syntaxesList;
     }
@@ -323,13 +324,13 @@ public class SchemaHandler
      * @return
      *      the corresponding syntax, or null if no one is found
      */
-    public LdapSyntax getSyntax( String id )
+    public MutableLdapSyntaxImpl getSyntax( String id )
     {
         List<?> list = getSyntaxList( id.toLowerCase() );
 
         if ( ( list != null ) && ( list.size() >= 1 ) )
         {
-            return ( LdapSyntax ) list.get( 0 );
+            return ( MutableLdapSyntaxImpl ) list.get( 0 );
         }
         else
         {
@@ -503,7 +504,7 @@ public class SchemaHandler
         }
 
         // Adding its syntaxes
-        for ( LdapSyntax syntax : schema.getSyntaxes() )
+        for ( MutableLdapSyntaxImpl syntax : schema.getSyntaxes() )
         {
             addSchemaObject( syntax );
         }
@@ -564,7 +565,7 @@ public class SchemaHandler
         }
         else if ( object instanceof LdapSyntax )
         {
-            LdapSyntax syntax = ( LdapSyntax ) object;
+            MutableLdapSyntaxImpl syntax = ( MutableLdapSyntaxImpl ) object;
             syntaxesList.add( syntax );
             List<String> names = syntax.getNames();
             if ( names != null )
@@ -610,7 +611,7 @@ public class SchemaHandler
         }
 
         // Removing its syntaxes
-        for ( LdapSyntax syntax : schema.getSyntaxes() )
+        for ( MutableLdapSyntaxImpl syntax : schema.getSyntaxes() )
         {
             removeSchemaObject( syntax );
         }
@@ -671,7 +672,7 @@ public class SchemaHandler
         }
         else if ( object instanceof LdapSyntax )
         {
-            LdapSyntax syntax = ( LdapSyntax ) object;
+            MutableLdapSyntaxImpl syntax = ( MutableLdapSyntaxImpl ) object;
             syntaxesList.remove( syntax );
             List<String> names = syntax.getNames();
             if ( names != null )
@@ -1137,7 +1138,7 @@ public class SchemaHandler
      * @param syntax
      *      the added syntax
      */
-    private void notifySyntaxRuleAdded( LdapSyntax syntax )
+    private void notifySyntaxRuleAdded( MutableLdapSyntaxImpl syntax )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1163,7 +1164,7 @@ public class SchemaHandler
      * @param syntax
      *      the modified syntax
      */
-    private void notifySyntaxRuleModified( LdapSyntax syntax )
+    private void notifySyntaxRuleModified( MutableLdapSyntaxImpl syntax )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1189,7 +1190,7 @@ public class SchemaHandler
      * @param syntax
      *      the removed syntax
      */
-    private void notifySyntaxRemoved( LdapSyntax syntax )
+    private void notifySyntaxRemoved( MutableLdapSyntaxImpl syntax )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java Sat Mar 12 17:19:15 2011
@@ -28,7 +28,7 @@ import java.util.List;
 import org.apache.commons.collections.MultiMap;
 import org.apache.commons.collections.map.MultiValueMap;
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -149,7 +149,7 @@ public class DependenciesComputer
         String syntaxOID = attributeType.getSyntaxOid();
         if ( syntaxOID != null )
         {
-            LdapSyntax syntax = schemaHandler.getSyntax( syntaxOID );
+            MutableLdapSyntaxImpl syntax = schemaHandler.getSyntax( syntaxOID );
             if ( syntax == null )
             {
                 throw new DependencyComputerException( NLS.bind(

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java Sat Mar 12 17:19:15 2011
@@ -25,6 +25,7 @@ import java.util.List;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.registries.DefaultSchema;
@@ -50,7 +51,7 @@ public class Schema extends DefaultSchem
     private List<MatchingRule> matchingRules = new ArrayList<MatchingRule>();
 
     /** The Syntax List */
-    private List<LdapSyntax> syntaxes = new ArrayList<LdapSyntax>();
+    private List<MutableLdapSyntaxImpl> syntaxes = new ArrayList<MutableLdapSyntaxImpl>();
 
 
     /**
@@ -107,7 +108,7 @@ public class Schema extends DefaultSchem
      * @param syntax
      *      the Syntax
      */
-    public boolean addSyntax( LdapSyntax syntax )
+    public boolean addSyntax( MutableLdapSyntaxImpl syntax )
     {
         return syntaxes.add( syntax );
     }
@@ -274,7 +275,7 @@ public class Schema extends DefaultSchem
      */
     public LdapSyntax getSyntax( String id )
     {
-        for ( LdapSyntax syntax : syntaxes )
+        for ( MutableLdapSyntaxImpl syntax : syntaxes )
         {
             List<String> aliases = syntax.getNames();
             if ( aliases != null )
@@ -303,7 +304,7 @@ public class Schema extends DefaultSchem
      * @return
      *      all the Syntax objects contained in the Schema
      */
-    public List<LdapSyntax> getSyntaxes()
+    public List<MutableLdapSyntaxImpl> getSyntaxes()
     {
         return syntaxes;
     }
@@ -351,7 +352,7 @@ public class Schema extends DefaultSchem
      * @param syntax
      *      the Syntax
      */
-    public boolean removeSyntax( LdapSyntax syntax )
+    public boolean removeSyntax( MutableLdapSyntaxImpl syntax )
     {
         return syntaxes.remove( syntax );
     }

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Sat Mar 12 17:19:15 2011
@@ -30,7 +30,7 @@ import javax.naming.directory.SearchCont
 import javax.naming.directory.SearchResult;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
@@ -236,7 +236,7 @@ public class ApacheDsSchemaConnector ext
                             schema.addMatchingRule( mr );
                             break;
                         case SYNTAX:
-                            LdapSyntax syntax = createSyntax( searchResult );
+                            MutableLdapSyntaxImpl syntax = createSyntax( searchResult );
                             syntax.setSchemaName( name );
                             schema.addSyntax( syntax );
                             break;
@@ -382,9 +382,9 @@ public class ApacheDsSchemaConnector ext
      * ObjectClass could be created
      * @throws NamingException 
      */
-    private static LdapSyntax createSyntax( SearchResult sr ) throws NamingException
+    private static MutableLdapSyntaxImpl createSyntax( SearchResult sr ) throws NamingException
     {
-        LdapSyntax syntax = new LdapSyntax( getOid( sr ) );
+        MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( getOid( sr ) );
         syntax.setNames( getNames( sr ) );
         syntax.setDescription( getDescription( sr ) );
         syntax.setObsolete( isObsolete( sr ) );

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Sat Mar 12 17:19:15 2011
@@ -31,7 +31,7 @@ import javax.naming.directory.SearchCont
 import javax.naming.directory.SearchResult;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
@@ -263,9 +263,9 @@ public class GenericSchemaConnector exte
                     String value = ( String ) ne.nextElement();
                     LdapSyntaxDescriptionSchemaParser parser = new LdapSyntaxDescriptionSchemaParser();
                     parser.setQuirksMode( true );
-                    LdapSyntax lsd = parser.parseLdapSyntaxDescription( value );
+                    MutableLdapSyntaxImpl lsd = parser.parseLdapSyntaxDescription( value );
 
-                    LdapSyntax impl = new LdapSyntax( lsd.getOid() );
+                    MutableLdapSyntaxImpl impl = new MutableLdapSyntaxImpl( lsd.getOid() );
                     impl.setDescription( lsd.getDescription() );
                     impl.setNames( new String[]
                         { lsd.getDescription() } );
@@ -283,7 +283,7 @@ public class GenericSchemaConnector exte
             String syntaxOid = at.getSyntaxOid();
             if ( syntaxOid != null && schema.getSyntax( syntaxOid ) == null )
             {
-                LdapSyntax impl = new LdapSyntax( syntaxOid );
+                MutableLdapSyntaxImpl impl = new MutableLdapSyntaxImpl( syntaxOid );
                 impl.setSchemaName( schema.getSchemaName() );
                 String oidDescription = Utils.getOidDescription( syntaxOid );
                 impl.setDescription( oidDescription != null ? oidDescription : "Dummy" ); //$NON-NLS-1$

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Sat Mar 12 17:19:15 2011
@@ -26,7 +26,7 @@ import java.io.OutputStream;
 import java.util.List;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
@@ -226,11 +226,11 @@ public class XMLSchemaFileExporter
             }
 
             // Syntaxes
-            List<LdapSyntax> syntaxes = schema.getSyntaxes();
+            List<MutableLdapSyntaxImpl> syntaxes = schema.getSyntaxes();
             if ( ( syntaxes != null ) && ( syntaxes.size() >= 1 ) )
             {
                 Element syntaxesNode = element.addElement( SYNTAXES_TAG );
-                for ( LdapSyntax syntax : syntaxes )
+                for ( MutableLdapSyntaxImpl syntax : syntaxes )
                 {
                     toXml( syntax, syntaxesNode );
                 }
@@ -523,7 +523,7 @@ public class XMLSchemaFileExporter
      * @return
      *      the corresponding source code representation
      */
-    private static void toXml( LdapSyntax syntax, Element root )
+    private static void toXml( MutableLdapSyntaxImpl syntax, Element root )
     {
         Element syntaxNode = root.addElement( SYNTAX_TAG );
 

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Sat Mar 12 17:19:15 2011
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
@@ -712,13 +712,13 @@ public class XMLSchemaFileImporter
      */
     private static void readSyntax( Element element, Schema schema ) throws XMLSchemaFileImportException
     {
-        LdapSyntax syntax = null;
+        MutableLdapSyntaxImpl syntax = null;
 
         // OID
         Attribute oidAttribute = element.attribute( OID_TAG );
         if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
         {
-            syntax = new LdapSyntax( oidAttribute.getValue() );
+            syntax = new MutableLdapSyntaxImpl( oidAttribute.getValue() );
         }
         else
         {

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java Sat Mar 12 17:19:15 2011
@@ -27,7 +27,7 @@ import java.util.List;
 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.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.registries.AbstractSchemaLoader;
@@ -138,9 +138,9 @@ public class SchemaEditorSchemaLoader ex
         {
             for ( Schema schema : schemas )
             {
-                List<LdapSyntax> syntaxes = project.getSchemaHandler().getSchema( schema.getSchemaName() )
+                List<MutableLdapSyntaxImpl> syntaxes = project.getSchemaHandler().getSchema( schema.getSchemaName() )
                     .getSyntaxes();
-                for ( LdapSyntax syntax : syntaxes )
+                for ( MutableLdapSyntaxImpl syntax : syntaxes )
                 {
                     syntaxList.add( SchemaEditorSchemaLoaderUtils.toEntry( syntax ) );
                 }

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java Sat Mar 12 17:19:15 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
@@ -197,7 +197,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the object class converted to an equivalent entry representation
      * @throws LdapException
      */
-    public static Entry toEntry( LdapSyntax syntax ) throws LdapException
+    public static Entry toEntry( MutableLdapSyntaxImpl syntax ) throws LdapException
     {
         // Creating a blank entry
         Entry entry = new DefaultEntry();

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java Sat Mar 12 17:19:15 2011
@@ -24,6 +24,7 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
 
 
@@ -41,8 +42,8 @@ public class ATESyntaxComboComparator im
     {
         if ( o1 instanceof LdapSyntax && o2 instanceof LdapSyntax )
         {
-            List<String> syntax1Names = ( ( LdapSyntax ) o1 ).getNames();
-            List<String> syntax2Names = ( ( LdapSyntax ) o2 ).getNames();
+            List<String> syntax1Names = ( ( MutableLdapSyntaxImpl ) o1 ).getNames();
+            List<String> syntax2Names = ( ( MutableLdapSyntaxImpl ) o2 ).getNames();
 
             if ( ( syntax1Names != null ) && ( syntax2Names != null ) && ( syntax1Names.size() > 0 )
                 && ( syntax2Names.size() > 0 ) )
@@ -52,7 +53,7 @@ public class ATESyntaxComboComparator im
         }
         else if ( o1 instanceof LdapSyntax && o2 instanceof NonExistingSyntax )
         {
-            List<String> syntax1Names = ( ( LdapSyntax ) o1 ).getNames();
+            List<String> syntax1Names = ( ( MutableLdapSyntaxImpl ) o1 ).getNames();
             String syntax2Name = ( ( NonExistingSyntax ) o2 ).getName();
 
             if ( ( syntax1Names != null ) && ( syntax2Name != null ) && ( syntax1Names.size() > 0 ) )
@@ -63,7 +64,7 @@ public class ATESyntaxComboComparator im
         else if ( o1 instanceof NonExistingSyntax && o2 instanceof LdapSyntax )
         {
             String syntax1Name = ( ( NonExistingSyntax ) o1 ).getName();
-            List<String> syntax2Names = ( ( LdapSyntax ) o2 ).getNames();
+            List<String> syntax2Names = ( ( MutableLdapSyntaxImpl ) o2 ).getNames();
 
             if ( ( syntax1Name != null ) && ( syntax2Names != null ) && ( syntax2Names.size() > 0 ) )
             {

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java Sat Mar 12 17:19:15 2011
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -52,7 +53,7 @@ public class ATESyntaxComboContentProvid
                 input.addChild( new NonExistingSyntax( NonExistingSyntax.NONE ) );
 
                 // Creating Children
-                List<LdapSyntax> syntaxes = Activator.getDefault().getSchemaHandler().getSyntaxes();
+                List<MutableLdapSyntaxImpl> syntaxes = Activator.getDefault().getSchemaHandler().getSyntaxes();
                 for ( LdapSyntax syntax : syntaxes )
                 {
                     input.addChild( syntax );

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java Sat Mar 12 17:19:15 2011
@@ -21,6 +21,7 @@ package org.apache.directory.studio.sche
 
 
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.osgi.util.NLS;
@@ -40,7 +41,7 @@ public class ATESyntaxComboLabelProvider
     {
         if ( obj instanceof LdapSyntax )
         {
-            LdapSyntax syntax = ( LdapSyntax ) obj;
+            MutableLdapSyntaxImpl syntax = ( MutableLdapSyntaxImpl ) obj;
 
             String name = syntax.getName();
             if ( name != null )

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Sat Mar 12 17:19:15 2011
@@ -27,6 +27,7 @@ import java.util.List;
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -485,7 +486,7 @@ public class AttributeTypeEditorOverview
 
             if ( selectedItem instanceof LdapSyntax )
             {
-                modifiedAttributeType.setSyntaxOid( ( ( LdapSyntax ) selectedItem ).getOid() );
+                modifiedAttributeType.setSyntaxOid( ( ( MutableLdapSyntaxImpl ) selectedItem ).getOid() );
             }
             else if ( selectedItem instanceof NonExistingSyntax )
             {
@@ -1050,7 +1051,7 @@ public class AttributeTypeEditorOverview
         }
         else
         {
-            LdapSyntax syntax = schemaHandler.getSyntax( syntaxOID );
+            MutableLdapSyntaxImpl syntax = schemaHandler.getSyntax( syntaxOID );
             if ( syntax != null )
             {
                 syntaxComboViewer.setSelection( new StructuredSelection( syntax ), true );

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java?rev=1080949&r1=1080948&r2=1080949&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java Sat Mar 12 17:19:15 2011
@@ -27,6 +27,7 @@ import java.util.List;
 
 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.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -177,7 +178,7 @@ public class NewAttributeTypeContentWiza
             {
                 if ( element instanceof LdapSyntax )
                 {
-                    LdapSyntax syntax = ( LdapSyntax ) element;
+                    MutableLdapSyntaxImpl syntax = ( MutableLdapSyntaxImpl ) element;
 
                     String name = syntax.getName();
                     if ( name != null )
@@ -263,8 +264,8 @@ public class NewAttributeTypeContentWiza
                 {
                     if ( ( o1 instanceof LdapSyntax ) && ( o2 instanceof LdapSyntax ) )
                     {
-                        List<String> o1Names = ( ( LdapSyntax ) o1 ).getNames();
-                        List<String> o2Names = ( ( LdapSyntax ) o2 ).getNames();
+                        List<String> o1Names = ( ( MutableLdapSyntaxImpl ) o1 ).getNames();
+                        List<String> o2Names = ( ( MutableLdapSyntaxImpl ) o2 ).getNames();
 
                         // Comparing the First Name
                         if ( ( o1Names != null ) && ( o2Names != null ) )
@@ -397,7 +398,7 @@ public class NewAttributeTypeContentWiza
 
         if ( selection instanceof LdapSyntax )
         {
-            return ( ( LdapSyntax ) selection ).getOid();
+            return ( ( MutableLdapSyntaxImpl ) selection ).getOid();
         }
 
         return null;



Mime
View raw message