directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1299774 [2/2] - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ apacheds/trunk/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/ apacheds/trunk/xdbm-partition/...
Date Mon, 12 Mar 2012 18:29:50 GMT
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistryTest.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistryTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/registries/AttributeTypeRegistryTest.java Mon Mar 12 18:29:48 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.ldap.model.schema.registries;
 
@@ -28,7 +28,7 @@ import static org.junit.Assert.fail;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 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.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.model.schema.registries.DefaultAttributeTypeRegistry;
 import org.junit.Before;
@@ -58,7 +58,7 @@ public class AttributeTypeRegistryTest
     @Test
     public void testUnregister() throws LdapException
     {
-        AttributeType at0 = new AttributeType( "1.1" );
+        MutableAttributeType at0 = new MutableAttributeType( "1.1" );
         at0.addName( "t", "test", "Test", "T" );
         atRegistry.register( at0 );
 
@@ -83,7 +83,7 @@ public class AttributeTypeRegistryTest
     @Test
     public void testRegister() throws LdapException
     {
-        AttributeType at0 = new AttributeType( "1.1" );
+        MutableAttributeType at0 = new MutableAttributeType( "1.1" );
         at0.addName( "t", "test", "Test", "T" );
         atRegistry.register( at0 );
 

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=1299774&r1=1299773&r2=1299774&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 12 18:29:48 2012
@@ -43,6 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 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.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -889,7 +890,7 @@ public class SchemaEntityFactory impleme
         }
 
         // Create the new AttributeType
-        AttributeType attributeType = new AttributeType( oid );
+        MutableAttributeType attributeType = new MutableAttributeType( oid );
 
         // Syntax
         Attribute mSyntax = entry.get( MetaSchemaConstants.M_SYNTAX_AT );

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java Mon Mar 12 18:29:48 2012
@@ -41,6 +41,7 @@ import org.apache.directory.shared.ldap.
 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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -217,7 +218,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -247,7 +248,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -275,7 +276,7 @@ public class SchemaManagerAddTest
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // Create the collective attribute first
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -291,7 +292,7 @@ public class SchemaManagerAddTest
         assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
 
         // Now try to create an AT which is a subtype of teh create collective attribute
-        AttributeType subType = new AttributeType( "1.1.1" );
+        MutableAttributeType subType = new MutableAttributeType( "1.1.1" );
         subType.setEqualityOid( "2.5.13.1" );
         subType.setOrderingOid( null );
         subType.setSubstringOid( null );
@@ -319,7 +320,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -352,7 +353,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -386,7 +387,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -419,7 +420,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -446,7 +447,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "0.0" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -478,7 +479,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.8 " );
         attributeType.setUsage( UsageEnum.USER_APPLICATIONS );
 
@@ -504,7 +505,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( "0.0" );
         attributeType.setSubstringOid( null );
@@ -536,7 +537,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( "0.0" );
@@ -568,7 +569,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( "2.5.13.1" );
         attributeType.setSubstringOid( "2.5.13.1" );
@@ -594,7 +595,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "2.5.18.4" );
+        MutableAttributeType attributeType = new MutableAttributeType( "2.5.18.4" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( "2.5.13.1" );
         attributeType.setSubstringOid( "2.5.13.1" );
@@ -629,7 +630,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( "2.5.13.1" );
         attributeType.setSubstringOid( "2.5.13.1" );
@@ -663,7 +664,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( "2.5.13.1" );
         attributeType.setSubstringOid( "2.5.13.1" );
@@ -703,7 +704,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -732,7 +733,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -764,7 +765,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -796,7 +797,7 @@ public class SchemaManagerAddTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java Mon Mar 12 18:29:48 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.ldap.schemaloader;
 
@@ -39,6 +39,7 @@ import org.apache.directory.shared.ldap.
 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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -225,7 +226,7 @@ public class SchemaManagerDelTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "1.1.0" );
+        MutableAttributeType attributeType = new MutableAttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
         attributeType.setOrderingOid( null );
         attributeType.setSubstringOid( null );
@@ -252,7 +253,7 @@ public class SchemaManagerDelTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        AttributeType attributeType = new AttributeType( "generationQualifier" );
+        MutableAttributeType attributeType = new MutableAttributeType( "generationQualifier" );
         attributeType.setOid( "2.5.4.44" );
 
         // It should not fail
@@ -300,7 +301,7 @@ public class SchemaManagerDelTest
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // Try to delete an AT which is contained by a disabled schema
-        AttributeType attributeType = new AttributeType( "gecos" );
+        MutableAttributeType attributeType = new MutableAttributeType( "gecos" );
         attributeType.setOid( "1.3.6.1.1.1.1.2" );
 
         // It should fail
@@ -323,7 +324,7 @@ public class SchemaManagerDelTest
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        // Try to delete an AT which has descendant 
+        // Try to delete an AT which has descendant
         // (modifiersName has one descendant : schemaModifiersName)
         AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( "modifiersName" );
 
@@ -548,7 +549,7 @@ public class SchemaManagerDelTest
         assertTrue( errors.get( 0 ) instanceof LdapProtocolErrorException );
 
         // Now delete the using AT : it should be OK
-        AttributeType at = new AttributeType( AT_OID );
+        MutableAttributeType at = new MutableAttributeType( AT_OID );
         assertTrue( schemaManager.delete( at ) );
 
         assertEquals( atrSize - 1, schemaManager.getAttributeTypeRegistry().size() );
@@ -942,7 +943,7 @@ public class SchemaManagerDelTest
         assertTrue( errors.get( 0 ) instanceof LdapProtocolErrorException );
 
         // Now delete the using AT : it should be OK
-        AttributeType at = new AttributeType( AT_OID );
+        MutableAttributeType at = new MutableAttributeType( AT_OID );
         assertTrue( schemaManager.delete( at ) );
 
         assertEquals( atrSize - 1, schemaManager.getAttributeTypeRegistry().size() );

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Mon Mar 12 18:29:48 2012
@@ -41,6 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 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.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -608,7 +609,7 @@ public class Schema
             // DUMMY
             List<String> attributeTypes = new ArrayList<String>();
             attributeTypes.add( attributeType );
-            AttributeType atd = new AttributeType( attributeType );
+            MutableAttributeType atd = new MutableAttributeType( attributeType );
             atd.setNames( attributeTypes );
             atd.setUserModifiable( true );
             atd.setUsage( UsageEnum.USER_APPLICATIONS );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java Mon Mar 12 18:29:48 2012
@@ -34,6 +34,7 @@ import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.connection.core.Connection;
@@ -88,9 +89,9 @@ public class PluginUtils
      * @return
      *      a clone of the given attribute type
      */
-    public static AttributeType getClone( AttributeType at )
+    public static MutableAttributeType getClone( AttributeType at )
     {
-        AttributeType clone = new AttributeType( at.getOid() );
+        MutableAttributeType clone = new MutableAttributeType( at.getOid() );
         clone.setNames( at.getNames() );
         clone.setSchemaName( at.getSchemaName() );
         clone.setDescription( at.getDescription() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java Mon Mar 12 18:29:48 2012
@@ -28,6 +28,7 @@ import org.apache.commons.collections.ma
 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;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -656,7 +657,7 @@ public class SchemaHandler
      * @param at2
      *      the destination attribute type
      */
-    public void modifyAttributeType( AttributeType at1, AttributeType at2 )
+    public void modifyAttributeType( MutableAttributeType at1, MutableAttributeType at2 )
     {
         // Removing the references (in case of the names or oid have changed)
         removeSchemaObject( at1 );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java Mon Mar 12 18:29:48 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.studio.schemaeditor.controller.actions;
 
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
@@ -112,12 +112,12 @@ public class RenameSchemaElementAction e
                 // ATTRIBUTE TYPE
                 else if ( selectedElement instanceof AttributeTypeWrapper )
                 {
-                    AttributeType attributeType = ( ( AttributeTypeWrapper ) selectedElement ).getAttributeType();
+                    MutableAttributeType attributeType = (MutableAttributeType)( ( AttributeTypeWrapper ) selectedElement ).getAttributeType();
 
                     RenameAttributeTypeDialog dialog = new RenameAttributeTypeDialog( attributeType.getNames() );
                     if ( dialog.open() == RenameAttributeTypeDialog.OK )
                     {
-                        AttributeType modifiedAttributeType = PluginUtils.getClone( attributeType );
+                        MutableAttributeType modifiedAttributeType = PluginUtils.getClone( attributeType );
                         modifiedAttributeType.setNames( dialog.getAliases() );
                         Activator.getDefault().getSchemaHandler()
                             .modifyAttributeType( attributeType, modifiedAttributeType );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Mon Mar 12 18:29:48 2012
@@ -34,6 +34,7 @@ import org.apache.directory.shared.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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -301,7 +302,7 @@ public class ApacheDsSchemaConnector ext
      */
     private static AttributeType createAttributeType( SearchResult sr ) throws NamingException
     {
-        AttributeType at = new AttributeType( getOid( sr ) );
+        MutableAttributeType at = new MutableAttributeType( getOid( sr ) );
         at.setNames( getNames( sr ) );
         at.setDescription( getDescription( sr ) );
         at.setObsolete( isObsolete( sr ) );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Mon Mar 12 18:29:48 2012
@@ -34,6 +34,7 @@ import org.apache.directory.shared.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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
@@ -207,7 +208,7 @@ public class GenericSchemaConnector exte
 
                         AttributeType atd = parser.parseAttributeTypeDescription( value );
 
-                        AttributeType impl = new AttributeType( atd.getOid() );
+                        MutableAttributeType impl = new MutableAttributeType( atd.getOid() );
                         impl.setNames( atd.getNames().toArray( new String[0] ) );
                         impl.setDescription( atd.getDescription() );
                         impl.setSuperiorOid( atd.getSuperiorOid() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Mon Mar 12 18:29:48 2012
@@ -30,6 +30,7 @@ import java.util.Scanner;
 import java.util.regex.MatchResult;
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
@@ -145,7 +146,7 @@ public class OpenLdapSchemaFileImporter
      */
     private static final AttributeType convertAttributeType( AttributeType at )
     {
-        AttributeType newAT = new AttributeType( at.getOid() );
+        MutableAttributeType newAT = new MutableAttributeType( at.getOid() );
         newAT.setNames( at.getNames() );
         newAT.setDescription( at.getDescription() );
         newAT.setSuperiorOid( at.getSuperiorOid() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Mon Mar 12 18:29:48 2012
@@ -26,9 +26,9 @@ import java.util.ArrayList;
 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.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -304,13 +304,13 @@ public class XMLSchemaFileImporter
      */
     private static void readAttributeType( Element element, Schema schema ) throws XMLSchemaFileImportException
     {
-        AttributeType at = null;
+        MutableAttributeType at = null;
 
         // OID
         Attribute oidAttribute = element.attribute( OID_TAG );
         if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
         {
-            at = new AttributeType( oidAttribute.getValue() );
+            at = new MutableAttributeType( oidAttribute.getValue() );
         }
         else
         {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AbstractAttributeTypeEditorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AbstractAttributeTypeEditorPage.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AbstractAttributeTypeEditorPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AbstractAttributeTypeEditorPage.java Mon Mar 12 18:29:48 2012
@@ -6,22 +6,23 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 
 package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
 
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.studio.schemaeditor.view.editors.AbstractSchemaObjectEditorPage;
 
 
@@ -65,7 +66,7 @@ public abstract class AbstractAttributeT
      * @return
      *      the modified attribute type
      */
-    public AttributeType getModifiedAttributeType()
+    public MutableAttributeType getModifiedAttributeType()
     {
         return getEditor().getModifiedAttributeType();
     }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java Mon Mar 12 18:29:48 2012
@@ -6,22 +6,23 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 
 package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
 
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -66,10 +67,10 @@ public class AttributeTypeEditor extends
     private AttributeTypeEditorUsedByPage usedByPage;
 
     /** The original attribute type */
-    private AttributeType originalAttributeType;
+    private MutableAttributeType originalAttributeType;
 
     /** The attribute type used to save modifications */
-    private AttributeType modifiedAttributeType;
+    private MutableAttributeType modifiedAttributeType;
 
     /** The originalSchema */
     private Schema originalSchema;
@@ -169,7 +170,7 @@ public class AttributeTypeEditor extends
         setInput( input );
         setPartName( input.getName() );
 
-        originalAttributeType = ( ( AttributeTypeEditorInput ) getEditorInput() ).getAttributeType();
+        originalAttributeType = (MutableAttributeType)( ( AttributeTypeEditorInput ) getEditorInput() ).getAttributeType();
         modifiedAttributeType = PluginUtils.getClone( originalAttributeType );
 
         SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
@@ -294,7 +295,7 @@ public class AttributeTypeEditor extends
      * @return
      *      the modified attribute type
      */
-    public AttributeType getModifiedAttributeType()
+    public MutableAttributeType getModifiedAttributeType()
     {
         return modifiedAttributeType;
     }
@@ -306,7 +307,7 @@ public class AttributeTypeEditor extends
      * @param modifiedAttributeType
      *      the modified attribute type to set.
      */
-    public void setModifiedAttributeType( AttributeType modifiedAttributeType )
+    public void setModifiedAttributeType( MutableAttributeType modifiedAttributeType )
     {
         this.modifiedAttributeType = modifiedAttributeType;
     }
@@ -314,13 +315,13 @@ public class AttributeTypeEditor extends
 
     /**
      * Opens an error dialog displaying the given message.
-     *  
+     * 
      * @param message
      *      the message to display
      */
     private void notifyError( String message )
     {
         MessageDialog.openError( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-            Messages.getString( "AttributeTypeEditor.Error" ), message ); //$NON-NLS-1$ 
+            Messages.getString( "AttributeTypeEditor.Error" ), message ); //$NON-NLS-1$
     }
 }

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=1299774&r1=1299773&r2=1299774&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 12 18:29:48 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 
 package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
@@ -28,6 +28,7 @@ import org.apache.directory.shared.asn1.
 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;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.studio.schemaeditor.Activator;
@@ -372,7 +373,7 @@ public class AttributeTypeEditorOverview
     {
         public void selectionChanged( SelectionChangedEvent event )
         {
-            AttributeType modifiedAttributeType = getModifiedAttributeType();
+            MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
             Object selectedItem = ( ( StructuredSelection ) supComboViewer.getSelection() ).getFirstElement();
 
             if ( selectedItem instanceof AttributeType )
@@ -410,7 +411,7 @@ public class AttributeTypeEditorOverview
     {
         public void modifyText( ModifyEvent e )
         {
-            AttributeType modifiedAttributeType = getModifiedAttributeType();
+            MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
             if ( usageCombo.getSelectionIndex() == 0 )
             {
                 modifiedAttributeType.setUsage( UsageEnum.DIRECTORY_OPERATION );
@@ -436,7 +437,7 @@ public class AttributeTypeEditorOverview
     {
         public void selectionChanged( SelectionChangedEvent event )
         {
-            AttributeType modifiedAttributeType = getModifiedAttributeType();
+            MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
             Object selectedItem = ( ( StructuredSelection ) syntaxComboViewer.getSelection() ).getFirstElement();
 
             if ( selectedItem instanceof LdapSyntax )
@@ -465,7 +466,7 @@ public class AttributeTypeEditorOverview
     {
         public void modifyText( ModifyEvent e )
         {
-            AttributeType modifiedAttributeType = getModifiedAttributeType();
+            MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
             if ( syntaxLengthText.getText().length() <= 0 )
             {
                 modifiedAttributeType.setSyntaxLength( -1 );
@@ -535,7 +536,7 @@ public class AttributeTypeEditorOverview
     {
         public void selectionChanged( SelectionChangedEvent event )
         {
-            AttributeType modifiedAttributeType = getModifiedAttributeType();
+            MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
             Object selectedItem = ( ( StructuredSelection ) equalityComboViewer.getSelection() ).getFirstElement();
 
             if ( selectedItem instanceof MatchingRule )
@@ -564,7 +565,7 @@ public class AttributeTypeEditorOverview
     {
         public void selectionChanged( SelectionChangedEvent event )
         {
-            AttributeType modifiedAttributeType = getModifiedAttributeType();
+            MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
             Object selectedItem = ( ( StructuredSelection ) orderingComboViewer.getSelection() ).getFirstElement();
 
             if ( selectedItem instanceof MatchingRule )
@@ -593,7 +594,7 @@ public class AttributeTypeEditorOverview
     {
         public void selectionChanged( SelectionChangedEvent event )
         {
-            AttributeType modifiedAttributeType = getModifiedAttributeType();
+            MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
             Object selectedItem = ( ( StructuredSelection ) substringComboViewer.getSelection() ).getFirstElement();
 
             if ( selectedItem instanceof MatchingRule )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java Mon Mar 12 18:29:48 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 
 package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
@@ -26,6 +26,7 @@ import java.text.ParseException;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
@@ -67,7 +68,7 @@ public class AttributeTypeEditorSourceCo
             canLeaveThePage = true;
             try
             {
-                ( ( AttributeTypeEditor ) getEditor() ).setDirty( true );
+                getEditor().setDirty( true );
                 OpenLdapSchemaParser parser = new OpenLdapSchemaParser();
                 parser.parse( schemaSourceViewer.getTextWidget().getText() );
                 List<?> attributeTypes = parser.getAttributeTypes();
@@ -198,7 +199,7 @@ public class AttributeTypeEditorSourceCo
      */
     private void updateAttributeType( AttributeType atl )
     {
-        AttributeType modifiedAttributeType = getModifiedAttributeType();
+        MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
 
         modifiedAttributeType.setCollective( atl.isCollective() );
         modifiedAttributeType.setDescription( atl.getDescription() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java Mon Mar 12 18:29:48 2012
@@ -29,6 +29,7 @@ import java.util.Set;
 
 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.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
@@ -296,7 +297,7 @@ public class MergeSchemasWizard extends 
                 }
 
                 // clone attribute type
-                AttributeType clonedAttributeType = new AttributeType( sourceAttributeType.getOid() );
+                MutableAttributeType clonedAttributeType = new MutableAttributeType( sourceAttributeType.getOid() );
                 clonedAttributeType.setNames( sourceAttributeType.getNames() );
                 clonedAttributeType.setDescription( sourceAttributeType.getDescription() );
                 clonedAttributeType.setSuperiorOid( sourceAttributeType.getSuperiorOid() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java Mon Mar 12 18:29:48 2012
@@ -6,21 +6,21 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.studio.schemaeditor.view.wizards;
 
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -73,7 +73,7 @@ public class NewAttributeTypeWizard exte
     public boolean performFinish()
     {
         // Creating the new attribute type
-        AttributeType newAT = new AttributeType( generalPage.getOidValue() );
+        MutableAttributeType newAT = new MutableAttributeType( generalPage.getOidValue() );
         newAT.setSchemaName( generalPage.getSchemaValue() );
         newAT.setNames( generalPage.getAliasesValue() );
         newAT.setDescription( generalPage.getDescriptionValue() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java?rev=1299774&r1=1299773&r2=1299774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java Mon Mar 12 18:29:48 2012
@@ -26,6 +26,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
@@ -101,7 +102,7 @@ public class DifferenceEngineTest extend
     public void testAddEqualityDifference() throws Exception
     {
         AttributeType o1 = new AttributeType( "1.2.3.4" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setEqualityOid( "Equality" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -182,7 +183,7 @@ public class DifferenceEngineTest extend
     public void testAddOrderingDifference() throws Exception
     {
         AttributeType o1 = new AttributeType( "1.2.3.4" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setOrderingOid( "Ordering" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -208,7 +209,7 @@ public class DifferenceEngineTest extend
     public void testAddSubstringDifference() throws Exception
     {
         AttributeType o1 = new AttributeType( "1.2.3.4" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSubstringOid( "Substring" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -234,7 +235,7 @@ public class DifferenceEngineTest extend
     public void testAddSuperiorATDifference() throws Exception
     {
         AttributeType o1 = new AttributeType( "1.2.3.4" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSuperiorOid( "superiorAT" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -287,7 +288,7 @@ public class DifferenceEngineTest extend
     public void testAddSyntaxDifference() throws Exception
     {
         AttributeType o1 = new AttributeType( "1.2.3.4" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSyntaxOid( "1.2.3.4.5" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -313,7 +314,7 @@ public class DifferenceEngineTest extend
     public void testAddSyntaxLengthDifference() throws Exception
     {
         AttributeType o1 = new AttributeType( "1.2.3.4" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSyntaxLength( 1234 );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -368,9 +369,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifyCollectiveDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setCollective( true );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setCollective( false );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -426,9 +427,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifyEqualityDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setEqualityOid( "equalityName" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setEqualityOid( "newEqualityName" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -455,9 +456,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifyNoUserModificationDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setUserModifiable( true );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setUserModifiable( false );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -513,9 +514,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifyOrderingDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setOrderingOid( "orderingName" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setOrderingOid( "newOrderingName" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -542,9 +543,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifySingleValueDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSingleValued( true );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSingleValued( false );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -571,9 +572,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifySubstringDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSubstringOid( "substrName" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSubstringOid( "newSubstrName" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -600,9 +601,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifySuperiorATDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSuperiorOid( "superiorName" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSuperiorOid( "newSuperiorName" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -629,9 +630,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifySyntaxDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSyntaxOid( "1.2.3.4.5" );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSyntaxOid( "1.2.3.4.6" );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -657,9 +658,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifySyntaxLengthDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSyntaxLength( 1234 );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setSyntaxLength( 12345 );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -686,9 +687,9 @@ public class DifferenceEngineTest extend
      */
     public void testModifyUsageDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setUsage( UsageEnum.DISTRIBUTED_OPERATION );
-        AttributeType o2 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
         o2.setUsage( UsageEnum.DIRECTORY_OPERATION );
 
         List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -772,7 +773,7 @@ public class DifferenceEngineTest extend
      */
     public void testRemoveEqualityDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setEqualityOid( "equalityName" );
         AttributeType o2 = new AttributeType( "1.2.3.4" );
 
@@ -861,7 +862,7 @@ public class DifferenceEngineTest extend
      */
     public void testRemoveOrderingDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setOrderingOid( "orderingName" );
         AttributeType o2 = new AttributeType( "1.2.3.4" );
 
@@ -888,7 +889,7 @@ public class DifferenceEngineTest extend
      */
     public void testRemoveSubstringDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSubstringOid( "substrName" );
         AttributeType o2 = new AttributeType( "1.2.3.4" );
 
@@ -916,7 +917,7 @@ public class DifferenceEngineTest extend
      */
     public void testRemoveSuperiorATDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSuperiorOid( "superiorName" );
         AttributeType o2 = new AttributeType( "1.2.3.4" );
 
@@ -975,7 +976,7 @@ public class DifferenceEngineTest extend
      */
     public void testRemoveSyntaxDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSyntaxOid( "1.2.3.4.5" );
         AttributeType o2 = new AttributeType( "1.2.3.4" );
 
@@ -1002,7 +1003,7 @@ public class DifferenceEngineTest extend
      */
     public void testRemoveSyntaxLengthDifference() throws Exception
     {
-        AttributeType o1 = new AttributeType( "1.2.3.4" );
+        MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
         o1.setSyntaxLength( 1234 );
         AttributeType o2 = new AttributeType( "1.2.3.4" );
 



Mime
View raw message