directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1083574 [10/12] - in /directory: apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/changelog/ apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/branches/ak...
Date Sun, 20 Mar 2011 21:22:47 GMT
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.studio.schemaeditor.controller;
 
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 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.ObjectClass;
@@ -41,7 +41,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAdded( AttributeType at );
+    public void attributeTypeAdded( MutableAttributeTypeImpl at );
 
 
     /**
@@ -50,7 +50,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModified( AttributeType at );
+    public void attributeTypeModified( MutableAttributeTypeImpl at );
 
 
     /**
@@ -59,7 +59,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the removed attribute type
      */
-    public void attributeTypeRemoved( AttributeType at );
+    public void attributeTypeRemoved( MutableAttributeTypeImpl at );
 
 
     /**

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.studio.schemaeditor.controller;
 
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 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.ObjectClass;
@@ -40,7 +40,7 @@ public interface SchemaListener
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAdded( AttributeType at );
+    public void attributeTypeAdded( MutableAttributeTypeImpl at );
 
 
     /**
@@ -49,7 +49,7 @@ public interface SchemaListener
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModified( AttributeType at );
+    public void attributeTypeModified( MutableAttributeTypeImpl at );
 
 
     /**
@@ -58,7 +58,7 @@ public interface SchemaListener
      * @param at
      *      the removed attribute type
      */
-    public void attributeTypeRemoved( AttributeType at );
+    public void attributeTypeRemoved( MutableAttributeTypeImpl at );
 
 
     /**

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -111,7 +111,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeAdded( AttributeType at )
+        public void attributeTypeAdded( MutableAttributeTypeImpl at )
         {
             SchemaViewContentProvider contentProvider = ( SchemaViewContentProvider ) viewer.getContentProvider();
             contentProvider.attributeTypeAdded( at );
@@ -128,7 +128,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeModified( AttributeType at )
+        public void attributeTypeModified( MutableAttributeTypeImpl at )
         {
             ( ( SchemaViewContentProvider ) viewer.getContentProvider() ).attributeTypeModified( at );
             view.refresh();
@@ -138,7 +138,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeRemoved( AttributeType at )
+        public void attributeTypeRemoved( MutableAttributeTypeImpl at )
         {
             ( ( SchemaViewContentProvider ) viewer.getContentProvider() ).attributeTypeRemoved( at );
             view.refresh();

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java Sun Mar 20 21:22:39 2011
@@ -26,7 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -166,7 +166,7 @@ public class DeleteSchemaElementAction e
                     }
                     else if ( selectedItem instanceof AttributeTypeWrapper )
                     {
-                        AttributeType at = ( ( AttributeTypeWrapper ) selectedItem ).getAttributeType();
+                        MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) selectedItem ).getAttributeType();
                         schemaObjectsList.add( at );
                     }
                     else if ( selectedItem instanceof ObjectClassWrapper )
@@ -185,9 +185,9 @@ public class DeleteSchemaElementAction e
                         // If the schema object is not part of deleted schema, we need to delete it.
                         // But, we don't delete schema objects that are part of a deleted schema, since
                         // deleting the schema will also delete this schema object.
-                        if ( schemaObject instanceof AttributeType )
+                        if ( schemaObject instanceof MutableAttributeTypeImpl )
                         {
-                            schemaHandler.removeAttributeType( ( AttributeType ) schemaObject );
+                            schemaHandler.removeAttributeType( ( MutableAttributeTypeImpl ) schemaObject );
                         }
                         else if ( schemaObject instanceof ObjectClass )
                         {

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java Sun Mar 20 21:22:39 2011
@@ -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.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
 import org.apache.directory.studio.schemaeditor.Activator;
@@ -199,7 +199,7 @@ public class LinkWithEditorHierarchyView
      */
     private void linkViewWithEditor( MutableSchemaObject schemaElement )
     {
-        if ( schemaElement instanceof AttributeType )
+        if ( schemaElement instanceof MutableAttributeTypeImpl )
         {
             view.setInput( schemaElement );
         }

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=1083574&r1=1083573&r2=1083574&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 Sun Mar 20 21:22:39 2011
@@ -27,7 +27,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.MutableAttributeTypeImpl;
 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.ObjectClass;
@@ -88,10 +88,10 @@ public class DependenciesComputer
             // Computing dependencies
             for ( Schema schema : this.schemasList )
             {
-                List<AttributeType> attributeTypes = schema.getAttributeTypes();
+                List<MutableAttributeTypeImpl> attributeTypes = schema.getAttributeTypes();
                 if ( attributeTypes != null )
                 {
-                    for ( AttributeType attributeType : attributeTypes )
+                    for ( MutableAttributeTypeImpl attributeType : attributeTypes )
                     {
                         computeDependencies( schema, attributeType );
                     }
@@ -122,14 +122,14 @@ public class DependenciesComputer
      *      the attribute type
      * @throws DependencyComputerException 
      */
-    private void computeDependencies( Schema schema, AttributeType attributeType )
+    private void computeDependencies( Schema schema, MutableAttributeTypeImpl attributeType )
         throws DependencyComputerException
     {
         // Superior
         String superior = attributeType.getSuperiorOid();
         if ( superior != null )
         {
-            AttributeType superiorAT = schemaHandler.getAttributeType( superior );
+            MutableAttributeTypeImpl superiorAT = schemaHandler.getAttributeType( superior );
             if ( superiorAT == null )
             {
                 throw new DependencyComputerException( NLS.bind( Messages
@@ -267,7 +267,7 @@ public class DependenciesComputer
         {
             for ( String optionalAttributeTypeName : optionalAttributeTypes )
             {
-                AttributeType optionalAttributeType = schemaHandler.getAttributeType( optionalAttributeTypeName );
+                MutableAttributeTypeImpl optionalAttributeType = schemaHandler.getAttributeType( optionalAttributeTypeName );
                 if ( optionalAttributeType == null )
                 {
                     throw new DependencyComputerException( NLS.bind( Messages
@@ -290,7 +290,7 @@ public class DependenciesComputer
         {
             for ( String mandatoryAttributeTypeName : mandatoryAttributeTypes )
             {
-                AttributeType mandatoryAttributeType = schemaHandler.getAttributeType( mandatoryAttributeTypeName );
+                MutableAttributeTypeImpl mandatoryAttributeType = schemaHandler.getAttributeType( mandatoryAttributeTypeName );
                 if ( mandatoryAttributeType == null )
                 {
                     throw new DependencyComputerException( NLS.bind( Messages

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=1083574&r1=1083573&r2=1083574&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 Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 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.MutableLdapSyntax;
@@ -43,7 +43,7 @@ public class Schema extends DefaultSchem
     private Project project;
 
     /** The AttributeType List */
-    private List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
+    private List<MutableAttributeTypeImpl> attributeTypes = new ArrayList<MutableAttributeTypeImpl>();
 
     /** The ObjectClass List */
     private List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
@@ -73,7 +73,7 @@ public class Schema extends DefaultSchem
      * @param at
      *      the AttributeType
      */
-    public boolean addAttributeType( AttributeType at )
+    public boolean addAttributeType( MutableAttributeTypeImpl at )
     {
         return attributeTypes.add( at );
     }
@@ -124,9 +124,9 @@ public class Schema extends DefaultSchem
      *      the AttributeType identified by the given id, or null if the 
      * AttributeType has not been found
      */
-    public AttributeType getAttributeType( String id )
+    public MutableAttributeTypeImpl getAttributeType( String id )
     {
-        for ( AttributeType at : attributeTypes )
+        for ( MutableAttributeTypeImpl at : attributeTypes )
         {
             List<String> aliases = at.getNames();
             if ( aliases != null )
@@ -155,7 +155,7 @@ public class Schema extends DefaultSchem
      * @return
      *      all the AttributeType objects contained in the Schema
      */
-    public List<AttributeType> getAttributeTypes()
+    public List<MutableAttributeTypeImpl> getAttributeTypes()
     {
         return attributeTypes;
     }
@@ -317,7 +317,7 @@ public class Schema extends DefaultSchem
      * @param at
      *      the AttributeType
      */
-    public boolean removeAttributeType( AttributeType at )
+    public boolean removeAttributeType( MutableAttributeTypeImpl at )
     {
         return attributeTypes.remove( at );
     }

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -77,7 +77,7 @@ public class DifferenceEngine
                 differences.add( schemaDifference );
 
                 // Adding attribute types
-                for ( AttributeType at : schemaFromL1.getAttributeTypes() )
+                for ( MutableAttributeTypeImpl at : schemaFromL1.getAttributeTypes() )
                 {
                     schemaDifference.addAttributeTypeDifference( new AttributeTypeDifference( null, at,
                         DifferenceType.REMOVED ) );
@@ -97,21 +97,21 @@ public class DifferenceEngine
                 differences.add( schemaDifference );
 
                 // Building Maps for attribute types
-                Map<String, AttributeType> atMapL1 = new HashMap<String, AttributeType>();
-                for ( AttributeType at : schemaFromL1.getAttributeTypes() )
+                Map<String, MutableAttributeTypeImpl> atMapL1 = new HashMap<String, MutableAttributeTypeImpl>();
+                for ( MutableAttributeTypeImpl at : schemaFromL1.getAttributeTypes() )
                 {
                     atMapL1.put( at.getOid(), at );
                 }
-                Map<String, AttributeType> atMapL2 = new HashMap<String, AttributeType>();
-                for ( AttributeType at : schemaFromL2.getAttributeTypes() )
+                Map<String, MutableAttributeTypeImpl> atMapL2 = new HashMap<String, MutableAttributeTypeImpl>();
+                for ( MutableAttributeTypeImpl at : schemaFromL2.getAttributeTypes() )
                 {
                     atMapL2.put( at.getOid(), at );
                 }
 
                 // Looping on the attribute types from the Schema from the first list
-                for ( AttributeType atFromL1 : schemaFromL1.getAttributeTypes() )
+                for ( MutableAttributeTypeImpl atFromL1 : schemaFromL1.getAttributeTypes() )
                 {
-                    AttributeType atFromL2 = atMapL2.get( atFromL1.getOid() );
+                    MutableAttributeTypeImpl atFromL2 = atMapL2.get( atFromL1.getOid() );
                     if ( atFromL2 == null )
                     {
                         AttributeTypeDifference attributeTypeDifference = new AttributeTypeDifference( atFromL1, null,
@@ -136,9 +136,9 @@ public class DifferenceEngine
                 }
 
                 // Looping on the attribute types from the Schema from the second list
-                for ( AttributeType atFromL2 : schemaFromL2.getAttributeTypes() )
+                for ( MutableAttributeTypeImpl atFromL2 : schemaFromL2.getAttributeTypes() )
                 {
-                    AttributeType atFromL1 = atMapL1.get( atFromL2.getOid() );
+                    MutableAttributeTypeImpl atFromL1 = atMapL1.get( atFromL2.getOid() );
                     if ( atFromL1 == null )
                     {
                         AttributeTypeDifference attributeTypeDifference = new AttributeTypeDifference( null, atFromL2,
@@ -214,7 +214,7 @@ public class DifferenceEngine
                 differences.add( schemaDifference );
 
                 // Adding attribute types
-                for ( AttributeType at : schemaFromL2.getAttributeTypes() )
+                for ( MutableAttributeTypeImpl at : schemaFromL2.getAttributeTypes() )
                 {
                     schemaDifference.addAttributeTypeDifference( new AttributeTypeDifference( null, at,
                         DifferenceType.ADDED ) );
@@ -294,7 +294,7 @@ public class DifferenceEngine
      * @return
      *      the differences between two AttributeType Objects.
      */
-    public static List<PropertyDifference> getDifferences( AttributeType at1, AttributeType at2 )
+    public static List<PropertyDifference> getDifferences( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         List<PropertyDifference> differences = new ArrayList<PropertyDifference>();
 
@@ -661,7 +661,7 @@ public class DifferenceEngine
      * @return
      *      the 'Usage' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getUsageDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getUsageDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         UsageEnum at1Usage = at1.getUsage();
         UsageEnum at2Usage = at2.getUsage();
@@ -688,7 +688,7 @@ public class DifferenceEngine
      * @return
      *      the 'Superior' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSuperiorDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getSuperiorDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         String at1Superior = at1.getSuperiorOid();
         String at2Superior = at2.getSuperiorOid();
@@ -730,7 +730,7 @@ public class DifferenceEngine
      * @return
      *      the 'Syntax' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSyntaxDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getSyntaxDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         String at1Syntax = at1.getSyntaxOid();
         String at2Syntax = at2.getSyntaxOid();
@@ -772,7 +772,7 @@ public class DifferenceEngine
      * @return
      *      the 'Syntax length' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSyntaxLengthDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getSyntaxLengthDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         long at1SyntaxLength = at1.getSyntaxLength();
         long at2SyntaxLength = at2.getSyntaxLength();
@@ -814,7 +814,7 @@ public class DifferenceEngine
      * @return
      *      the 'Single value' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSingleValueDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getSingleValueDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         boolean at1SingleValued = at1.isSingleValued();
         boolean at2SingleValued = at2.isSingleValued();
@@ -841,7 +841,7 @@ public class DifferenceEngine
      * @return
      *      the 'Collective' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getCollectiveDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getCollectiveDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         boolean at1Collective = at1.isCollective();
         boolean at2Collective = at2.isCollective();
@@ -868,7 +868,7 @@ public class DifferenceEngine
      * @return
      *      the 'No user modification' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getNoUserModificationDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getNoUserModificationDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         boolean at1IsUserModifiable = at1.isUserModifiable();
         boolean at2IsUserModifiable = at2.isUserModifiable();
@@ -895,7 +895,7 @@ public class DifferenceEngine
      * @return
      *      the 'Equality' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getEqualityDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getEqualityDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         String at1Equality = at1.getEqualityOid();
         String at2Equality = at2.getEqualityOid();
@@ -937,7 +937,7 @@ public class DifferenceEngine
      * @return
      *      the 'Ordering' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getOrderingDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getOrderingDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         String at1Ordering = at1.getOrderingOid();
         String at2Ordering = at2.getOrderingOid();
@@ -979,7 +979,7 @@ public class DifferenceEngine
      * @return
      *      the 'Substring' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSubstringDifference( AttributeType at1, AttributeType at2 )
+    private static PropertyDifference getSubstringDifference( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         String at1Substring = at1.getSubstringOid();
         String at2Substring = at2.getSubstringOid();

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 import java.util.List;
 
 import org.apache.commons.collections.map.MultiValueMap;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
 import org.apache.directory.studio.schemaeditor.Activator;
@@ -74,7 +74,7 @@ public class HierarchyManager
      * @param at
      *      the attribute type
      */
-    private void addAttributeType( AttributeType at )
+    private void addAttributeType( MutableAttributeTypeImpl at )
     {
         // Checking Aliases and OID
         checkAliasesAndOID( at );
@@ -83,7 +83,7 @@ public class HierarchyManager
         if ( superiorName != null )
         // The attribute type has a superior
         {
-            AttributeType superior = schemaHandler.getAttributeType( superiorName );
+            MutableAttributeTypeImpl superior = schemaHandler.getAttributeType( superiorName );
             if ( superior != null )
             // The superior attribute type object exists
             {
@@ -179,7 +179,7 @@ public class HierarchyManager
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAdded( AttributeType at )
+    public void attributeTypeAdded( MutableAttributeTypeImpl at )
     {
         addAttributeType( at );
     }
@@ -191,7 +191,7 @@ public class HierarchyManager
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModified( AttributeType at )
+    public void attributeTypeModified( MutableAttributeTypeImpl at )
     {
         // Removing the attribute type
         List<Object> parents = getParents( at );
@@ -216,7 +216,7 @@ public class HierarchyManager
      * @param at
      *      the removed attribute type
      */
-    public void attributeTypeRemoved( AttributeType at )
+    public void attributeTypeRemoved( MutableAttributeTypeImpl at )
     {
         removeAttributeType( at );
     }
@@ -334,7 +334,7 @@ public class HierarchyManager
             for ( Schema schema : schemaHandler.getSchemas() )
             {
                 // Looping on the attribute types
-                for ( AttributeType at : schema.getAttributeTypes() )
+                for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
                 {
                     addAttributeType( at );
                 }
@@ -404,13 +404,13 @@ public class HierarchyManager
      * @param at
      *      the attribute type
      */
-    private void removeAttributeType( AttributeType at )
+    private void removeAttributeType( MutableAttributeTypeImpl at )
     {
         // Removing the attribute type as child of its superior
         String superiorName = at.getSuperiorOid();
         if ( ( superiorName != null ) && ( !"".equals( superiorName ) ) ) //$NON-NLS-1$
         {
-            AttributeType superiorAT = schemaHandler.getAttributeType( superiorName );
+            MutableAttributeTypeImpl superiorAT = schemaHandler.getAttributeType( superiorName );
             if ( superiorAT == null )
             {
                 childrenMap.remove( superiorName.toLowerCase(), at );
@@ -431,7 +431,7 @@ public class HierarchyManager
         {
             for ( Object child : children )
             {
-                AttributeType childAT = ( AttributeType ) child;
+                MutableAttributeTypeImpl childAT = ( MutableAttributeTypeImpl ) child;
 
                 parentsMap.remove( child, at );
 

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=1083574&r1=1083573&r2=1083574&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 Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import javax.naming.directory.Attribute;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -221,7 +221,7 @@ public class ApacheDsSchemaConnector ext
                     switch ( getNodeType( searchResult ) )
                     {
                         case ATTRIBUTE_TYPE:
-                            AttributeType at = createAttributeType( searchResult );
+                            MutableAttributeTypeImpl at = createAttributeType( searchResult );
                             at.setSchemaName( name );
                             schema.addAttributeType( at );
                             break;
@@ -307,9 +307,9 @@ public class ApacheDsSchemaConnector ext
      * AttributeTypeImpl could be created
      * @throws NamingException 
      */
-    private static AttributeType createAttributeType( SearchResult sr ) throws NamingException
+    private static MutableAttributeTypeImpl createAttributeType( SearchResult sr ) throws NamingException
     {
-        AttributeType at = new AttributeType( getOid( sr ) );
+        MutableAttributeTypeImpl at = new MutableAttributeTypeImpl( getOid( sr ) );
         at.setNames( getNames( sr ) );
         at.setDescription( getDescription( sr ) );
         at.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=1083574&r1=1083573&r2=1083574&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 Sun Mar 20 21:22:39 2011
@@ -30,7 +30,7 @@ import javax.naming.directory.Attribute;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 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;
@@ -198,9 +198,9 @@ public class GenericSchemaConnector exte
                     String value = ( String ) ne.nextElement();
                     AttributeTypeDescriptionSchemaParser parser = new AttributeTypeDescriptionSchemaParser();
                     parser.setQuirksMode( true );
-                    AttributeType atd = parser.parseAttributeTypeDescription( value );
+                    MutableAttributeTypeImpl atd = parser.parseAttributeTypeDescription( value );
 
-                    AttributeType impl = new AttributeType( atd.getOid() );
+                    MutableAttributeTypeImpl impl = new MutableAttributeTypeImpl( atd.getOid() );
                     impl.setNames( atd.getNames().toArray( new String[0] ) );
                     impl.setDescription( atd.getDescription() );
                     impl.setSuperiorOid( atd.getSuperiorOid() );
@@ -281,7 +281,7 @@ public class GenericSchemaConnector exte
             }
         }
         // if online: assume all received syntaxes in attributes are valid -> create dummy syntaxes if missing
-        for ( AttributeType at : schema.getAttributeTypes() )
+        for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
         {
             String syntaxOid = at.getSyntaxOid();
             if ( syntaxOid != null && schema.getSyntax( syntaxOid ) == null )
@@ -321,7 +321,7 @@ public class GenericSchemaConnector exte
             }
         }
         // if online: assume all received matching rules in attributes are valid -> create dummy matching rules if missing
-        for ( AttributeType at : schema.getAttributeTypes() )
+        for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
         {
             String equalityName = at.getEqualityOid();
             String orderingName = at.getOrderingOid();

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -49,7 +49,7 @@ public class OpenLdapSchemaFileExporter
     {
         StringBuffer sb = new StringBuffer();
 
-        for ( AttributeType at : schema.getAttributeTypes() )
+        for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
         {
             sb.append( toSourceCode( at ) );
             sb.append( "\n" ); //$NON-NLS-1$
@@ -74,7 +74,7 @@ public class OpenLdapSchemaFileExporter
      * @return
      *      the corresponding source code representation
      */
-    public static String toSourceCode( AttributeType at )
+    public static String toSourceCode( MutableAttributeTypeImpl at )
     {
         StringBuffer sb = new StringBuffer();
 

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.List;
 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.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
 import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -95,7 +95,7 @@ public class OpenLdapSchemaFileImporter
         List<?> ats = parser.getAttributeTypes();
         for ( int i = 0; i < ats.size(); i++ )
         {
-            AttributeType at = convertAttributeType( ( AttributeType ) ats.get( i ) );
+            MutableAttributeTypeImpl at = convertAttributeType( ( MutableAttributeTypeImpl ) ats.get( i ) );
             at.setSchemaName( schemaName );
             schema.addAttributeType( at );
         }
@@ -142,9 +142,9 @@ public class OpenLdapSchemaFileImporter
      * @return
      *      the corresponding AttributeTypeImpl
      */
-    private static final AttributeType convertAttributeType( AttributeType at )
+    private static final MutableAttributeTypeImpl convertAttributeType( MutableAttributeTypeImpl at )
     {
-        AttributeType newAT = new AttributeType( at.getOid() );
+        MutableAttributeTypeImpl newAT = new MutableAttributeTypeImpl( at.getOid() );
         newAT.setNames( at.getNames() );
         newAT.setDescription( at.getDescription() );
         newAT.setSuperiorOid( at.getSuperiorOid() );

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=1083574&r1=1083573&r2=1083574&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 Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.io.IOException;
 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.MutableAttributeTypeImpl;
 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.ObjectClass;
@@ -193,11 +193,11 @@ public class XMLSchemaFileExporter
             }
 
             // Attribute Types
-            List<AttributeType> ats = schema.getAttributeTypes();
+            List<MutableAttributeTypeImpl> ats = schema.getAttributeTypes();
             if ( ( ats != null ) && ( ats.size() >= 1 ) )
             {
                 Element attributeTypesNode = element.addElement( ATTRIBUTE_TYPES_TAG );
-                for ( AttributeType at : ats )
+                for ( MutableAttributeTypeImpl at : ats )
                 {
                     toXml( at, attributeTypesNode );
                 }
@@ -247,7 +247,7 @@ public class XMLSchemaFileExporter
      * @param root
      *      the root Element
      */
-    private static void toXml( AttributeType at, Element root )
+    private static void toXml( MutableAttributeTypeImpl at, Element root )
     {
         Element atNode = root.addElement( ATTRIBUTE_TYPE_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=1083574&r1=1083573&r2=1083574&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 Sun Mar 20 21:22:39 2011
@@ -26,7 +26,7 @@ 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.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -304,13 +304,13 @@ public class XMLSchemaFileImporter
      */
     private static void readAttributeType( Element element, Schema schema ) throws XMLSchemaFileImportException
     {
-        AttributeType at = null;
+        MutableAttributeTypeImpl 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 MutableAttributeTypeImpl( oidAttribute.getValue() );
         }
         else
         {

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Sun Mar 20 21:22:39 2011
@@ -26,7 +26,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.exception.LdapSchemaException;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 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.ObjectClass;
@@ -78,7 +78,7 @@ public class SchemaChecker
     /** The SchemaHandlerListener */
     private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
     {
-        public void attributeTypeAdded( AttributeType at )
+        public void attributeTypeAdded( MutableAttributeTypeImpl at )
         {
             synchronized ( this )
             {
@@ -87,7 +87,7 @@ public class SchemaChecker
         }
 
 
-        public void attributeTypeModified( AttributeType at )
+        public void attributeTypeModified( MutableAttributeTypeImpl at )
         {
             synchronized ( this )
             {
@@ -96,7 +96,7 @@ public class SchemaChecker
         }
 
 
-        public void attributeTypeRemoved( AttributeType at )
+        public void attributeTypeRemoved( MutableAttributeTypeImpl at )
         {
             synchronized ( this )
             {
@@ -301,7 +301,7 @@ public class SchemaChecker
                 {
                     SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
 
-                    if ( source instanceof AttributeType )
+                    if ( source instanceof MutableAttributeTypeImpl )
                     {
                         source = schemaHandler.getAttributeType( source.getOid() );
                     }

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=1083574&r1=1083573&r2=1083574&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 Sun Mar 20 21:22:39 2011
@@ -26,7 +26,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.MutableAttributeTypeImpl;
 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.ObjectClass;
@@ -162,9 +162,9 @@ public class SchemaEditorSchemaLoader ex
         {
             for ( Schema schema : schemas )
             {
-                List<AttributeType> attributeTypes = project.getSchemaHandler().getSchema( schema.getSchemaName() )
+                List<MutableAttributeTypeImpl> attributeTypes = project.getSchemaHandler().getSchema( schema.getSchemaName() )
                     .getAttributeTypes();
-                for ( AttributeType attributeType : attributeTypes )
+                for ( MutableAttributeTypeImpl attributeType : attributeTypes )
                 {
                     attributeTypeList.add( SchemaEditorSchemaLoaderUtils.toEntry( attributeType ) );
                 }

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=1083574&r1=1083573&r2=1083574&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 Sun Mar 20 21:22:39 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 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.MutableAttributeTypeImpl;
 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.MutableSchemaObject;
@@ -79,7 +79,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the attribute type converted to an equivalent entry representation
      * @throws LdapException
      */
-    public static Entry toEntry( AttributeType attributeType ) throws LdapException
+    public static Entry toEntry( MutableAttributeTypeImpl attributeType ) throws LdapException
     {
         // Creating a blank entry
         Entry entry = new DefaultEntry();
@@ -379,7 +379,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addSuperiorValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addSuperiorValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         String superior = attributeType.getSuperiorName();
         if ( !Strings.isEmpty( superior ) )
@@ -399,7 +399,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addEqualityValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addEqualityValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         String equality = attributeType.getEqualityName();
         if ( !Strings.isEmpty( equality ) )
@@ -419,7 +419,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addOrderingValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addOrderingValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         String ordering = attributeType.getOrderingName();
         if ( !Strings.isEmpty( ordering ) )
@@ -439,7 +439,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addSubstrValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addSubstrValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         String substr = attributeType.getSubstringName();
         if ( !Strings.isEmpty( substr ) )
@@ -459,7 +459,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addSyntaxValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addSyntaxValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         String syntax = attributeType.getSyntaxName();
         if ( !Strings.isEmpty( syntax ) )
@@ -486,7 +486,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addSingleValueValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addSingleValueValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         if ( attributeType.isSingleValued() )
         {
@@ -505,7 +505,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addCollectiveValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addCollectiveValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         if ( attributeType.isCollective() )
         {
@@ -524,7 +524,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addNoUserModificationValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addNoUserModificationValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         if ( !attributeType.isUserModifiable() )
         {
@@ -543,7 +543,7 @@ public class SchemaEditorSchemaLoaderUti
      *      the entry
      * @throws LdapException
      */
-    private static void addUsageValue( AttributeType attributeType, Entry entry ) throws LdapException
+    private static void addUsageValue( MutableAttributeTypeImpl attributeType, Entry entry ) throws LdapException
     {
         UsageEnum usage = attributeType.getUsage();
         if ( usage != UsageEnum.USER_APPLICATIONS )

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorSchemaCheckerLabelDecorator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorSchemaCheckerLabelDecorator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorSchemaCheckerLabelDecorator.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorSchemaCheckerLabelDecorator.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -57,7 +57,7 @@ public class SchemaEditorSchemaCheckerLa
 
         if ( element instanceof AttributeTypeWrapper )
         {
-            AttributeType at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
+            MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
 
             if ( schemaChecker.hasErrors( at ) )
             {
@@ -89,7 +89,7 @@ public class SchemaEditorSchemaCheckerLa
         {
             Schema schema = ( ( SchemaWrapper ) element ).getSchema();
 
-            for ( AttributeType at : schema.getAttributeTypes() )
+            for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
             {
                 if ( schemaChecker.hasErrors( at ) )
                 {
@@ -180,7 +180,7 @@ public class SchemaEditorSchemaCheckerLa
             {
                 if ( child instanceof AttributeTypeWrapper )
                 {
-                    AttributeType at = ( ( AttributeTypeWrapper ) child ).getAttributeType();
+                    MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) child ).getAttributeType();
 
                     if ( schemaChecker.hasWarnings( at ) )
                     {
@@ -235,7 +235,7 @@ public class SchemaEditorSchemaCheckerLa
             {
                 if ( child instanceof AttributeTypeWrapper )
                 {
-                    AttributeType at = ( ( AttributeTypeWrapper ) child ).getAttributeType();
+                    MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) child ).getAttributeType();
 
                     if ( schemaChecker.hasErrors( at ) )
                     {

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.studio.schemaeditor.view;
 
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -80,9 +80,9 @@ public class SchemaEditorTypeLabelDecora
                     PluginConstants.IMG_OBJECT_CLASS_OVERLAY_AUXILIARY ), IDecoration.BOTTOM_RIGHT );
             }
         }
-        else if ( element instanceof AttributeType )
+        else if ( element instanceof MutableAttributeTypeImpl )
         {
-            UsageEnum usage = ( ( AttributeType ) element ).getUsage();
+            UsageEnum usage = ( ( MutableAttributeTypeImpl ) element ).getUsage();
             if ( usage == UsageEnum.USER_APPLICATIONS )
             {
                 decoration.addOverlay( Activator.getDefault().getImageDescriptor(

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java Sun Mar 20 21:22:39 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.sche
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.eclipse.jface.dialogs.Dialog;
@@ -62,10 +62,10 @@ import org.eclipse.ui.PlatformUI;
 public class AttributeTypeSelectionDialog extends Dialog
 {
     /** The selected attribute type */
-    private AttributeType selectedAttributeType;
+    private MutableAttributeTypeImpl selectedAttributeType;
 
     /** The hidden attribute types */
-    private List<AttributeType> hiddenAttributeTypes;
+    private List<MutableAttributeTypeImpl> hiddenAttributeTypes;
 
     // UI Fields
     private Text searchText;
@@ -82,7 +82,7 @@ public class AttributeTypeSelectionDialo
     public AttributeTypeSelectionDialog()
     {
         super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
-        hiddenAttributeTypes = new ArrayList<AttributeType>();
+        hiddenAttributeTypes = new ArrayList<MutableAttributeTypeImpl>();
     }
 
 
@@ -179,7 +179,7 @@ public class AttributeTypeSelectionDialo
                         chooseButton.setEnabled( true );
                     }
                     schemaIconLabel.setImage( Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA ) );
-                    schemaNameLabel.setText( ( ( AttributeType ) selection.getFirstElement() ).getSchemaName() );
+                    schemaNameLabel.setText( ( ( MutableAttributeTypeImpl ) selection.getFirstElement() ).getSchemaName() );
                 }
             }
         } );
@@ -255,7 +255,7 @@ public class AttributeTypeSelectionDialo
         }
         else
         {
-            selectedAttributeType = ( AttributeType ) selection.getFirstElement();
+            selectedAttributeType = ( MutableAttributeTypeImpl ) selection.getFirstElement();
         }
 
         super.okPressed();
@@ -268,7 +268,7 @@ public class AttributeTypeSelectionDialo
      * @return
      *      the selected Attribute Type
      */
-    public AttributeType getSelectedAttributeType()
+    public MutableAttributeTypeImpl getSelectedAttributeType()
     {
         return selectedAttributeType;
     }
@@ -280,7 +280,7 @@ public class AttributeTypeSelectionDialo
      * @param list
      *      a list of Attribute Types to hide
      */
-    public void setHiddenAttributeTypes( List<AttributeType> list )
+    public void setHiddenAttributeTypes( List<MutableAttributeTypeImpl> list )
     {
         hiddenAttributeTypes = list;
     }
@@ -292,9 +292,9 @@ public class AttributeTypeSelectionDialo
      * @param attributeTypes
      *      an array of Attribute Types to hide
      */
-    public void setHiddenAttributeTypes( AttributeType[] attributeTypes )
+    public void setHiddenAttributeTypes( MutableAttributeTypeImpl[] attributeTypes )
     {
-        for ( AttributeType objectClass : attributeTypes )
+        for ( MutableAttributeTypeImpl objectClass : attributeTypes )
         {
             hiddenAttributeTypes.add( objectClass );
         }

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java Sun Mar 20 21:22:39 2011
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -46,13 +46,13 @@ public class AttributeTypeSelectionDialo
     private SchemaHandler schemaHandler;
 
     /** The hidden Object Classes */
-    private List<AttributeType> hiddenAttributeTypes;
+    private List<MutableAttributeTypeImpl> hiddenAttributeTypes;
 
 
     /**
      * Creates a new instance of AttributeTypeSelectionDialogContentProvider.
      */
-    public AttributeTypeSelectionDialogContentProvider( List<AttributeType> hiddenAttributeTypes )
+    public AttributeTypeSelectionDialogContentProvider( List<MutableAttributeTypeImpl> hiddenAttributeTypes )
     {
         this.hiddenAttributeTypes = hiddenAttributeTypes;
         schemaHandler = Activator.getDefault().getSchemaHandler();
@@ -66,7 +66,7 @@ public class AttributeTypeSelectionDialo
     {
         if ( inputElement instanceof String )
         {
-            ArrayList<AttributeType> results = new ArrayList<AttributeType>();
+            ArrayList<MutableAttributeTypeImpl> results = new ArrayList<MutableAttributeTypeImpl>();
 
             String searchText = ( String ) inputElement;
 
@@ -78,15 +78,15 @@ public class AttributeTypeSelectionDialo
 
             Pattern pattern = Pattern.compile( searchRegexp, Pattern.CASE_INSENSITIVE );
 
-            List<AttributeType> atList = schemaHandler.getAttributeTypes();
+            List<MutableAttributeTypeImpl> atList = schemaHandler.getAttributeTypes();
 
             // Sorting the list
-            Collections.sort( atList, new Comparator<AttributeType>()
+            Collections.sort( atList, new Comparator<MutableAttributeTypeImpl>()
             {
-                public int compare( AttributeType at1, AttributeType at2 )
+                public int compare( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
                 {
-                    List<String> at1Names = ( ( AttributeType ) at1 ).getNames();
-                    List<String> at2Names = ( ( AttributeType ) at2 ).getNames();
+                    List<String> at1Names = ( ( MutableAttributeTypeImpl ) at1 ).getNames();
+                    List<String> at2Names = ( ( MutableAttributeTypeImpl ) at2 ).getNames();
 
                     if ( ( at1Names == null || at1Names.size() == 0 ) && ( at2Names == null || at2Names.size() == 0 ) )
                     {
@@ -110,7 +110,7 @@ public class AttributeTypeSelectionDialo
             } );
 
             // Searching for all matching elements
-            for ( AttributeType at : atList )
+            for ( MutableAttributeTypeImpl at : atList )
             {
                 for ( String name : at.getNames() )
                 {

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.view.ViewUtils;
@@ -44,7 +44,7 @@ public class AttributeTypeSelectionDialo
      */
     public Image getImage( Object element )
     {
-        if ( element instanceof AttributeType )
+        if ( element instanceof MutableAttributeTypeImpl )
         {
             return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
         }
@@ -59,9 +59,9 @@ public class AttributeTypeSelectionDialo
      */
     public String getText( Object element )
     {
-        if ( element instanceof AttributeType )
+        if ( element instanceof MutableAttributeTypeImpl )
         {
-            AttributeType at = ( AttributeType ) element;
+            MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) element;
 
             List<String> names = at.getNames();
             if ( ( names != null ) && ( names.size() > 0 ) )

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
 
 
@@ -39,19 +39,19 @@ public class ATESuperiorComboComparator 
      */
     public int compare( Object o1, Object o2 )
     {
-        if ( o1 instanceof AttributeType && o2 instanceof AttributeType )
+        if ( o1 instanceof MutableAttributeTypeImpl && o2 instanceof MutableAttributeTypeImpl )
         {
-            List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
-            List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
+            List<String> at1Names = ( ( MutableAttributeTypeImpl ) o1 ).getNames();
+            List<String> at2Names = ( ( MutableAttributeTypeImpl ) o2 ).getNames();
 
             if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 ) && ( at2Names.size() > 0 ) )
             {
                 return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
             }
         }
-        else if ( o1 instanceof AttributeType && o2 instanceof NonExistingAttributeType )
+        else if ( o1 instanceof MutableAttributeTypeImpl && o2 instanceof NonExistingAttributeType )
         {
-            List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
+            List<String> at1Names = ( ( MutableAttributeTypeImpl ) o1 ).getNames();
             String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
 
             if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.size() > 0 ) )
@@ -59,10 +59,10 @@ public class ATESuperiorComboComparator 
                 return at1Names.get( 0 ).compareToIgnoreCase( at2Name );
             }
         }
-        else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeType )
+        else if ( o1 instanceof NonExistingAttributeType && o2 instanceof MutableAttributeTypeImpl )
         {
             String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
-            List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
+            List<String> at2Names = ( ( MutableAttributeTypeImpl ) o2 ).getNames();
 
             if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.size() > 0 ) )
             {

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
@@ -62,14 +62,14 @@ public class ATESuperiorComboContentProv
 
             if ( input.getChildren().isEmpty() )
             {
-                AttributeType editorAT = input.getAttributeType();
+                MutableAttributeTypeImpl editorAT = input.getAttributeType();
 
                 // Creating the '(None)' item
                 input.addChild( new NonExistingAttributeType( NonExistingAttributeType.NONE ) );
 
                 // Creating Children
-                List<AttributeType> ats = schemaHandler.getAttributeTypes();
-                for ( AttributeType at : ats )
+                List<MutableAttributeTypeImpl> ats = schemaHandler.getAttributeTypes();
+                for ( MutableAttributeTypeImpl at : ats )
                 {
                     if ( !isSubType( at, editorAT ) )
                     {
@@ -118,7 +118,7 @@ public class ATESuperiorComboContentProv
      * @return
      *      true if at1 is a sub type of at2
      */
-    private boolean isSubType( AttributeType at1, AttributeType at2 )
+    private boolean isSubType( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         if ( at1.equals( at2 ) )
         {
@@ -134,7 +134,7 @@ public class ATESuperiorComboContentProv
             }
             else
             {
-                AttributeType supAT = schemaHandler.getAttributeType( sup );
+                MutableAttributeTypeImpl supAT = schemaHandler.getAttributeType( sup );
                 if ( supAT == null )
                 {
                     return false;

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 
 
 /**
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 public class ATESuperiorComboInput
 {
     /** The attribute type */
-    private AttributeType at;
+    private MutableAttributeTypeImpl at;
 
     /** The children */
     private List<Object> children;
@@ -46,7 +46,7 @@ public class ATESuperiorComboInput
      * @param at
      *      the Attribute Type
      */
-    public ATESuperiorComboInput( AttributeType at )
+    public ATESuperiorComboInput( MutableAttributeTypeImpl at )
     {
         this.at = at;
     }
@@ -58,7 +58,7 @@ public class ATESuperiorComboInput
      * @return
      *      the attribute type
      */
-    public AttributeType getAttributeType()
+    public MutableAttributeTypeImpl getAttributeType()
     {
         return at;
     }

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.view.ViewUtils;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -41,9 +41,9 @@ public class ATESuperiorComboLabelProvid
      */
     public String getText( Object obj )
     {
-        if ( obj instanceof AttributeType )
+        if ( obj instanceof MutableAttributeTypeImpl )
         {
-            AttributeType at = ( AttributeType ) obj;
+            MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) obj;
 
             List<String> names = at.getNames();
             if ( ( names != null ) && ( names.size() > 0 ) )

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -45,10 +45,10 @@ public class ATEUsedByMandatoryTableCont
      */
     public Object[] getElements( Object inputElement )
     {
-        if ( inputElement instanceof AttributeType )
+        if ( inputElement instanceof MutableAttributeTypeImpl )
         {
             List<ObjectClass> results = new ArrayList<ObjectClass>();
-            AttributeType inputAT = ( AttributeType ) inputElement;
+            MutableAttributeTypeImpl inputAT = ( MutableAttributeTypeImpl ) inputElement;
             SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
 
             List<String> names = new ArrayList<String>();

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -45,10 +45,10 @@ public class ATEUsedByOptionalTableConte
      */
     public Object[] getElements( Object inputElement )
     {
-        if ( inputElement instanceof AttributeType )
+        if ( inputElement instanceof MutableAttributeTypeImpl )
         {
             List<ObjectClass> results = new ArrayList<ObjectClass>();
-            AttributeType inputAT = ( AttributeType ) inputElement;
+            MutableAttributeTypeImpl inputAT = ( MutableAttributeTypeImpl ) inputElement;
             SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
 
             List<String> names = new ArrayList<String>();

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java Sun Mar 20 21:22:39 2011
@@ -21,7 +21,7 @@
 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.MutableAttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -69,10 +69,10 @@ public class AttributeTypeEditor extends
     private AttributeTypeEditorUsedByPage usedBy;
 
     /** The original attribute type */
-    private AttributeType originalAttributeType;
+    private MutableAttributeTypeImpl originalAttributeType;
 
     /** The attribute type used to save modifications */
-    private AttributeType modifiedAttributeType;
+    private MutableAttributeTypeImpl modifiedAttributeType;
 
     /** The originalSchema */
     private Schema originalSchema;
@@ -254,7 +254,7 @@ public class AttributeTypeEditor extends
      * @return
      *      the original attribute type
      */
-    public AttributeType getOriginalAttributeType()
+    public MutableAttributeTypeImpl getOriginalAttributeType()
     {
         return originalAttributeType;
     }
@@ -266,7 +266,7 @@ public class AttributeTypeEditor extends
      * @return
      *      the modified attribute type
      */
-    public AttributeType getModifiedAttributeType()
+    public MutableAttributeTypeImpl getModifiedAttributeType()
     {
         return modifiedAttributeType;
     }
@@ -278,7 +278,7 @@ public class AttributeTypeEditor extends
      * @param modifiedAttributeType
      *      the modified attribute type to set.
      */
-    public void setModifiedAttributeType( AttributeType modifiedAttributeType )
+    public void setModifiedAttributeType( MutableAttributeTypeImpl modifiedAttributeType )
     {
         this.modifiedAttributeType = modifiedAttributeType;
     }



Mime
View raw message