directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1064167 - in /directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor: controller/ controller/actions/ model/ model/difference/ model/io/ model/schemachecker/ view/editors/schema/ view/views/ view...
Date Thu, 27 Jan 2011 15:56:49 GMT
Author: pamarcelot
Date: Thu Jan 27 15:56:48 2011
New Revision: 1064167

URL: http://svn.apache.org/viewvc?rev=1064167&view=rev
Log:
Changed the Schema interface to be a class extending the DefaultSchema class of Shared.
This change enables the use of our schema instances in the SchemaManager of Shared.

Removed:
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java
Modified:
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java Thu Jan 27 15:56:48 2011
@@ -482,7 +482,7 @@ public class SchemaHandler
     {
         // Adding the schema
         schemasList.add( schema );
-        schemasMap.put( schema.getName().toLowerCase(), schema );
+        schemasMap.put( schema.getSchemaName().toLowerCase(), schema );
 
         // Adding its attribute types
         for ( AttributeType at : schema.getAttributeTypes() )
@@ -589,7 +589,7 @@ public class SchemaHandler
     {
         // Removing the schema
         schemasList.remove( schema );
-        schemasMap.remove( schema.getName().toLowerCase() );
+        schemasMap.remove( schema.getSchemaName().toLowerCase() );
 
         // Removing its attribute types
         for ( AttributeType at : schema.getAttributeTypes() )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java Thu Jan 27 15:56:48 2011
@@ -161,7 +161,7 @@ public class DeleteSchemaElementAction e
                     if ( selectedItem instanceof SchemaWrapper )
                     {
                         Schema schema = ( ( SchemaWrapper ) selectedItem ).getSchema();
-                        schemasMap.put( schema.getName().toLowerCase(), schema );
+                        schemasMap.put( schema.getSchemaName().toLowerCase(), schema );
                     }
                     else if ( selectedItem instanceof AttributeTypeWrapper )
                     {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java Thu Jan 27 15:56:48 2011
@@ -322,7 +322,7 @@ public class DependenciesComputer
     private void computeSchemaDependency( Schema schema, SchemaObject object ) throws DependencyComputerException
     {
         String schemaName = object.getSchemaName();
-        if ( !schemaName.equalsIgnoreCase( schema.getName() ) )
+        if ( !schemaName.equalsIgnoreCase( schema.getSchemaName() ) )
         {
             Schema schemaFromSuperiorAT = schemaHandler.getSchema( schemaName );
             if ( schemaFromSuperiorAT == null )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java Thu Jan 27 15:56:48 2011
@@ -20,209 +20,372 @@
 package org.apache.directory.studio.schemaeditor.model;
 
 
+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.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.shared.ldap.model.schema.registries.DefaultSchema;
 
 
 /**
- * This interface represents a Schema.
- * 
+ * This class represents a schema.
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface Schema
+public class Schema extends DefaultSchema
 {
+    /** The project */
+    private Project project;
+
+    /** The AttributeType List */
+    private List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
+
+    /** The ObjectClass List */
+    private List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
+
+    /** The MatchingRule List */
+    private List<MatchingRule> matchingRules = new ArrayList<MatchingRule>();
+
+    /** The Syntax List */
+    private List<LdapSyntax> syntaxes = new ArrayList<LdapSyntax>();
+
+
     /**
-     * Gets the name of the Schema.
+     * Creates a new instance of Schema.
+     *
+     * @param name
+     *      the name of the schema
+     */
+    public Schema( String name )
+    {
+        super( name );
+    }
+
+
+    /**
+     * Adds an AttributeType to the Schema.
      * 
-     * @return
-     * 		the name of the Schema
+     * @param at
+     *      the AttributeType
      */
-    public String getName();
+    public boolean addAttributeType( AttributeType at )
+    {
+        return attributeTypes.add( at );
+    }
 
 
     /**
-     * Sets the name of the Schema.
+     * Adds a MatchingRule from the Schema.
      * 
-     * @param name
-     * 		the name of the schema
+     * @param mr
+     *      the MatchingRule
      */
-    public void setName( String name );
+    public boolean addMatchingRule( MatchingRule mr )
+    {
+        return matchingRules.add( mr );
+    }
 
 
     /**
-     * Gets the project of the Schema.
+     * Adds an ObjectClass to the Schema.
      * 
-     * @return
-     * 		the project of the Schema
+     * @param oc
+     *      the ObjectClass
      */
-    public Project getProject();
+    public boolean addObjectClass( ObjectClass oc )
+    {
+        return objectClasses.add( oc );
+    }
 
 
     /**
-     * Sets the project of the Schema.
+     * Adds a Syntax from the Schema.
      * 
-     * @param name
-     * 		the project of the schema
+     * @param syntax
+     *      the Syntax
      */
-    public void setProject( Project project );
+    public boolean addSyntax( LdapSyntax syntax )
+    {
+        return syntaxes.add( syntax );
+    }
 
 
     /**
-     * Gets all the ObjectClassImpl objects contained in the Schema.
+     * Gets the AttributeType identified by the given id.
      * 
+     * @param id
+     *      the name or the oid of the AttributeType
      * @return
-     * 		all the ObjectClassImpl objects contained in the Schema
+     *      the AttributeType identified by the given id, or null if the 
+     * AttributeType has not been found
      */
-    public List<ObjectClass> getObjectClasses();
+    public AttributeType getAttributeType( String id )
+    {
+        for ( AttributeType at : attributeTypes )
+        {
+            List<String> aliases = at.getNames();
+            if ( aliases != null )
+            {
+                for ( String alias : aliases )
+                {
+                    if ( alias.equalsIgnoreCase( id ) )
+                    {
+                        return at;
+                    }
+                }
+            }
+            if ( at.getOid().equalsIgnoreCase( id ) )
+            {
+                return at;
+            }
+        }
+
+        return null;
+    }
 
 
     /**
-     * Gets all the AttributeTypeImpl objects contained in the Schema.
+     * Gets all the AttributeType objects contained in the Schema.
      * 
      * @return
-     * 		all the AttributeTypeImpl objects contained in the Schema
+     *      all the AttributeType objects contained in the Schema
      */
-    public List<AttributeType> getAttributeTypes();
+    public List<AttributeType> getAttributeTypes()
+    {
+        return attributeTypes;
+    }
 
 
     /**
-     * Gets all the MatchingRuleImpl objects contained in the Schema.
+     * Gets the MatchingRule identified by the given id.
      * 
+     * @param id
+     *      the name or the oid of the MatchingRule
      * @return
-     *      all the MatchingRuleImpl objects contained in the Schema
+     *      the MatchingRule identified by the given id, or null if the 
+     * MatchingRule has not been found
      */
-    public List<MatchingRule> getMatchingRules();
+    public MatchingRule getMatchingRule( String id )
+    {
+        for ( MatchingRule mr : matchingRules )
+        {
+            List<String> aliases = mr.getNames();
+            if ( aliases != null )
+            {
+                for ( String alias : aliases )
+                {
+                    if ( alias.equalsIgnoreCase( id ) )
+                    {
+                        return mr;
+                    }
+                }
+            }
+            if ( mr.getOid().equalsIgnoreCase( id ) )
+            {
+                return mr;
+            }
+        }
+
+        return null;
+    }
 
 
     /**
-     * Gets all the SyntaxImpl objects contained in the Schema.
+     * Gets all the MatchingRule objects contained in the Schema.
      * 
      * @return
-     *      all the SyntaxImpl objects contained in the Schema
+     *      all the MatchingRule objects contained in the Schema
      */
-    public List<LdapSyntax> getSyntaxes();
+    public List<MatchingRule> getMatchingRules()
+    {
+        return matchingRules;
+    }
 
 
     /**
-     * Gets the ObjectClassImpl identified by the given id.
+     * Gets the project of the Schema.
      * 
-     * @param id
-     * 		the name or the oid of the ObjectClassImpl
      * @return
-     * 		the ObjectClassImpl identified by the given id, or null if the 
-     * ObjectClassImpl has not been found
+     *      the project of the Schema
      */
-    public ObjectClass getObjectClass( String id );
+    public Project getProject()
+    {
+        return project;
+    }
 
 
     /**
-     * Gets the AttributeTypeImpl identified by the given id.
+     * Gets the ObjectClass identified by the given id.
      * 
      * @param id
-     * 		the name or the oid of the AttributeTypeImpl
+     *      the name or the oid of the ObjectClass
      * @return
-     * 		the AttributeTypeImpl identified by the given id, or null if the 
-     * AttributeTypeImpl has not been found
+     *      the ObjectClass identified by the given id, or null if the 
+     * ObjectClass has not been found
      */
-    public AttributeType getAttributeType( String id );
+    public ObjectClass getObjectClass( String id )
+    {
+        for ( ObjectClass oc : objectClasses )
+        {
+            List<String> aliases = oc.getNames();
+            if ( aliases != null )
+            {
+                for ( String alias : aliases )
+                {
+                    if ( alias.equalsIgnoreCase( id ) )
+                    {
+                        return oc;
+                    }
+                }
+            }
+            if ( oc.getOid().equalsIgnoreCase( id ) )
+            {
+                return oc;
+            }
+        }
+
+        return null;
+    }
 
 
     /**
-     * Gets the MatchingRuleImpl identified by the given id.
+     * Gets all the ObjectClass objects contained in the Schema.
      * 
-     * @param id
-     *      the name or the oid of the MatchingRuleImpl
      * @return
-     *      the MatchingRuleImpl identified by the given id, or null if the 
-     * MatchingRuleImpl has not been found
+     *      all the ObjectClass objects contained in the Schema
      */
-    public MatchingRule getMatchingRule( String id );
+    public List<ObjectClass> getObjectClasses()
+    {
+        return objectClasses;
+    }
 
 
     /**
-     * Gets the SyntaxImpl identified by the given id.
+     * Gets the Syntax identified by the given id.
      * 
      * @param id
-     *      the name or the oid of the SyntaxImpl
+     *      the name or the oid of the Syntax
      * @return
-     *      the SyntaxImpl identified by the given id, or null if the 
-     * SyntaxImpl has not been found
+     *      the Syntax identified by the given id, or null if the 
+     * Syntax has not been found
      */
-    public LdapSyntax getSyntax( String id );
+    public LdapSyntax getSyntax( String id )
+    {
+        for ( LdapSyntax syntax : syntaxes )
+        {
+            List<String> aliases = syntax.getNames();
+            if ( aliases != null )
+            {
+                for ( String alias : aliases )
+                {
+                    if ( alias.equalsIgnoreCase( id ) )
+                    {
+                        return syntax;
+                    }
+                }
+            }
+            if ( syntax.getOid().equalsIgnoreCase( id ) )
+            {
+                return syntax;
+            }
+        }
+
+        return null;
+    }
 
 
     /**
-     * Adds an ObjectClassImpl to the Schema.
+     * Gets all the Syntax objects contained in the Schema.
      * 
-     * @param oc
-     *      the ObjectClassImpl
+     * @return
+     *      all the Syntax objects contained in the Schema
      */
-    public boolean addObjectClass( ObjectClass oc );
+    public List<LdapSyntax> getSyntaxes()
+    {
+        return syntaxes;
+    }
 
 
     /**
-     * Adds an AttributeTypeImpl to the Schema.
+     * Removes an AttributeType from the Schema.
      * 
      * @param at
-     *      the AttributeTypeImpl
+     *      the AttributeType
      */
-    public boolean addAttributeType( AttributeType at );
+    public boolean removeAttributeType( AttributeType at )
+    {
+        return attributeTypes.remove( at );
+    }
 
 
     /**
-     * Adds a MatchingRuleImpl from the Schema.
+     * Removes a MatchingRule from the Schema.
      * 
      * @param mr
-     *      the MatchingRuleImpl
+     *      the MatchingRule
      */
-    public boolean addMatchingRule( MatchingRule mr );
+    public boolean removeMatchingRule( MatchingRule mr )
+    {
+        return matchingRules.remove( mr );
+    }
 
 
     /**
-     * Adds a SyntaxImpl from the Schema.
-     * 
-     * @param syntax
-     *      the SyntaxImpl
+     * Removes an ObjectClass from the Schema.
+     *
+     * @param oc
+     *      the ObjectClass
      */
-    public boolean addSyntax( LdapSyntax syntax );
+    public boolean removeObjectClass( ObjectClass oc )
+    {
+        return objectClasses.remove( oc );
+    }
 
 
     /**
-     * Removes an ObjectClassImpl from the Schema.
-     *
-     * @param oc
-     *      the ObjectClassImpl
+     * Removes a Syntax from the Schema.
+     * 
+     * @param syntax
+     *      the Syntax
      */
-    public boolean removeObjectClass( ObjectClass oc );
+    public boolean removeSyntax( LdapSyntax syntax )
+    {
+        return syntaxes.remove( syntax );
+    }
 
 
     /**
-     * Removes an AttributeTypeImpl from the Schema.
-     * 
-     * @param at
-     *      the AttributeTypeImpl
+     * Sets the name of the schema.
+     *
+     * @param schemaName
+     *      the name of the schema
      */
-    public boolean removeAttributeType( AttributeType at );
+    public void setSchemaName( String schemaName )
+    {
+        this.name = schemaName;
+    }
 
 
     /**
-     * Removes a MatchingRuleImpl from the Schema.
+     * Sets the project of the Schema.
      * 
-     * @param mr
-     *      the MatchingRuleImpl
+     * @param name
+     *      the project of the schema
      */
-    public boolean removeMatchingRule( MatchingRule mr );
+    public void setProject( Project project )
+    {
+        this.project = project;
+    }
 
 
     /**
-     * Removes a SyntaxImpl from the Schema.
-     * 
-     * @param syntax
-     *      the SyntaxImpl
+     * {@inheritDoc}
      */
-    public boolean removeSyntax( LdapSyntax syntax );
+    public String toString()
+    {
+        return getSchemaName();
+    }
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java Thu Jan 27 15:56:48 2011
@@ -59,18 +59,18 @@ public class DifferenceEngine
         Map<String, Schema> mapL1 = new HashMap<String, Schema>();
         for ( Schema schema : l1 )
         {
-            mapL1.put( schema.getName().toLowerCase(), schema );
+            mapL1.put( schema.getSchemaName().toLowerCase(), schema );
         }
         Map<String, Schema> mapL2 = new HashMap<String, Schema>();
         for ( Schema schema : l2 )
         {
-            mapL2.put( schema.getName().toLowerCase(), schema );
+            mapL2.put( schema.getSchemaName().toLowerCase(), schema );
         }
 
         // Looping on schemas from the first list
         for ( Schema schemaFromL1 : l1 )
         {
-            Schema schemaFromL2 = mapL2.get( schemaFromL1.getName().toLowerCase() );
+            Schema schemaFromL2 = mapL2.get( schemaFromL1.getSchemaName().toLowerCase() );
             if ( schemaFromL2 == null )
             {
                 SchemaDifference schemaDifference = new SchemaDifference( schemaFromL1, null, DifferenceType.REMOVED );
@@ -207,7 +207,7 @@ public class DifferenceEngine
         // Looping on schemas from the second list
         for ( Schema schemaFromL2 : l2 )
         {
-            Schema schemaFromL1 = mapL1.get( schemaFromL2.getName().toLowerCase() );
+            Schema schemaFromL1 = mapL1.get( schemaFromL2.getSchemaName().toLowerCase() );
             if ( schemaFromL1 == null )
             {
                 SchemaDifference schemaDifference = new SchemaDifference( null, schemaFromL2, DifferenceType.ADDED );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Thu Jan 27 15:56:48 2011
@@ -41,7 +41,6 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
 import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
 import org.apache.directory.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SchemaImpl;
 
 
 /**
@@ -204,7 +203,7 @@ public class ApacheDsSchemaConnector ext
         monitor.subTask( name ); //$NON-NLS-1$
 
         // Creating the schema
-        Schema schema = new SchemaImpl( name );
+        Schema schema = new Schema( name );
 
         // Looking for the nodes of the schema
         SearchControls constraintSearch = new SearchControls();

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Thu Jan 27 15:56:48 2011
@@ -45,7 +45,6 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.Utils;
 import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
 import org.apache.directory.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SchemaImpl;
 
 
 /**
@@ -183,7 +182,7 @@ public class GenericSchemaConnector exte
         StudioProgressMonitor monitor ) throws NamingException, ParseException
     {
         // Creating the schema
-        Schema schema = new SchemaImpl( "schema" ); //$NON-NLS-1$
+        Schema schema = new Schema( "schema" ); //$NON-NLS-1$
 
         Attribute attributeTypesAttribute = searchResult.getAttributes().get( "attributeTypes" );
         if ( attributeTypesAttribute != null )
@@ -212,7 +211,7 @@ public class GenericSchemaConnector exte
                     impl.setEqualityOid( atd.getEqualityOid() );
                     impl.setOrderingOid( atd.getOrderingOid() );
                     impl.setSubstringOid( atd.getSubstringOid() );
-                    impl.setSchemaName( schema.getName() );
+                    impl.setSchemaName( schema.getSchemaName() );
 
                     // Active Directory hack
                     if ( impl.getSyntaxOid() != null && "OctetString".equalsIgnoreCase( impl.getSyntaxOid() ) ) //$NON-NLS-1$
@@ -246,7 +245,7 @@ public class GenericSchemaConnector exte
                     impl.setObsolete( ocd.isObsolete() );
                     impl.setMustAttributeTypeOids( ocd.getMustAttributeTypeOids() );
                     impl.setMayAttributeTypeOids( ocd.getMayAttributeTypeOids() );
-                    impl.setSchemaName( schema.getName() );
+                    impl.setSchemaName( schema.getSchemaName() );
 
                     schema.addObjectClass( impl );
                 }
@@ -272,7 +271,7 @@ public class GenericSchemaConnector exte
                         { lsd.getDescription() } );
                     //impl.setObsolete( lsd.isObsolete() );
                     impl.setHumanReadable( true );
-                    impl.setSchemaName( schema.getName() );
+                    impl.setSchemaName( schema.getSchemaName() );
 
                     schema.addSyntax( impl );
                 }
@@ -285,7 +284,7 @@ public class GenericSchemaConnector exte
             if ( syntaxOid != null && schema.getSyntax( syntaxOid ) == null )
             {
                 LdapSyntax impl = new LdapSyntax( syntaxOid );
-                impl.setSchemaName( schema.getName() );
+                impl.setSchemaName( schema.getSchemaName() );
                 String oidDescription = Utils.getOidDescription( syntaxOid );
                 impl.setDescription( oidDescription != null ? oidDescription : "Dummy" ); //$NON-NLS-1$
                 impl.setNames( new String[]
@@ -312,7 +311,7 @@ public class GenericSchemaConnector exte
                     impl.setNames( mrd.getNames().toArray( new String[0] ) );
                     impl.setObsolete( mrd.isObsolete() );
                     impl.setSyntaxOid( mrd.getSyntaxOid() );
-                    impl.setSchemaName( schema.getName() );
+                    impl.setSchemaName( schema.getSchemaName() );
 
                     schema.addMatchingRule( impl );
                 }
@@ -338,7 +337,7 @@ public class GenericSchemaConnector exte
             if ( matchingRuleName != null && schema.getMatchingRule( matchingRuleName ) == null )
             {
                 MatchingRule impl = new MatchingRule( matchingRuleName );
-                impl.setSchemaName( schema.getName() );
+                impl.setSchemaName( schema.getSchemaName() );
                 impl.setDescription( "Dummy" ); //$NON-NLS-1$
                 impl.setNames( new String[]
                     { matchingRuleName } );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Thu Jan 27 15:56:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.ldap.
 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;
-import org.apache.directory.studio.schemaeditor.model.SchemaImpl;
 import org.eclipse.osgi.util.NLS;
 
 
@@ -91,7 +90,7 @@ public class OpenLdapSchemaFileImporter
 
         String schemaName = getNameFromPath( path );
 
-        Schema schema = new SchemaImpl( schemaName );
+        Schema schema = new Schema( schemaName );
 
         List<?> ats = parser.getAttributeTypes();
         for ( int i = 0; i < ats.size(); i++ )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Thu Jan 27 15:56:48 2011
@@ -186,7 +186,7 @@ public class XMLSchemaFileExporter
         if ( schema != null )
         {
             // Name 
-            String name = schema.getName();
+            String name = schema.getSchemaName();
             if ( ( name != null ) && ( !name.equals( "" ) ) ) //$NON-NLS-1$
             {
                 element.addAttribute( NAME_TAG, name );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Thu Jan 27 15:56:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SchemaImpl;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -201,10 +200,7 @@ public class XMLSchemaFileImporter
     public static Schema readSchema( Element element, String path ) throws XMLSchemaFileImportException
     {
         // Creating the schema with an empty name
-        Schema schema = new SchemaImpl( null );
-
-        // Name
-        schema.setName( getSchemaName( element, path ) );
+        Schema schema = new Schema( getSchemaName( element, path ) );
 
         // Attribute Types
         readAttributeTypes( element, schema );
@@ -322,7 +318,7 @@ public class XMLSchemaFileImporter
         }
 
         // Schema
-        at.setSchemaName( schema.getName() );
+        at.setSchemaName( schema.getSchemaName() );
 
         // Aliases
         Element aliasesElement = element.element( ALIASES_TAG );
@@ -492,7 +488,7 @@ public class XMLSchemaFileImporter
         }
 
         // Schema
-        oc.setSchemaName( schema.getName() );
+        oc.setSchemaName( schema.getSchemaName() );
 
         // Aliases
         Element aliasesElement = element.element( ALIASES_TAG );
@@ -639,7 +635,7 @@ public class XMLSchemaFileImporter
         }
 
         // Schema
-        mr.setSchemaName( schema.getName() );
+        mr.setSchemaName( schema.getSchemaName() );
 
         // Aliases
         Element aliasesElement = element.element( ALIASES_TAG );
@@ -730,7 +726,7 @@ public class XMLSchemaFileImporter
         }
 
         // Schema
-        syntax.setSchemaName( schema.getName() );
+        syntax.setSchemaName( schema.getSchemaName() );
 
         // Aliases
         Element aliasesElement = element.element( ALIASES_TAG );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Thu Jan 27 15:56:48 2011
@@ -380,7 +380,7 @@ public class SchemaChecker
 
                     for ( Schema schema : schemas )
                     {
-                        monitor.subTask( schema.getName() );
+                        monitor.subTask( schema.getSchemaName() );
 
                         List<AttributeType> ats = schema.getAttributeTypes();
                         for ( AttributeType at : ats )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java Thu Jan 27 15:56:48 2011
@@ -69,7 +69,7 @@ public class SchemaEditorInput implement
      */
     public String getName()
     {
-        return this.schema.getName();
+        return this.schema.getSchemaName();
     }
 
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java Thu Jan 27 15:56:48 2011
@@ -247,7 +247,7 @@ public class SchemaEditorOverviewPage ex
             | Section.TITLE_BAR );
         attributeTypesSection.setDescription( NLS.bind(
             Messages.getString( "SchemaEditorOverviewPage.SchemaAttribute" ), new String[] //$NON-NLS-1$
-            { schema.getName() } ) );
+            { schema.getSchemaName() } ) );
         attributeTypesSection.setText( Messages.getString( "SchemaEditorOverviewPage.AttributeTypes" ) ); //$NON-NLS-1$
 
         // Creating the layout of the section
@@ -280,7 +280,7 @@ public class SchemaEditorOverviewPage ex
             | Section.TITLE_BAR );
         objectClassesSection.setDescription( NLS.bind( Messages
             .getString( "SchemaEditorOverviewPage.SchemaObjectClasses" ), new String[] //$NON-NLS-1$
-            { schema.getName() } ) );
+            { schema.getSchemaName() } ) );
         objectClassesSection.setText( Messages.getString( "SchemaEditorOverviewPage.ObjectClasses" ) ); //$NON-NLS-1$
 
         // Creating the layout of the section

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java Thu Jan 27 15:56:48 2011
@@ -80,7 +80,7 @@ public class SchemaViewLabelProvider ext
         {
             SchemaWrapper sw = ( SchemaWrapper ) element;
 
-            return sw.getSchema().getName();
+            return sw.getSchema().getSchemaName();
         }
         else if ( element instanceof AttributeTypeWrapper )
         {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java Thu Jan 27 15:56:48 2011
@@ -80,13 +80,13 @@ public class DifferencesWidgetSchemaLabe
             switch ( sd.getType() )
             {
                 case ADDED:
-                    return ( ( Schema ) sd.getDestination() ).getName();
+                    return ( ( Schema ) sd.getDestination() ).getSchemaName();
                 case MODIFIED:
-                    return ( ( Schema ) sd.getDestination() ).getName();
+                    return ( ( Schema ) sd.getDestination() ).getSchemaName();
                 case REMOVED:
-                    return ( ( Schema ) sd.getSource() ).getName();
+                    return ( ( Schema ) sd.getSource() ).getSchemaName();
                 case IDENTICAL:
-                    return ( ( Schema ) sd.getDestination() ).getName();
+                    return ( ( Schema ) sd.getDestination() ).getSchemaName();
             }
         }
         else if ( element instanceof AttributeTypeDifference )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java Thu Jan 27 15:56:48 2011
@@ -47,32 +47,32 @@ public class SchemaDifferenceSorter impl
             switch ( sd1.getType() )
             {
                 case ADDED:
-                    name1 = ( ( Schema ) sd1.getDestination() ).getName();
+                    name1 = ( ( Schema ) sd1.getDestination() ).getSchemaName();
                     break;
                 case MODIFIED:
-                    name1 = ( ( Schema ) sd1.getDestination() ).getName();
+                    name1 = ( ( Schema ) sd1.getDestination() ).getSchemaName();
                     break;
                 case REMOVED:
-                    name1 = ( ( Schema ) sd1.getSource() ).getName();
+                    name1 = ( ( Schema ) sd1.getSource() ).getSchemaName();
                     break;
                 case IDENTICAL:
-                    name1 = ( ( Schema ) sd1.getDestination() ).getName();
+                    name1 = ( ( Schema ) sd1.getDestination() ).getSchemaName();
                     break;
             }
 
             switch ( sd2.getType() )
             {
                 case ADDED:
-                    name2 = ( ( Schema ) sd2.getDestination() ).getName();
+                    name2 = ( ( Schema ) sd2.getDestination() ).getSchemaName();
                     break;
                 case MODIFIED:
-                    name2 = ( ( Schema ) sd2.getDestination() ).getName();
+                    name2 = ( ( Schema ) sd2.getDestination() ).getSchemaName();
                     break;
                 case REMOVED:
-                    name2 = ( ( Schema ) sd2.getSource() ).getName();
+                    name2 = ( ( Schema ) sd2.getSource() ).getSchemaName();
                     break;
                 case IDENTICAL:
-                    name2 = ( ( Schema ) sd2.getDestination() ).getName();
+                    name2 = ( ( Schema ) sd2.getDestination() ).getSchemaName();
                     break;
             }
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java Thu Jan 27 15:56:48 2011
@@ -87,12 +87,12 @@ public class ExportSchemasAsOpenLdapWiza
                         Messages.getString( "ExportSchemasAsOpenLdapWizard.ExportingSchemas" ), selectedSchemas.length ); //$NON-NLS-1$
                     for ( Schema schema : selectedSchemas )
                     {
-                        monitor.subTask( schema.getName() );
+                        monitor.subTask( schema.getSchemaName() );
 
                         try
                         {
                             BufferedWriter buffWriter = new BufferedWriter( new FileWriter( exportDirectory + "/" //$NON-NLS-1$
-                                + schema.getName() + ".schema" ) ); //$NON-NLS-1$
+                                + schema.getSchemaName() + ".schema" ) ); //$NON-NLS-1$
                             buffWriter.write( OpenLdapSchemaFileExporter.toSourceCode( schema ) );
                             buffWriter.close();
                         }
@@ -102,11 +102,11 @@ public class ExportSchemasAsOpenLdapWiza
                                 .logError(
                                     NLS
                                         .bind(
-                                            Messages.getString( "ExportSchemasAsOpenLdapWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ), //$NON-NLS-1$
+                                            Messages.getString( "ExportSchemasAsOpenLdapWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ), //$NON-NLS-1$
                                     e );
                             ViewUtils
                                 .displayErrorMessageBox(
-                                    Messages.getString( "ExportSchemasAsOpenLdapWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsOpenLdapWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                                    Messages.getString( "ExportSchemasAsOpenLdapWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsOpenLdapWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
                         }
                         monitor.worked( 1 );
                     }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizardPage.java Thu Jan 27 15:56:48 2011
@@ -122,7 +122,7 @@ public class ExportSchemasAsOpenLdapWiza
             {
                 if ( element instanceof Schema )
                 {
-                    return ( ( Schema ) element ).getName();
+                    return ( ( Schema ) element ).getSchemaName();
                 }
 
                 // Default
@@ -227,7 +227,7 @@ public class ExportSchemasAsOpenLdapWiza
             {
                 public int compare( Schema o1, Schema o2 )
                 {
-                    return o1.getName().compareToIgnoreCase( o2.getName() );
+                    return o1.getSchemaName().compareToIgnoreCase( o2.getSchemaName() );
                 }
             } );
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java Thu Jan 27 15:56:48 2011
@@ -90,12 +90,12 @@ public class ExportSchemasAsXmlWizard ex
                             Messages.getString( "ExportSchemasAsXmlWizard.ExportingSchemas" ), selectedSchemas.length ); //$NON-NLS-1$
                         for ( Schema schema : selectedSchemas )
                         {
-                            monitor.subTask( schema.getName() );
+                            monitor.subTask( schema.getSchemaName() );
 
                             try
                             {
                                 BufferedWriter buffWriter = new BufferedWriter( new FileWriter( exportDirectory + "/" //$NON-NLS-1$
-                                    + schema.getName() + ".xml" ) ); //$NON-NLS-1$
+                                    + schema.getSchemaName() + ".xml" ) ); //$NON-NLS-1$
                                 buffWriter.write( XMLSchemaFileExporter.toXml( schema ) );
                                 buffWriter.close();
                             }
@@ -105,10 +105,10 @@ public class ExportSchemasAsXmlWizard ex
                                     .logError(
                                         NLS
                                             .bind(
-                                                Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getName() } ), e ); //$NON-NLS-1$
+                                                Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getSchemaName() } ), e ); //$NON-NLS-1$
                                 ViewUtils
                                     .displayErrorMessageBox(
-                                        Messages.getString( "ExportSchemasAsXmlWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                                        Messages.getString( "ExportSchemasAsXmlWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getSchemaName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
                             }
                             monitor.worked( 1 );
                         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizardPage.java Thu Jan 27 15:56:48 2011
@@ -131,7 +131,7 @@ public class ExportSchemasAsXmlWizardPag
             {
                 if ( element instanceof Schema )
                 {
-                    return ( ( Schema ) element ).getName();
+                    return ( ( Schema ) element ).getSchemaName();
                 }
 
                 // Default
@@ -290,7 +290,7 @@ public class ExportSchemasAsXmlWizardPag
             {
                 public int compare( Schema o1, Schema o2 )
                 {
-                    return o1.getName().compareToIgnoreCase( o2.getName() );
+                    return o1.getSchemaName().compareToIgnoreCase( o2.getSchemaName() );
                 }
             } );
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Thu Jan 27 15:56:48 2011
@@ -105,7 +105,7 @@ public class ExportSchemasForADSWizard e
                             Messages.getString( "ExportSchemasForADSWizard.ExportingSchemas" ), selectedSchemas.length ); //$NON-NLS-1$
                         for ( Schema schema : selectedSchemas )
                         {
-                            monitor.subTask( schema.getName() );
+                            monitor.subTask( schema.getSchemaName() );
 
                             StringBuffer sb = new StringBuffer();
                             DateFormat format = DateFormat.getDateTimeInstance( DateFormat.LONG, DateFormat.MEDIUM );
@@ -120,7 +120,7 @@ public class ExportSchemasForADSWizard e
                                 toLdif( schema, sb );
 
                                 BufferedWriter buffWriter = new BufferedWriter( new FileWriter( exportDirectory + "/" //$NON-NLS-1$
-                                    + schema.getName() + ".ldif" ) ); //$NON-NLS-1$
+                                    + schema.getSchemaName() + ".ldif" ) ); //$NON-NLS-1$
                                 buffWriter.write( sb.toString() );
                                 buffWriter.close();
                             }
@@ -130,10 +130,10 @@ public class ExportSchemasForADSWizard e
                                     .logError(
                                         NLS
                                             .bind(
-                                                Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ), e ); //$NON-NLS-1$
+                                                Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ), e ); //$NON-NLS-1$
                                 ViewUtils
                                     .displayErrorMessageBox(
-                                        Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                                        Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
                             }
                             monitor.worked( 1 );
                         }
@@ -181,10 +181,10 @@ public class ExportSchemasForADSWizard e
                                     .logError(
                                         NLS
                                             .bind(
-                                                Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ), e ); //$NON-NLS-1$
+                                                Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ), e ); //$NON-NLS-1$
                                 ViewUtils
                                     .displayErrorMessageBox(
-                                        Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                                        Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
                             }
                         }
 
@@ -237,12 +237,12 @@ public class ExportSchemasForADSWizard e
         sb
             .append( NLS
                 .bind(
-                    Messages.getString( "ExportSchemasForADSWizard.SchemaComment" ), new String[] { schema.getName().toUpperCase() } ) ); //$NON-NLS-1$ 
+                    Messages.getString( "ExportSchemasForADSWizard.SchemaComment" ), new String[] { schema.getSchemaName().toUpperCase() } ) ); //$NON-NLS-1$ 
 
-        sb.append( "dn: cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: metaSchema\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
-        sb.append( "cn: " + schema.getName() + "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "cn: " + schema.getSchemaName() + "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         String[] schemaDependencies = getSchemaDependencies( schema );
         for ( String schemaName : schemaDependencies )
         {
@@ -251,7 +251,7 @@ public class ExportSchemasForADSWizard e
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the Attribute Types Node
-        sb.append( "dn: ou=attributeTypes, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=attributeTypes, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: attributetypes\n" ); //$NON-NLS-1$
@@ -280,60 +280,60 @@ public class ExportSchemasForADSWizard e
             holder.setOidLen( new Long( at.getSyntaxLength() ).intValue() );
             holder.setUsage( at.getUsage() );
 
-            sb.append( holder.toLdif( schema.getName() ) + "\n" ); //$NON-NLS-1$
+            sb.append( holder.toLdif( schema.getSchemaName() ) + "\n" ); //$NON-NLS-1$
         }
 
         // Generation the Comparators Node
-        sb.append( "dn: ou=comparators, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=comparators, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: comparators\n" ); //$NON-NLS-1$
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the DIT Content Rules Node
-        sb.append( "dn: ou=ditContentRules, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=ditContentRules, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: ditcontentrules\n" ); //$NON-NLS-1$
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the DIT Structure RulesNode
-        sb.append( "dn: ou=ditStructureRules, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=ditStructureRules, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: ditstructurerules\n" ); //$NON-NLS-1$
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the Matching Rules Node
-        sb.append( "dn: ou=matchingRules, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=matchingRules, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: matchingrules\n" ); //$NON-NLS-1$
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the Matching Rule Use Node
-        sb.append( "dn: ou=matchingRuleUse, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=matchingRuleUse, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: matchingruleuse\n" ); //$NON-NLS-1$
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the Name Forms Node
-        sb.append( "dn: ou=nameForms, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=nameForms, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: nameforms\n" ); //$NON-NLS-1$
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the Normalizers Node
-        sb.append( "dn: ou=normalizers, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=normalizers, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: normalizers\n" ); //$NON-NLS-1$
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the Object Classes Node
-        sb.append( "dn: ou=objectClasses, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=objectClasses, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: objectClasses\n" ); //$NON-NLS-1$
@@ -372,18 +372,18 @@ public class ExportSchemasForADSWizard e
             holder.setSuperiors( superiorList );
             holder.setObsolete( oc.isObsolete() );
 
-            sb.append( holder.toLdif( schema.getName() ) + "\n" ); //$NON-NLS-1$
+            sb.append( holder.toLdif( schema.getSchemaName() ) + "\n" ); //$NON-NLS-1$
         }
 
         // Generation the Syntax Checkers Node
-        sb.append( "dn: ou=syntaxCheckers, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=syntaxCheckers, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: syntaxcheckers\n" ); //$NON-NLS-1$
         sb.append( "\n" ); //$NON-NLS-1$
 
         // Generation the Syntaxes Node
-        sb.append( "dn: ou=syntaxes, cn=" + schema.getName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "dn: ou=syntaxes, cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
         sb.append( "objectclass: organizationalUnit\n" ); //$NON-NLS-1$
         sb.append( "objectclass: top\n" ); //$NON-NLS-1$
         sb.append( "ou: syntaxes\n" ); //$NON-NLS-1$
@@ -475,7 +475,7 @@ public class ExportSchemasForADSWizard e
                 AttributeType sup = schemaHandler.getAttributeType( supName );
                 if ( sup != null )
                 {
-                    if ( !schema.getName().toLowerCase().equals( sup.getSchemaName().toLowerCase() ) )
+                    if ( !schema.getSchemaName().toLowerCase().equals( sup.getSchemaName().toLowerCase() ) )
                     {
                         schemaNames.add( sup.getSchemaName() );
                     }
@@ -495,7 +495,7 @@ public class ExportSchemasForADSWizard e
                     ObjectClass sup = schemaHandler.getObjectClass( supName );
                     if ( sup != null )
                     {
-                        if ( !schema.getName().toLowerCase().equals( sup.getSchemaName().toLowerCase() ) )
+                        if ( !schema.getSchemaName().toLowerCase().equals( sup.getSchemaName().toLowerCase() ) )
                         {
                             schemaNames.add( sup.getSchemaName() );
                         }
@@ -512,7 +512,7 @@ public class ExportSchemasForADSWizard e
                     AttributeType may = schemaHandler.getAttributeType( mayName );
                     if ( may != null )
                     {
-                        if ( !schema.getName().toLowerCase().equals( may.getSchemaName().toLowerCase() ) )
+                        if ( !schema.getSchemaName().toLowerCase().equals( may.getSchemaName().toLowerCase() ) )
                         {
                             schemaNames.add( may.getSchemaName() );
                         }
@@ -530,7 +530,7 @@ public class ExportSchemasForADSWizard e
                     AttributeType must = schemaHandler.getAttributeType( mustName );
                     if ( must != null )
                     {
-                        if ( !schema.getName().toLowerCase().equals( must.getSchemaName().toLowerCase() ) )
+                        if ( !schema.getSchemaName().toLowerCase().equals( must.getSchemaName().toLowerCase() ) )
                         {
                             schemaNames.add( must.getSchemaName() );
                         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizardPage.java Thu Jan 27 15:56:48 2011
@@ -132,7 +132,7 @@ public class ExportSchemasForADSWizardPa
             {
                 if ( element instanceof Schema )
                 {
-                    return ( ( Schema ) element ).getName();
+                    return ( ( Schema ) element ).getSchemaName();
                 }
 
                 // Default
@@ -291,7 +291,7 @@ public class ExportSchemasForADSWizardPa
             {
                 public int compare( Schema o1, Schema o2 )
                 {
-                    return o1.getName().compareToIgnoreCase( o2.getName() );
+                    return o1.getSchemaName().compareToIgnoreCase( o2.getSchemaName() );
                 }
             } );
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizardPage.java Thu Jan 27 15:56:48 2011
@@ -74,7 +74,7 @@ public class ImportCoreSchemasWizardPage
             List<String> schemaNames = new ArrayList<String>();
             for ( Schema schema : schemas )
             {
-                schemaNames.add( schema.getName() );
+                schemaNames.add( schema.getSchemaName() );
             }
 
             coreSchemaSelectionWidget.setGrayedCoreSchemas( schemaNames.toArray( new String[0] ) );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java Thu Jan 27 15:56:48 2011
@@ -167,7 +167,7 @@ public class MergeSchemasSelectionWizard
                 }
                 else if ( element instanceof Schema )
                 {
-                    return ( ( Schema ) element ).getName();
+                    return ( ( Schema ) element ).getSchemaName();
                 }
                 else if ( element instanceof ObjectClassFolder )
                 {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java Thu Jan 27 15:56:48 2011
@@ -33,7 +33,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.model.Project;
 import org.apache.directory.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SchemaImpl;
 import org.apache.directory.studio.schemaeditor.view.dialogs.MessageDialogWithTextarea;
 import org.apache.directory.studio.schemaeditor.view.wizards.MergeSchemasSelectionWizardPage.AttributeTypeFolder;
 import org.apache.directory.studio.schemaeditor.view.wizards.MergeSchemasSelectionWizardPage.ObjectClassFolder;
@@ -202,7 +201,7 @@ public class MergeSchemasWizard extends 
         }
         else
         {
-            targetSchema = new SchemaImpl( targetSchemaName );
+            targetSchema = new Schema( targetSchemaName );
             targetSchema.setProject( targetProject );
         }
         targetSchemas.put( targetSchemaName, targetSchema );
@@ -312,7 +311,7 @@ public class MergeSchemasWizard extends 
                 clonedAttributeType.setEqualityOid( sourceAttributeType.getEqualityOid() );
                 clonedAttributeType.setOrderingOid( sourceAttributeType.getOrderingOid() );
                 clonedAttributeType.setSubstringOid( sourceAttributeType.getSubstringOid() );
-                clonedAttributeType.setSchemaName( targetSchema.getName() );
+                clonedAttributeType.setSchemaName( targetSchema.getSchemaName() );
 
                 // if no/unknown syntax: set "Directory String" syntax and appropriate matching rules
                 if ( replaceUnknownSyntax )
@@ -431,7 +430,7 @@ public class MergeSchemasWizard extends 
                 clonedObjectClass.setObsolete( sourceObjectClass.isObsolete() );
                 clonedObjectClass.setMustAttributeTypeOids( sourceObjectClass.getMustAttributeTypeOids() );
                 clonedObjectClass.setMayAttributeTypeOids( sourceObjectClass.getMayAttributeTypeOids() );
-                clonedObjectClass.setSchemaName( targetSchema.getName() );
+                clonedObjectClass.setSchemaName( targetSchema.getSchemaName() );
 
                 // merge dependencies: super object classes and must/may attributes
                 if ( mergeDependencies )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java Thu Jan 27 15:56:48 2011
@@ -134,7 +134,7 @@ public class NewAttributeTypeGeneralWiza
             {
                 if ( element instanceof Schema )
                 {
-                    return ( ( Schema ) element ).getName();
+                    return ( ( Schema ) element ).getSchemaName();
                 }
 
                 // Default
@@ -297,7 +297,7 @@ public class NewAttributeTypeGeneralWiza
             {
                 public int compare( Schema o1, Schema o2 )
                 {
-                    return o1.getName().compareToIgnoreCase( o2.getName() );
+                    return o1.getSchemaName().compareToIgnoreCase( o2.getSchemaName() );
                 }
             } );
 
@@ -404,7 +404,7 @@ public class NewAttributeTypeGeneralWiza
         {
             Schema schema = ( Schema ) selection.getFirstElement();
 
-            return schema.getName();
+            return schema.getSchemaName();
         }
         else
         {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java Thu Jan 27 15:56:48 2011
@@ -134,7 +134,7 @@ public class NewObjectClassGeneralPageWi
             {
                 if ( element instanceof Schema )
                 {
-                    return ( ( Schema ) element ).getName();
+                    return ( ( Schema ) element ).getSchemaName();
                 }
 
                 // Default
@@ -298,7 +298,7 @@ public class NewObjectClassGeneralPageWi
             {
                 public int compare( Schema o1, Schema o2 )
                 {
-                    return o1.getName().compareToIgnoreCase( o2.getName() );
+                    return o1.getSchemaName().compareToIgnoreCase( o2.getSchemaName() );
                 }
             } );
 
@@ -405,7 +405,7 @@ public class NewObjectClassGeneralPageWi
         {
             Schema schema = ( Schema ) selection.getFirstElement();
 
-            return schema.getName();
+            return schema.getSchemaName();
         }
         else
         {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java Thu Jan 27 15:56:48 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
 
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.SchemaImpl;
+import org.apache.directory.studio.schemaeditor.model.Schema;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.INewWizard;
@@ -60,7 +60,7 @@ public class NewSchemaWizard extends Wiz
      */
     public boolean performFinish()
     {
-        SchemaImpl schema = new SchemaImpl( page.getSchemaName() );
+        Schema schema = new Schema( page.getSchemaName() );
         schema.setProject( Activator.getDefault().getProjectsHandler().getOpenProject() );
         Activator.getDefault().getSchemaHandler().addSchema( schema );
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java?rev=1064167&r1=1064166&r2=1064167&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java Thu Jan 27 15:56:48 2011
@@ -41,7 +41,7 @@ public class SchemaSorter implements Com
             Schema s1 = ( ( SchemaWrapper ) o1 ).getSchema();
             Schema s2 = ( ( SchemaWrapper ) o2 ).getSchema();
 
-            return s1.getName().compareToIgnoreCase( s2.getName() );
+            return s1.getSchemaName().compareToIgnoreCase( s2.getSchemaName() );
         }
 
         // Default



Mime
View raw message