directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1083574 [9/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/aka...
Date Sun, 20 Mar 2011 21:22:47 GMT
Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
 
 import java.util.Collection;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
 import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidget;
@@ -185,8 +185,8 @@ public class NewEntryAttributesWizardPag
                 // remove empty must attributes
                 // necessary when navigating back, modifying object classes
                 // and Dn and navigation forward again.
-                Collection<AttributeType> oldMusts = SchemaUtils.getMustAttributeTypeDescriptions( newEntry );
-                for ( AttributeType oldMust : oldMusts )
+                Collection<MutableAttributeTypeImpl> oldMusts = SchemaUtils.getMustAttributeTypeDescriptions( newEntry );
+                for ( MutableAttributeTypeImpl oldMust : oldMusts )
                 {
                     IAttribute attribute = newEntry.getAttribute( oldMust.getOid() );
                     if ( attribute != null )
@@ -207,8 +207,8 @@ public class NewEntryAttributesWizardPag
                 }
 
                 // add must attributes
-                Collection<AttributeType> newMusts = SchemaUtils.getMustAttributeTypeDescriptions( newEntry );
-                for ( AttributeType newMust : newMusts )
+                Collection<MutableAttributeTypeImpl> newMusts = SchemaUtils.getMustAttributeTypeDescriptions( newEntry );
+                for ( MutableAttributeTypeImpl newMust : newMusts )
                 {
                     if ( newEntry.getAttributeWithSubtypes( newMust.getOid() ) == null )
                     {

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.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.name.Ava;
 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.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.connection.ui.RunnableContextRunner;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
@@ -179,7 +179,7 @@ public class NewEntryDnWizardPage extend
         }
         else
         {
-            Collection<AttributeType> atds = SchemaUtils.getAllAttributeTypeDescriptions( newEntry );
+            Collection<MutableAttributeTypeImpl> atds = SchemaUtils.getAllAttributeTypeDescriptions( newEntry );
             String[] attributeNames = SchemaUtils.getNames( atds ).toArray( ArrayUtils.EMPTY_STRING_ARRAY );
 
             Dn parentDn = newEntry.getDn().getParent();

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java Sun Mar 20 21:22:39 2011
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
@@ -240,7 +240,7 @@ public class ValueEditorManager
             return userSelectedValueEditor;
         }
 
-        AttributeType atd = schema.getAttributeTypeDescription( attributeType );
+        MutableAttributeTypeImpl atd = schema.getAttributeTypeDescription( attributeType );
         // check attribute preferences
         Map<String, String> attributeValueEditorMap = BrowserCommonActivator.getDefault().getValueEditorsPreferences()
             .getAttributeValueEditorMap();
@@ -419,7 +419,7 @@ public class ValueEditorManager
     {
         List<IValueEditor> alternativeList = new ArrayList<IValueEditor>();
 
-        AttributeType atd = schema.getAttributeTypeDescription( attributeName );
+        MutableAttributeTypeImpl atd = schema.getAttributeTypeDescription( attributeName );
 
         if ( SchemaUtils.isBinary( atd, schema ) )
         {

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 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.common.core.jobs.StudioProgressMonitor;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.IConnectionListener;
@@ -130,8 +130,8 @@ public class BrowserConnectionListener i
         List<String> binaryAttributeNames = new ArrayList<String>();
 
         Schema schema = browserConnection.getSchema();
-        Collection<AttributeType> attributeTypeDescriptions = schema.getAttributeTypeDescriptions();
-        for ( AttributeType atd : attributeTypeDescriptions )
+        Collection<MutableAttributeTypeImpl> attributeTypeDescriptions = schema.getAttributeTypeDescriptions();
+        for ( MutableAttributeTypeImpl atd : attributeTypeDescriptions )
         {
             if ( SchemaUtils.isBinary( atd, schema ) )
             {

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java Sun Mar 20 21:22:39 2011
@@ -28,7 +28,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -178,7 +178,7 @@ public class InitializeAttributesRunnabl
             }
             else
             {
-                Collection<AttributeType> opAtds = SchemaUtils.getOperationalAttributeDescriptions( entry
+                Collection<MutableAttributeTypeImpl> opAtds = SchemaUtils.getOperationalAttributeDescriptions( entry
                     .getBrowserConnection().getSchema() );
                 Collection<String> atdNames = SchemaUtils.getNames( opAtds );
                 raSet.addAll( atdNames );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java Sun Mar 20 21:22:39 2011
@@ -29,7 +29,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-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.ldapbrowser.core.model.schema.Schema;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
@@ -166,7 +166,7 @@ public class AttributeDescription implem
             return description;
         }
 
-        AttributeType atd = schema.getAttributeTypeDescription( parsedAttributeType );
+        MutableAttributeTypeImpl atd = schema.getAttributeTypeDescription( parsedAttributeType );
         String oidString = atd.getOid();
 
         if ( !parsedLangList.isEmpty() )
@@ -226,8 +226,8 @@ public class AttributeDescription implem
             return false;
         }
 
-        AttributeType myAtd = schema.getAttributeTypeDescription( this.getParsedAttributeType() );
-        AttributeType otherAtd = schema.getAttributeTypeDescription( other.getParsedAttributeType() );
+        MutableAttributeTypeImpl myAtd = schema.getAttributeTypeDescription( this.getParsedAttributeType() );
+        MutableAttributeTypeImpl otherAtd = schema.getAttributeTypeDescription( other.getParsedAttributeType() );
 
         // special case *: all user attributes (RFC4511)
         if ( SchemaConstants.ALL_USER_ATTRIBUTES.equals( other.description ) && !SchemaUtils.isOperational( myAtd ) )
@@ -255,7 +255,7 @@ public class AttributeDescription implem
             names.addAll( SchemaUtils.getMustAttributeTypeDescriptionNamesTransitive( ocd, schema ) );
             for ( String name : names )
             {
-                AttributeType atd = schema.getAttributeTypeDescription( name );
+                MutableAttributeTypeImpl atd = schema.getAttributeTypeDescription( name );
                 if ( myAtd == atd )
                 {
                     return true;
@@ -266,7 +266,7 @@ public class AttributeDescription implem
         // check type
         if ( myAtd != otherAtd )
         {
-            AttributeType superiorAtd = null;
+            MutableAttributeTypeImpl superiorAtd = null;
             String superiorName = myAtd.getSuperiorOid();
             while ( superiorName != null )
             {

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IAttribute.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
 
 import java.io.Serializable;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.AttributePropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.EntryPropertyPageProvider;
@@ -249,7 +249,7 @@ public interface IAttribute extends Seri
      * @return the AttributeTypeDescription of this attribute, may be the
      *         default or a dummy
      */
-    public abstract AttributeType getAttributeTypeDescription();
+    public abstract MutableAttributeTypeImpl getAttributeTypeDescription();
 
 
     /**

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Attribute.java Sun Mar 20 21:22:39 2011
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.events.EmptyValueAddedEvent;
@@ -131,7 +131,7 @@ public class Attribute implements IAttri
         }
         else
         {
-            Collection<AttributeType> mustAtds = SchemaUtils.getMustAttributeTypeDescriptions( entry );
+            Collection<MutableAttributeTypeImpl> mustAtds = SchemaUtils.getMustAttributeTypeDescriptions( entry );
             return mustAtds.contains( getAttributeTypeDescription() );
         }
     }
@@ -434,7 +434,7 @@ public class Attribute implements IAttri
     /**
      * {@inheritDoc}
      */
-    public AttributeType getAttributeTypeDescription()
+    public MutableAttributeTypeImpl getAttributeTypeDescription()
     {
         return getEntry().getBrowserConnection().getSchema().getAttributeTypeDescription( getType() );
     }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Sun Mar 20 21:22:39 2011
@@ -37,7 +37,7 @@ import java.util.Set;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
@@ -126,7 +126,7 @@ public class Schema
 
     private Map<String, ObjectClass> ocdMapByNameOrNumericOid;
 
-    private Map<String, AttributeType> atdMapByNameOrNumericOid;
+    private Map<String, MutableAttributeTypeImpl> atdMapByNameOrNumericOid;
 
     private Map<String, MutableLdapSyntax> lsdMapByNumericOid;
 
@@ -145,7 +145,7 @@ public class Schema
         this.createTimestamp = null;
         this.modifyTimestamp = null;
         this.ocdMapByNameOrNumericOid = new HashMap<String, ObjectClass>();
-        this.atdMapByNameOrNumericOid = new HashMap<String, AttributeType>();
+        this.atdMapByNameOrNumericOid = new HashMap<String, MutableAttributeTypeImpl>();
         this.lsdMapByNumericOid = new HashMap<String, MutableLdapSyntax>();
         this.mrdMapByNameOrNumericOid = new HashMap<String, MutableMatchingRule>();
         this.mrudMapByNameOrNumericOid = new HashMap<String, MatchingRuleUse>();
@@ -262,7 +262,7 @@ public class Schema
                 }
                 else if ( attributeName.equalsIgnoreCase( SchemaConstants.ATTRIBUTE_TYPES_AT ) )
                 {
-                    AttributeType atd = atdParser.parseAttributeTypeDescription( value );
+                    MutableAttributeTypeImpl atd = atdParser.parseAttributeTypeDescription( value );
                     atd.addExtension( RAW_SCHEMA_DEFINITION_LDIF_VALUE, ldifValues );
                     addAttributeType( atd );
                 }
@@ -306,7 +306,7 @@ public class Schema
             }
         }
 
-        for ( AttributeType atd : getAttributeTypeDescriptions() )
+        for ( MutableAttributeTypeImpl atd : getAttributeTypeDescriptions() )
         {
             // assume all received syntaxes in attributes are valid -> create pseudo syntaxes if missing
             String syntaxOid = atd.getSyntaxOid();
@@ -327,7 +327,7 @@ public class Schema
         // set extensibleObject may attributes
         ObjectClass extensibleObjectOcd = this
             .getObjectClassDescription( SchemaConstants.EXTENSIBLE_OBJECT_OC );
-        Collection<AttributeType> userAtds = SchemaUtils.getUserAttributeDescriptions( this );
+        Collection<MutableAttributeTypeImpl> userAtds = SchemaUtils.getUserAttributeDescriptions( this );
         Collection<String> atdNames = SchemaUtils.getNames( userAtds );
         List<String> atdNames2 = new ArrayList<String>( atdNames );
         extensibleObjectOcd.setMayAttributeTypeOids( atdNames2 );
@@ -530,7 +530,7 @@ public class Schema
      * 
      * @param atd the attribute type description
      */
-    private void addAttributeType( AttributeType atd )
+    private void addAttributeType( MutableAttributeTypeImpl atd )
     {
         if ( atd.getOid() != null )
         {
@@ -551,9 +551,9 @@ public class Schema
      * 
      * @return the attribute type descriptions
      */
-    public Collection<AttributeType> getAttributeTypeDescriptions()
+    public Collection<MutableAttributeTypeImpl> getAttributeTypeDescriptions()
     {
-        Set<AttributeType> set = new HashSet<AttributeType>( atdMapByNameOrNumericOid.values() );
+        Set<MutableAttributeTypeImpl> set = new HashSet<MutableAttributeTypeImpl>( atdMapByNameOrNumericOid.values() );
         return set;
     }
 
@@ -586,7 +586,7 @@ public class Schema
      * 
      * @return the attribute type description, or the default or a dummy
      */
-    public AttributeType getAttributeTypeDescription( String nameOrOid )
+    public MutableAttributeTypeImpl getAttributeTypeDescription( String nameOrOid )
     {
         AttributeDescription ad = new AttributeDescription( nameOrOid );
         String attributeType = ad.getParsedAttributeType();
@@ -604,7 +604,7 @@ public class Schema
             // DUMMY
             List<String> attributeTypes = new ArrayList<String>();
             attributeTypes.add( attributeType );
-            AttributeType atd = new AttributeType( attributeType );
+            MutableAttributeTypeImpl atd = new MutableAttributeTypeImpl( attributeType );
             atd.setNames( attributeTypes );
             atd.setUserModifiable( true );
             atd.setUsage( UsageEnum.USER_APPLICATIONS );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java Sun Mar 20 21:22:39 2011
@@ -31,7 +31,7 @@ import java.util.TreeSet;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-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.MatchingRuleUse;
@@ -275,10 +275,10 @@ public class SchemaUtils
      * 
      * @return all operational attributes types
      */
-    public static Collection<AttributeType> getOperationalAttributeDescriptions( Schema schema )
+    public static Collection<MutableAttributeTypeImpl> getOperationalAttributeDescriptions( Schema schema )
     {
-        Set<AttributeType> operationalAtds = new HashSet<AttributeType>();
-        for ( AttributeType atd : schema.getAttributeTypeDescriptions() )
+        Set<MutableAttributeTypeImpl> operationalAtds = new HashSet<MutableAttributeTypeImpl>();
+        for ( MutableAttributeTypeImpl atd : schema.getAttributeTypeDescriptions() )
         {
             if ( isOperational( atd ) )
             {
@@ -296,10 +296,10 @@ public class SchemaUtils
      * 
      * @return all user attributes type descriptions
      */
-    public static Collection<AttributeType> getUserAttributeDescriptions( Schema schema )
+    public static Collection<MutableAttributeTypeImpl> getUserAttributeDescriptions( Schema schema )
     {
-        Set<AttributeType> userAtds = new HashSet<AttributeType>();
-        for ( AttributeType atd : schema.getAttributeTypeDescriptions() )
+        Set<MutableAttributeTypeImpl> userAtds = new HashSet<MutableAttributeTypeImpl>();
+        for ( MutableAttributeTypeImpl atd : schema.getAttributeTypeDescriptions() )
         {
             if ( !isOperational( atd ) )
             {
@@ -323,14 +323,14 @@ public class SchemaUtils
      * 
      * @return true, if is operational
      */
-    public static boolean isOperational( AttributeType atd )
+    public static boolean isOperational( MutableAttributeTypeImpl atd )
     {
         return atd.getUsage() != UsageEnum.USER_APPLICATIONS || atd.getExtensions() == Schema.DUMMY_EXTENSIONS
             || CollectionUtils.containsAny( OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES, getLowerCaseIdentifiers( atd ) );
     }
 
 
-    public static boolean isModifiable( AttributeType atd )
+    public static boolean isModifiable( MutableAttributeTypeImpl atd )
     {
         if ( atd == null )
         {
@@ -361,16 +361,16 @@ public class SchemaUtils
      * 
      * @return the must attribute type descriptions of all object class descriptions of the given entry.
      */
-    public static Collection<AttributeType> getMustAttributeTypeDescriptions( IEntry entry )
+    public static Collection<MutableAttributeTypeImpl> getMustAttributeTypeDescriptions( IEntry entry )
     {
         Schema schema = entry.getBrowserConnection().getSchema();
-        Collection<AttributeType> atds = new HashSet<AttributeType>();
+        Collection<MutableAttributeTypeImpl> atds = new HashSet<MutableAttributeTypeImpl>();
         for ( ObjectClass ocd : entry.getObjectClassDescriptions() )
         {
             Collection<String> musts = getMustAttributeTypeDescriptionNamesTransitive( ocd, schema );
             for ( String must : musts )
             {
-                AttributeType atd = schema.getAttributeTypeDescription( must );
+                MutableAttributeTypeImpl atd = schema.getAttributeTypeDescription( must );
                 atds.add( atd );
             }
         }
@@ -385,16 +385,16 @@ public class SchemaUtils
      * 
      * @return the may attribute type descriptions of all object class descriptions of the given entry.
      */
-    public static Collection<AttributeType> getMayAttributeTypeDescriptions( IEntry entry )
+    public static Collection<MutableAttributeTypeImpl> getMayAttributeTypeDescriptions( IEntry entry )
     {
         Schema schema = entry.getBrowserConnection().getSchema();
-        Collection<AttributeType> atds = new HashSet<AttributeType>();
+        Collection<MutableAttributeTypeImpl> atds = new HashSet<MutableAttributeTypeImpl>();
         for ( ObjectClass ocd : entry.getObjectClassDescriptions() )
         {
             Collection<String> mays = getMayAttributeTypeDescriptionNamesTransitive( ocd, schema );
             for ( String may : mays )
             {
-                AttributeType atd = schema.getAttributeTypeDescription( may );
+                MutableAttributeTypeImpl atd = schema.getAttributeTypeDescription( may );
                 atds.add( atd );
             }
         }
@@ -409,9 +409,9 @@ public class SchemaUtils
      * 
      * @return all attribute type descriptions of all object class descriptions of the given entry.
      */
-    public static Collection<AttributeType> getAllAttributeTypeDescriptions( IEntry entry )
+    public static Collection<MutableAttributeTypeImpl> getAllAttributeTypeDescriptions( IEntry entry )
     {
-        Collection<AttributeType> atds = new HashSet<AttributeType>();
+        Collection<MutableAttributeTypeImpl> atds = new HashSet<MutableAttributeTypeImpl>();
         atds.addAll( getMustAttributeTypeDescriptions( entry ) );
         atds.addAll( getMayAttributeTypeDescriptions( entry ) );
         return atds;
@@ -459,7 +459,7 @@ public class SchemaUtils
      * 
      * @return false if the attribute type is defined as binary
      */
-    public static boolean isString( AttributeType atd, Schema schema )
+    public static boolean isString( MutableAttributeTypeImpl atd, Schema schema )
     {
         return !isBinary( atd, schema );
     }
@@ -474,7 +474,7 @@ public class SchemaUtils
      * 
      * @return true if the attribute type is defined as binary
      */
-    public static boolean isBinary( AttributeType atd, Schema schema )
+    public static boolean isBinary( MutableAttributeTypeImpl atd, Schema schema )
     {
         // check user-defined binary attribute types
         Set<String> binaryAttributeOidsAndNames = BrowserCorePlugin.getDefault().getCorePreferences()
@@ -511,10 +511,10 @@ public class SchemaUtils
      * 
      * @return all attribute type description using this syntax description
      */
-    public static Collection<AttributeType> getUsedFromAttributeTypeDescriptions( LdapSyntax lsd, Schema schema )
+    public static Collection<MutableAttributeTypeImpl> getUsedFromAttributeTypeDescriptions( LdapSyntax lsd, Schema schema )
     {
-        Set<AttributeType> usedFroms = new TreeSet<AttributeType>( schemaElementNameComparator );
-        for ( AttributeType atd : schema.getAttributeTypeDescriptions() )
+        Set<MutableAttributeTypeImpl> usedFroms = new TreeSet<MutableAttributeTypeImpl>( schemaElementNameComparator );
+        for ( MutableAttributeTypeImpl atd : schema.getAttributeTypeDescriptions() )
         {
             String syntax = getSyntaxNumericOidTransitive( atd, schema );
             if ( syntax != null && lsd.getOid() != null
@@ -536,10 +536,10 @@ public class SchemaUtils
      * @return all attribute type descriptions using this matching rule for
      * equality, substring or ordering matching
      */
-    public static Collection<AttributeType> getUsedFromAttributeTypeDescriptions( MatchingRule mrd, Schema schema )
+    public static Collection<MutableAttributeTypeImpl> getUsedFromAttributeTypeDescriptions( MatchingRule mrd, Schema schema )
     {
-        Set<AttributeType> usedFromSet = new TreeSet<AttributeType>( schemaElementNameComparator );
-        for ( AttributeType atd : schema.getAttributeTypeDescriptions() )
+        Set<MutableAttributeTypeImpl> usedFromSet = new TreeSet<MutableAttributeTypeImpl>( schemaElementNameComparator );
+        for ( MutableAttributeTypeImpl atd : schema.getAttributeTypeDescriptions() )
         {
             Collection<String> lowerCaseIdentifiers = getLowerCaseIdentifiers( mrd );
             String emr = getEqualityMatchingRuleNameOrNumericOidTransitive( atd, schema );
@@ -572,7 +572,7 @@ public class SchemaUtils
      * @return the equality matching rule description name or OID of the given or the
      *         superior attribute type description, may be null
      */
-    public static String getEqualityMatchingRuleNameOrNumericOidTransitive( AttributeType atd, Schema schema )
+    public static String getEqualityMatchingRuleNameOrNumericOidTransitive( MutableAttributeTypeImpl atd, Schema schema )
     {
         if ( atd.getEqualityOid() != null )
         {
@@ -581,7 +581,7 @@ public class SchemaUtils
 
         if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription( atd.getSuperiorOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorOid() );
+            MutableAttributeTypeImpl superior = schema.getAttributeTypeDescription( atd.getSuperiorOid() );
             return getEqualityMatchingRuleNameOrNumericOidTransitive( superior, schema );
         }
 
@@ -599,7 +599,7 @@ public class SchemaUtils
      * @return the substring matching rule description name or OID of the given or the
      *         superior attribute type description, may be null
      */
-    public static String getSubstringMatchingRuleNameOrNumericOidTransitive( AttributeType atd, Schema schema )
+    public static String getSubstringMatchingRuleNameOrNumericOidTransitive( MutableAttributeTypeImpl atd, Schema schema )
     {
         if ( atd.getSubstringOid() != null )
         {
@@ -608,7 +608,7 @@ public class SchemaUtils
 
         if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription( atd.getSubstringOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSubstringOid() );
+            MutableAttributeTypeImpl superior = schema.getAttributeTypeDescription( atd.getSubstringOid() );
             return getSubstringMatchingRuleNameOrNumericOidTransitive( superior, schema );
         }
 
@@ -626,7 +626,7 @@ public class SchemaUtils
      * @return the ordering matching rule description name or OID of the given or the
      *         superior attribute type description, may be null
      */
-    public static String getOrderingMatchingRuleNameOrNumericOidTransitive( AttributeType atd, Schema schema )
+    public static String getOrderingMatchingRuleNameOrNumericOidTransitive( MutableAttributeTypeImpl atd, Schema schema )
     {
         if ( atd.getOrderingOid() != null )
         {
@@ -635,7 +635,7 @@ public class SchemaUtils
 
         if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription( atd.getSuperiorOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorOid() );
+            MutableAttributeTypeImpl superior = schema.getAttributeTypeDescription( atd.getSuperiorOid() );
             return getOrderingMatchingRuleNameOrNumericOidTransitive( superior, schema );
         }
 
@@ -653,7 +653,7 @@ public class SchemaUtils
      * @return the syntax description OID of the given or the
      *         superior attribute type description, may be null
      */
-    public static String getSyntaxNumericOidTransitive( AttributeType atd, Schema schema )
+    public static String getSyntaxNumericOidTransitive( MutableAttributeTypeImpl atd, Schema schema )
     {
         if ( atd.getSyntaxOid() != null )
         {
@@ -662,7 +662,7 @@ public class SchemaUtils
 
         if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription( atd.getSuperiorOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorOid() );
+            MutableAttributeTypeImpl superior = schema.getAttributeTypeDescription( atd.getSuperiorOid() );
             return getSyntaxNumericOidTransitive( superior, schema );
         }
 
@@ -680,7 +680,7 @@ public class SchemaUtils
      * @return the syntax length of the given or the
      *         superior attribute type description, may be null
      */
-    public static long getSyntaxLengthTransitive( AttributeType atd, Schema schema )
+    public static long getSyntaxLengthTransitive( MutableAttributeTypeImpl atd, Schema schema )
     {
         if ( atd.getSyntaxLength() != 0 )
         {
@@ -689,7 +689,7 @@ public class SchemaUtils
 
         if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription( atd.getSuperiorOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorOid() );
+            MutableAttributeTypeImpl superior = schema.getAttributeTypeDescription( atd.getSuperiorOid() );
             return getSyntaxLengthTransitive( superior, schema );
         }
 
@@ -709,7 +709,7 @@ public class SchemaUtils
      *         description applies to according to the schema's matching 
      *         rule use descriptions
      */
-    public static Collection<String> getOtherMatchingRuleDescriptionNames( AttributeType atd, Schema schema )
+    public static Collection<String> getOtherMatchingRuleDescriptionNames( MutableAttributeTypeImpl atd, Schema schema )
     {
         Set<String> otherMatchingRules = new TreeSet<String>( nameAndOidComparator );
         for ( MatchingRuleUse mrud : schema.getMatchingRuleUseDescriptions() )
@@ -734,11 +734,11 @@ public class SchemaUtils
      * @return all attribute type descriptions using this attribute type
      *         description as superior
      */
-    public static Collection<AttributeType> getDerivedAttributeTypeDescriptions(
-        AttributeType atd, Schema schema )
+    public static Collection<MutableAttributeTypeImpl> getDerivedAttributeTypeDescriptions(
+        MutableAttributeTypeImpl atd, Schema schema )
     {
-        Set<AttributeType> derivedAtds = new TreeSet<AttributeType>( schemaElementNameComparator );
-        for ( AttributeType derivedAtd : schema.getAttributeTypeDescriptions() )
+        Set<MutableAttributeTypeImpl> derivedAtds = new TreeSet<MutableAttributeTypeImpl>( schemaElementNameComparator );
+        for ( MutableAttributeTypeImpl derivedAtd : schema.getAttributeTypeDescriptions() )
         {
             String superType = derivedAtd.getSuperiorOid();
             if ( superType != null && getLowerCaseIdentifiers( atd ).contains( superType.toLowerCase() ) )
@@ -760,7 +760,7 @@ public class SchemaUtils
      * @return all object class description using the given attribute type
      *         description as must attribute
      */
-    public static Collection<ObjectClass> getUsedAsMust( AttributeType atd, Schema schema )
+    public static Collection<ObjectClass> getUsedAsMust( MutableAttributeTypeImpl atd, Schema schema )
     {
         Collection<String> lowerCaseIdentifiers = getLowerCaseIdentifiers( atd );
         Set<ObjectClass> ocds = new TreeSet<ObjectClass>( schemaElementNameComparator );
@@ -786,7 +786,7 @@ public class SchemaUtils
      * @return all object class description using the given attribute type
      *         description as may attribute
      */
-    public static Collection<ObjectClass> getUsedAsMay( AttributeType atd, Schema schema )
+    public static Collection<ObjectClass> getUsedAsMay( MutableAttributeTypeImpl atd, Schema schema )
     {
         Collection<String> lowerCaseIdentifiers = getLowerCaseIdentifiers( atd );
         Set<ObjectClass> ocds = new TreeSet<ObjectClass>( schemaElementNameComparator );
@@ -1017,8 +1017,8 @@ public class SchemaUtils
             }
 
             // check must-attributes
-            Collection<AttributeType> mustAtds = getMustAttributeTypeDescriptions( entry );
-            for ( AttributeType mustAtd : mustAtds )
+            Collection<MutableAttributeTypeImpl> mustAtds = getMustAttributeTypeDescriptions( entry );
+            for ( MutableAttributeTypeImpl mustAtd : mustAtds )
             {
                 AttributeHierarchy ah = entry.getAttributeWithSubtypes( mustAtd.getOid() );
                 if ( ah == null )
@@ -1029,12 +1029,12 @@ public class SchemaUtils
             }
 
             // check unallowed attributes
-            Collection<AttributeType> allAtds = getAllAttributeTypeDescriptions( entry );
+            Collection<MutableAttributeTypeImpl> allAtds = getAllAttributeTypeDescriptions( entry );
             for ( IAttribute attribute : entry.getAttributes() )
             {
                 if ( !attribute.isOperationalAttribute() )
                 {
-                    AttributeType atd = attribute.getAttributeTypeDescription();
+                    MutableAttributeTypeImpl atd = attribute.getAttributeTypeDescription();
                     if ( !allAtds.contains( atd ) )
                     {
                         messages.add( NLS.bind( Messages.getString( "SchemaUtils.AttributeNotAllowed" ), attribute //$NON-NLS-1$

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java Sun Mar 20 21:22:39 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Ava;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
 import org.apache.directory.studio.connection.core.StudioControl;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
@@ -398,7 +398,7 @@ public class Utils
         {
             // get attribute type schema information
             Schema schema = oldEntry.getBrowserConnection().getSchema();
-            AttributeType atd = schema.getAttributeTypeDescription( attributeDescription );
+            MutableAttributeTypeImpl atd = schema.getAttributeTypeDescription( attributeDescription );
             boolean hasEMR = SchemaUtils.getEqualityMatchingRuleNameOrNumericOidTransitive( atd, schema ) != null;
             boolean isReplaceForced = ( hasEMR && modifyMode == ModifyMode.REPLACE )
                 || ( !hasEMR && modifyModeNoEMR == ModifyMode.REPLACE );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.studio.ldapbrowser.ui.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.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -285,7 +285,7 @@ public class OpenSchemaBrowserAction ext
         if ( getConnection() != null )
         {
             Schema schema = getConnection().getSchema();
-            AttributeType atd = getAtd();
+            MutableAttributeTypeImpl atd = getAtd();
 
             if ( atd != null && SchemaUtils.getSyntaxNumericOidTransitive( atd, schema ) != null
                 && schema.hasLdapSyntaxDescription( SchemaUtils.getSyntaxNumericOidTransitive( atd, schema ) ) )
@@ -329,11 +329,11 @@ public class OpenSchemaBrowserAction ext
      * @return
      *      the Attribute Type Description
      */
-    private AttributeType getAtd()
+    private MutableAttributeTypeImpl getAtd()
     {
         if ( ( getSelectedValues().length + getSelectedAttributes().length ) + getSelectedAttributeHierarchies().length == 1 )
         {
-            AttributeType atd = null;
+            MutableAttributeTypeImpl atd = null;
             if ( getSelectedValues().length == 1 )
             {
                 atd = getSelectedValues()[0].getAttribute().getAttributeTypeDescription();
@@ -418,7 +418,7 @@ public class OpenSchemaBrowserAction ext
         if ( getConnection() != null )
         {
             Schema schema = getConnection().getSchema();
-            AttributeType atd = getAtd();
+            MutableAttributeTypeImpl atd = getAtd();
             if ( atd != null
                 && SchemaUtils.getEqualityMatchingRuleNameOrNumericOidTransitive( atd, schema ) != null
                 && schema.hasLdapSyntaxDescription( SchemaUtils.getEqualityMatchingRuleNameOrNumericOidTransitive( atd,
@@ -443,7 +443,7 @@ public class OpenSchemaBrowserAction ext
         if ( getConnection() != null )
         {
             Schema schema = getConnection().getSchema();
-            AttributeType atd = getAtd();
+            MutableAttributeTypeImpl atd = getAtd();
             if ( atd != null
                 && SchemaUtils.getSubstringMatchingRuleNameOrNumericOidTransitive( atd, schema ) != null
                 && schema.hasLdapSyntaxDescription( SchemaUtils.getSubstringMatchingRuleNameOrNumericOidTransitive(
@@ -468,7 +468,7 @@ public class OpenSchemaBrowserAction ext
         if ( getConnection() != null )
         {
             Schema schema = getConnection().getSchema();
-            AttributeType atd = getAtd();
+            MutableAttributeTypeImpl atd = getAtd();
             if ( atd != null
                 && SchemaUtils.getOrderingMatchingRuleNameOrNumericOidTransitive( atd, schema ) != null
                 && schema.hasLdapSyntaxDescription( SchemaUtils.getOrderingMatchingRuleNameOrNumericOidTransitive( atd,

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java Sun Mar 20 21:22:39 2011
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.ui.dialogs.properties;
 
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
@@ -293,7 +293,7 @@ public class AttributePropertyPage exten
 
             if ( schema.hasAttributeTypeDescription( attribute.getDescription() ) )
             {
-                AttributeType atd = schema.getAttributeTypeDescription( attribute.getDescription() );
+                MutableAttributeTypeImpl atd = schema.getAttributeTypeDescription( attribute.getDescription() );
 
                 atdOidText.setText( atd.getOid() );
                 String atdNames = atd.getNames().toString();

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
 
 import java.util.Collection;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.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;
@@ -344,10 +344,10 @@ public class AttributeTypeDescriptionDet
      */
     public void setInput( Object input )
     {
-        AttributeType atd = null;
-        if ( input instanceof AttributeType )
+        MutableAttributeTypeImpl atd = null;
+        if ( input instanceof MutableAttributeTypeImpl )
         {
-            atd = ( AttributeType ) input;
+            atd = ( MutableAttributeTypeImpl ) input;
         }
 
         // create main content
@@ -447,7 +447,7 @@ public class AttributeTypeDescriptionDet
      *
      * @param atd the attribute type description
      */
-    private void createMainContent( AttributeType atd )
+    private void createMainContent( MutableAttributeTypeImpl atd )
     {
         // dispose old content
         if ( mainSection.getClient() != null )
@@ -504,7 +504,7 @@ public class AttributeTypeDescriptionDet
      *
      * @param atd the attribute type description
      */
-    private void createOtherMatchContent( AttributeType atd )
+    private void createOtherMatchContent( MutableAttributeTypeImpl atd )
     {
         // dispose old content
         if ( otherMatchSection.getClient() != null )
@@ -575,7 +575,7 @@ public class AttributeTypeDescriptionDet
      *
      * @param atd the attribute type description
      */
-    private void createSupertypeContent( AttributeType atd )
+    private void createSupertypeContent( MutableAttributeTypeImpl atd )
     {
         // dispose old content
         if ( supertypeSection.getClient() != null )
@@ -599,7 +599,7 @@ public class AttributeTypeDescriptionDet
                     .getString( "AttributeTypeDescriptionDetailsPage.SupertypeCount" ), new Object[] { 1 } ) ); //$NON-NLS-1$
                 if ( getSchema().hasAttributeTypeDescription( superType ) )
                 {
-                    AttributeType supAtd = getSchema().getAttributeTypeDescription( superType );
+                    MutableAttributeTypeImpl supAtd = getSchema().getAttributeTypeDescription( superType );
                     Hyperlink superLink = toolkit.createHyperlink( superClient, SchemaUtils.toString( supAtd ),
                         SWT.WRAP );
                     superLink.setHref( supAtd );
@@ -641,7 +641,7 @@ public class AttributeTypeDescriptionDet
      *
      * @param atd the attribute type description
      */
-    private void createSubtypesContent( AttributeType atd )
+    private void createSubtypesContent( MutableAttributeTypeImpl atd )
     {
         // dispose old content
         if ( subtypesSection.getClient() != null )
@@ -657,7 +657,7 @@ public class AttributeTypeDescriptionDet
         // create new content, either links to subtypes or a dash if no subtypes exist.
         if ( atd != null )
         {
-            Collection<AttributeType> derivedAtds = SchemaUtils.getDerivedAttributeTypeDescriptions( atd,
+            Collection<MutableAttributeTypeImpl> derivedAtds = SchemaUtils.getDerivedAttributeTypeDescriptions( atd,
                 getSchema() );
             if ( derivedAtds != null && derivedAtds.size() > 0 )
             {
@@ -665,7 +665,7 @@ public class AttributeTypeDescriptionDet
                     .setText( NLS
                         .bind(
                             Messages.getString( "AttributeTypeDescriptionDetailsPage.SubtypesCount" ), new Object[] { derivedAtds.size() } ) ); //$NON-NLS-1$
-                for ( AttributeType derivedAtd : derivedAtds )
+                for ( MutableAttributeTypeImpl derivedAtd : derivedAtds )
                 {
                     Hyperlink subAttributeTypeLink = toolkit.createHyperlink( subClient, SchemaUtils
                         .toString( derivedAtd ), SWT.WRAP );
@@ -702,7 +702,7 @@ public class AttributeTypeDescriptionDet
      *
      * @param atd the attribute type description
      */
-    private void createUsedAsMustContent( AttributeType atd )
+    private void createUsedAsMustContent( MutableAttributeTypeImpl atd )
     {
         // dispose old content
         if ( usedAsMustSection.getClient() != null )
@@ -762,7 +762,7 @@ public class AttributeTypeDescriptionDet
      *
      * @param atd the attribute type description
      */
-    private void createUsedAsMayContent( AttributeType atd )
+    private void createUsedAsMayContent( MutableAttributeTypeImpl atd )
     {
         // dispose old content
         if ( usedAsMaySection.getClient() != null )

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -168,7 +168,7 @@ public class AttributeTypeDescriptionPag
          */
         public String getColumnText( Object obj, int index )
         {
-            if ( obj instanceof AttributeType )
+            if ( obj instanceof MutableAttributeTypeImpl )
             {
                 return SchemaUtils.toString( ( AbstractSchemaObject ) obj );
             }
@@ -197,11 +197,11 @@ public class AttributeTypeDescriptionPag
          */
         public int compare( Viewer viewer, Object e1, Object e2 )
         {
-            if ( e1 instanceof AttributeType )
+            if ( e1 instanceof MutableAttributeTypeImpl )
             {
                 e1 = SchemaUtils.toString( ( AbstractSchemaObject ) e1 );
             }
-            if ( e2 instanceof AttributeType )
+            if ( e2 instanceof MutableAttributeTypeImpl )
             {
                 e2 = SchemaUtils.toString( ( AbstractSchemaObject ) e2 );
             }
@@ -221,9 +221,9 @@ public class AttributeTypeDescriptionPag
          */
         public boolean select( Viewer viewer, Object parentElement, Object element )
         {
-            if ( element instanceof AttributeType )
+            if ( element instanceof MutableAttributeTypeImpl )
             {
-                AttributeType atd = ( AttributeType ) element;
+                MutableAttributeTypeImpl atd = ( MutableAttributeTypeImpl ) element;
                 boolean matched = SchemaUtils.toString( atd ).toLowerCase()
                     .indexOf( filterText.getText().toLowerCase() ) != -1
                     || atd.getOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
 
 import java.util.Collection;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
@@ -192,7 +192,7 @@ public class LdapSyntaxDescriptionDetail
         // create content
         if ( lsd != null )
         {
-            Collection<AttributeType> usedFromATDs = SchemaUtils.getUsedFromAttributeTypeDescriptions( lsd,
+            Collection<MutableAttributeTypeImpl> usedFromATDs = SchemaUtils.getUsedFromAttributeTypeDescriptions( lsd,
                 getSchema() );
             if ( usedFromATDs != null && !usedFromATDs.isEmpty() )
             {
@@ -200,7 +200,7 @@ public class LdapSyntaxDescriptionDetail
                     .setText( NLS
                         .bind(
                             Messages.getString( "LdapSyntaxDescriptionDetailsPage.UsedFromCount" ), new Object[] { usedFromATDs.size() } ) ); //$NON-NLS-1$
-                for ( AttributeType atd : usedFromATDs )
+                for ( MutableAttributeTypeImpl atd : usedFromATDs )
                 {
                     Hyperlink usedFromLink = toolkit.createHyperlink( usedFromClient, SchemaUtils.toString( atd ),
                         SWT.WRAP );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.ldap
 
 import java.util.Collection;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
@@ -297,7 +297,7 @@ public class MatchingRuleDescriptionDeta
         // create new content
         if ( mrd != null )
         {
-            Collection<AttributeType> usedFromATDs = SchemaUtils.getUsedFromAttributeTypeDescriptions( mrd,
+            Collection<MutableAttributeTypeImpl> usedFromATDs = SchemaUtils.getUsedFromAttributeTypeDescriptions( mrd,
                 getSchema() );
             if ( usedFromATDs != null && usedFromATDs.size() > 0 )
             {
@@ -305,7 +305,7 @@ public class MatchingRuleDescriptionDeta
                     .setText( NLS
                         .bind(
                             Messages.getString( "MatchingRuleDescriptionDetailsPage.UsedFromCount" ), new Object[] { usedFromATDs.size() } ) ); //$NON-NLS-1$
-                for ( AttributeType atd : usedFromATDs )
+                for ( MutableAttributeTypeImpl atd : usedFromATDs )
                 {
                     Hyperlink usedFromLink = toolkit.createHyperlink( usedFromClient, SchemaUtils.toString( atd ),
                         SWT.WRAP );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.ldap
 
 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.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
@@ -256,7 +256,7 @@ public class MatchingRuleUseDescriptionD
                 {
                     if ( schema.hasAttributeTypeDescription( name ) )
                     {
-                        AttributeType appliesAtd = schema.getAttributeTypeDescription( name );
+                        MutableAttributeTypeImpl appliesAtd = schema.getAttributeTypeDescription( name );
                         Hyperlink appliesLink = toolkit.createHyperlink( appliesClient, SchemaUtils
                             .toString( appliesAtd ), SWT.WRAP );
                         appliesLink.setHref( appliesAtd );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java Sun Mar 20 21:22:39 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
 import java.util.Collection;
 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.ldapbrowser.core.model.schema.SchemaUtils;
 import org.eclipse.osgi.util.NLS;
@@ -302,7 +302,7 @@ public class ObjectClassDescriptionDetai
                 {
                     if ( getSchema().hasAttributeTypeDescription( name ) )
                     {
-                        AttributeType mustAtd = getSchema().getAttributeTypeDescription( name );
+                        MutableAttributeTypeImpl mustAtd = getSchema().getAttributeTypeDescription( name );
                         Hyperlink mustLink = toolkit.createHyperlink( mustClient, SchemaUtils.toString( mustAtd ),
                             SWT.WRAP );
                         mustLink.setHref( mustAtd );
@@ -372,7 +372,7 @@ public class ObjectClassDescriptionDetai
                 {
                     if ( getSchema().hasAttributeTypeDescription( name ) )
                     {
-                        AttributeType mayAtd = getSchema().getAttributeTypeDescription( name );
+                        MutableAttributeTypeImpl mayAtd = getSchema().getAttributeTypeDescription( name );
                         Hyperlink mayLink = toolkit.createHyperlink( mayClient, SchemaUtils.toString( mayAtd ),
                             SWT.WRAP );
                         mayLink.setHref( mayAtd );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java Sun Mar 20 21:22:39 2011
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
 
 
-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.MatchingRuleUse;
@@ -209,7 +209,7 @@ public class SchemaBrowser extends Edito
                 ocdPage.select( schemaElement );
                 tabFolder.setSelection( ocdTab );
             }
-            else if ( schemaElement instanceof AttributeType )
+            else if ( schemaElement instanceof MutableAttributeTypeImpl )
             {
                 atdPage.select( schemaElement );
                 tabFolder.setSelection( atdTab );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
 
 
-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.MatchingRuleUse;
@@ -67,7 +67,7 @@ public class SchemaBrowserNavigationLoca
 
                 return Messages.getString( "SchemaBrowserNavigationLocation.ObjectClass" ) + SchemaUtils.toString( schemaElement ); //$NON-NLS-1$
             }
-            else if ( schemaElement instanceof AttributeType )
+            else if ( schemaElement instanceof MutableAttributeTypeImpl )
             {
                 return Messages.getString( "SchemaBrowserNavigationLocation.AttributeType" ) + SchemaUtils.toString( schemaElement ); //$NON-NLS-1$
             }
@@ -123,7 +123,7 @@ public class SchemaBrowserNavigationLoca
         {
             schemaElement = connection.getSchema().getObjectClassDescription( schemaElementOid );
         }
-        else if ( schemaElementType.contains( AttributeType.class.getName() ) )
+        else if ( schemaElementType.contains( MutableAttributeTypeImpl.class.getName() ) )
         {
             schemaElement = connection.getSchema().getAttributeTypeDescription( schemaElementOid );
         }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
 
 import java.util.Collection;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
 import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
@@ -159,8 +159,8 @@ public class OpenBestEditorAction extend
             {
                 // validate if value is allowed
                 IEntry entry = attributeHierarchy.getAttribute().getEntry();
-                Collection<AttributeType> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
-                AttributeType atd = attributeHierarchy.getAttribute().getAttributeTypeDescription();
+                Collection<MutableAttributeTypeImpl> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
+                MutableAttributeTypeImpl atd = attributeHierarchy.getAttribute().getAttributeTypeDescription();
                 if ( !allAtds.contains( atd ) )
                 {
                     message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.AttributeNotInSubSchema" ), //$NON-NLS-1$

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java Sun Mar 20 21:22:39 2011
@@ -33,7 +33,7 @@ import java.util.HashMap;
 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.MutableAttributeTypeImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
@@ -87,9 +87,9 @@ public class PluginUtils
      * @return
      *      a clone of the given attribute type
      */
-    public static AttributeType getClone( AttributeType at )
+    public static MutableAttributeTypeImpl getClone( MutableAttributeTypeImpl at )
     {
-        AttributeType clone = new AttributeType( at.getOid() );
+        MutableAttributeTypeImpl clone = new MutableAttributeTypeImpl( at.getOid() );
         clone.setNames( at.getNames() );
         clone.setSchemaName( at.getSchemaName() );
         clone.setDescription( at.getDescription() );

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.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.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.studio.schemaeditor.Activator;
@@ -116,7 +116,7 @@ public class ProblemsViewController
                     SchemaObject object = ( ( SchemaErrorWrapper ) objectSelection ).getLdapSchemaException()
                         .getSourceObject();
 
-                    if ( object instanceof AttributeType )
+                    if ( object instanceof MutableAttributeTypeImpl )
                     {
                         input = new AttributeTypeEditorInput( Activator.getDefault().getSchemaHandler()
                             .getAttributeType( object.getOid() ) );

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.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 abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
      */
-    public void attributeTypeAdded( AttributeType at )
+    public void attributeTypeAdded( MutableAttributeTypeImpl at )
     {
     }
 
@@ -48,7 +48,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
      */
-    public void attributeTypeModified( AttributeType at )
+    public void attributeTypeModified( MutableAttributeTypeImpl at )
     {
     }
 
@@ -56,7 +56,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
      */
-    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/SchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,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.MutableLdapSyntax;
@@ -51,7 +51,7 @@ public class SchemaHandler
     /** The schemas List */
     private List<Schema> schemasList;
     /** The attribute types List */
-    private List<AttributeType> attributeTypesList;
+    private List<MutableAttributeTypeImpl> attributeTypesList;
     /** The matching rules List */
     private List<MatchingRule> matchingRulesList;
     /** The object classes List */
@@ -89,7 +89,7 @@ public class SchemaHandler
     {
         // Lists
         schemasList = new ArrayList<Schema>();
-        attributeTypesList = new ArrayList<AttributeType>();
+        attributeTypesList = new ArrayList<MutableAttributeTypeImpl>();
         matchingRulesList = new ArrayList<MatchingRule>();;
         objectClassesList = new ArrayList<ObjectClass>();
         syntaxesList = new ArrayList<LdapSyntax>();
@@ -115,7 +115,7 @@ public class SchemaHandler
      * @return
      *      the List of all the attribute types
      */
-    public List<AttributeType> getAttributeTypes()
+    public List<MutableAttributeTypeImpl> getAttributeTypes()
     {
         return attributeTypesList;
     }
@@ -177,13 +177,13 @@ public class SchemaHandler
      * @return
      *      the corresponding attribute type, or null if no one is found
      */
-    public AttributeType getAttributeType( String id )
+    public MutableAttributeTypeImpl getAttributeType( String id )
     {
         List<?> list = getAttributeTypeList( id.toLowerCase() );
 
         if ( ( list != null ) && ( list.size() >= 1 ) )
         {
-            return ( AttributeType ) list.get( 0 );
+            return ( MutableAttributeTypeImpl ) list.get( 0 );
         }
         else
         {
@@ -420,7 +420,7 @@ public class SchemaHandler
      * @param listener
      *      the listener
      */
-    public void addListener( AttributeType at, AttributeTypeListener listener )
+    public void addListener( MutableAttributeTypeImpl at, AttributeTypeListener listener )
     {
         if ( !attributeTypeListeners.containsValue( at, listener ) )
         {
@@ -437,7 +437,7 @@ public class SchemaHandler
      * @param listener
      *      the listener
      */
-    public void removeListener( AttributeType at, AttributeTypeListener listener )
+    public void removeListener( MutableAttributeTypeImpl at, AttributeTypeListener listener )
     {
         attributeTypeListeners.remove( at, listener );
     }
@@ -487,7 +487,7 @@ public class SchemaHandler
         schemasMap.put( schema.getSchemaName().toLowerCase(), schema );
 
         // Adding its attribute types
-        for ( AttributeType at : schema.getAttributeTypes() )
+        for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
         {
             addSchemaObject( at );
         }
@@ -522,9 +522,9 @@ public class SchemaHandler
      */
     private void addSchemaObject( SchemaObject object )
     {
-        if ( object instanceof AttributeType )
+        if ( object instanceof MutableAttributeTypeImpl )
         {
-            AttributeType at = ( AttributeType ) object;
+            MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) object;
             attributeTypesList.add( at );
             List<String> names = at.getNames();
             if ( names != null )
@@ -594,7 +594,7 @@ public class SchemaHandler
         schemasMap.remove( schema.getSchemaName().toLowerCase() );
 
         // Removing its attribute types
-        for ( AttributeType at : schema.getAttributeTypes() )
+        for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
         {
             removeSchemaObject( at );
         }
@@ -629,9 +629,9 @@ public class SchemaHandler
      */
     private void removeSchemaObject( SchemaObject object )
     {
-        if ( object instanceof AttributeType )
+        if ( object instanceof MutableAttributeTypeImpl )
         {
-            AttributeType at = ( AttributeType ) object;
+            MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) object;
             attributeTypesList.remove( at );
             List<String> names = at.getNames();
             if ( names != null )
@@ -694,7 +694,7 @@ public class SchemaHandler
      * @param at
      *      the attribute type
      */
-    public void addAttributeType( AttributeType at )
+    public void addAttributeType( MutableAttributeTypeImpl at )
     {
         Schema schema = getSchema( at.getSchemaName() );
 
@@ -720,7 +720,7 @@ public class SchemaHandler
      * @param at2
      *      the destination attribute type
      */
-    public void modifyAttributeType( AttributeType at1, AttributeType at2 )
+    public void modifyAttributeType( MutableAttributeTypeImpl at1, MutableAttributeTypeImpl at2 )
     {
         // Removing the references (in case of the names or oid have changed)
         removeSchemaObject( at1 );
@@ -755,7 +755,7 @@ public class SchemaHandler
      * @param at
      *      the attribute type
      */
-    public void removeAttributeType( AttributeType at )
+    public void removeAttributeType( MutableAttributeTypeImpl at )
     {
         Schema schema = getSchema( at.getSchemaName() );
 
@@ -885,7 +885,7 @@ public class SchemaHandler
      * @param at
      *      the added attribute type
      */
-    private void notifyAttributeTypeAdded( AttributeType at )
+    private void notifyAttributeTypeAdded( MutableAttributeTypeImpl at )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -911,7 +911,7 @@ public class SchemaHandler
      * @param at
      *      the modified attribute type
      */
-    private void notifyAttributeTypeModified( AttributeType at )
+    private void notifyAttributeTypeModified( MutableAttributeTypeImpl at )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -937,7 +937,7 @@ public class SchemaHandler
      * @param at
      *      the removed attribute type
      */
-    private void notifyAttributeTypeRemoved( AttributeType at )
+    private void notifyAttributeTypeRemoved( MutableAttributeTypeImpl at )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.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 abstract class SchemaHandlerAdapt
     /* (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 )
     {
     }
 
@@ -49,7 +49,7 @@ public abstract class SchemaHandlerAdapt
     /* (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 )
     {
     }
 
@@ -57,7 +57,7 @@ public abstract class SchemaHandlerAdapt
     /* (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 )
     {
     }
 



Mime
View raw message