directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1063841 [1/6] - in /directory/studio/trunk/plugins/schemaeditor: ./ src/main/java/org/apache/directory/studio/schemaeditor/ src/main/java/org/apache/directory/studio/schemaeditor/controller/ src/main/java/org/apache/directory/studio/schema...
Date Wed, 26 Jan 2011 19:25:25 GMT
Author: pamarcelot
Date: Wed Jan 26 19:25:22 2011
New Revision: 1063841

URL: http://svn.apache.org/viewvc?rev=1063841&view=rev
Log:
Switched to the 'AttributeType', 'ObjectClass', 'LdapSyntax', 'MatchingRule' Shared classes (Studio's extensions are no longer required).

Removed:
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java
Modified:
    directory/studio/trunk/plugins/schemaeditor/plugin.xml
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java
    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/SchemaHandlerAdapter.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.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/controller/actions/LinkWithEditorHierarchyViewAction.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/SchemaImpl.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/hierarchy/HierarchyManager.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/OpenLdapSchemaFileExporter.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/SchemaEditorSchemaCheckerLabelDecorator.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboInput.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.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/editors/schema/SchemaEditorSourceCodePage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.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/views/SearchView.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.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/wizards/ExportSchemasForADSWizard.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/NewAttributeTypeContentWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/OidSorter.java
    directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java

Modified: directory/studio/trunk/plugins/schemaeditor/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/plugin.xml?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/plugin.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/plugin.xml Wed Jan 26 19:25:22 2011
@@ -244,10 +244,10 @@
                       name="org.apache.directory.studio.schemaeditor.view.wrappers.ObjectClassWrapper">
                 </objectClass>
                 <objectClass
-                      name="org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl">
+                      name="org.apache.directory.shared.ldap.model.schema.AttributeType">
                 </objectClass>
                 <objectClass
-                      name="org.apache.directory.studio.schemaeditor.model.ObjectClassImpl">
+                      name="org.apache.directory.shared.ldap.model.schema.ObjectClass">
                 </objectClass>
              </or>
           </enablement>

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java Wed Jan 26 19:25:22 2011
@@ -33,11 +33,11 @@ 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.ObjectClass;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
 import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.Project;
 import org.apache.directory.studio.schemaeditor.model.Schema;
 import org.apache.directory.studio.schemaeditor.model.io.ProjectsExporter;
@@ -87,12 +87,11 @@ public class PluginUtils
      * @return
      *      a clone of the given attribute type
      */
-    public static AttributeTypeImpl getClone( AttributeTypeImpl at )
+    public static AttributeType getClone( AttributeType at )
     {
-        AttributeTypeImpl clone = new AttributeTypeImpl( at.getOid() );
+        AttributeType clone = new AttributeType( at.getOid() );
         clone.setNames( at.getNames() );
         clone.setSchemaName( at.getSchemaName() );
-        clone.setSchemaObject( at.getSchemaObject() );
         clone.setDescription( at.getDescription() );
         clone.setSuperiorOid( at.getSuperiorOid() );
         clone.setUsage( at.getUsage() );
@@ -118,12 +117,11 @@ public class PluginUtils
      * @return
      *      a clone of the given object class
      */
-    public static ObjectClassImpl getClone( ObjectClassImpl oc )
+    public static ObjectClass getClone( ObjectClass oc )
     {
-        ObjectClassImpl clone = new ObjectClassImpl( oc.getOid() );
+        ObjectClass clone = new ObjectClass( oc.getOid() );
         clone.setNames( oc.getNames() );
         clone.setSchemaName( oc.getSchemaName() );
-        clone.setSchemaObject( oc.getSchemaObject() );
         clone.setDescription( oc.getDescription() );
         clone.setSuperiorOids( oc.getSuperiorOids() );
         clone.setType( oc.getType() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java Wed Jan 26 19:25:22 2011
@@ -20,11 +20,11 @@
 package org.apache.directory.studio.schemaeditor.controller;
 
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+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;
 import org.apache.directory.studio.schemaeditor.PluginUtils;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaCheckerListener;
 import org.apache.directory.studio.schemaeditor.view.ViewUtils;
 import org.apache.directory.studio.schemaeditor.view.editors.attributetype.AttributeTypeEditor;
@@ -115,14 +115,14 @@ public class ProblemsViewController
                 {
                     SchemaObject object = ( ( SchemaErrorWrapper ) objectSelection ).getSchemaError().getSource();
 
-                    if ( object instanceof AttributeTypeImpl )
+                    if ( object instanceof AttributeType )
                     {
-                        input = new AttributeTypeEditorInput( ( AttributeTypeImpl ) object );
+                        input = new AttributeTypeEditorInput( ( AttributeType ) object );
                         editorId = AttributeTypeEditor.ID;
                     }
-                    else if ( object instanceof ObjectClassImpl )
+                    else if ( object instanceof ObjectClass )
                     {
-                        input = new ObjectClassEditorInput( ( ObjectClassImpl ) object );
+                        input = new ObjectClassEditorInput( ( ObjectClass ) object );
                         editorId = ObjectClassEditor.ID;
                     }
                 }
@@ -130,14 +130,14 @@ public class ProblemsViewController
                 {
                     SchemaObject object = ( ( SchemaWarningWrapper ) objectSelection ).getSchemaWarning().getSource();
 
-                    if ( object instanceof AttributeTypeImpl )
+                    if ( object instanceof AttributeType )
                     {
-                        input = new AttributeTypeEditorInput( ( AttributeTypeImpl ) object );
+                        input = new AttributeTypeEditorInput( ( AttributeType ) object );
                         editorId = AttributeTypeEditor.ID;
                     }
-                    else if ( object instanceof ObjectClassImpl )
+                    else if ( object instanceof ObjectClass )
                     {
-                        input = new ObjectClassEditorInput( ( ObjectClassImpl ) object );
+                        input = new ObjectClassEditorInput( ( ObjectClass ) object );
                         editorId = ObjectClassEditor.ID;
                     }
                 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java Wed Jan 26 19:25:22 2011
@@ -20,10 +20,10 @@
 package org.apache.directory.studio.schemaeditor.controller;
 
 
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
+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;
 
 
 /**
@@ -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( AttributeTypeImpl at )
+    public void attributeTypeAdded( AttributeType 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( AttributeTypeImpl at )
+    public void attributeTypeModified( AttributeType 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( AttributeTypeImpl at )
+    public void attributeTypeRemoved( AttributeType at )
     {
     }
 
@@ -64,7 +64,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#matchingRuleAdded(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleAdded( MatchingRuleImpl mr )
+    public void matchingRuleAdded( MatchingRule mr )
     {
     }
 
@@ -72,7 +72,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#matchingRuleModified(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleModified( MatchingRuleImpl mr )
+    public void matchingRuleModified( MatchingRule mr )
     {
     }
 
@@ -80,7 +80,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#matchingRuleRemoved(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleRemoved( MatchingRuleImpl mr )
+    public void matchingRuleRemoved( MatchingRule mr )
     {
     }
 
@@ -88,7 +88,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#objectClassAdded(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
      */
-    public void objectClassAdded( ObjectClassImpl oc )
+    public void objectClassAdded( ObjectClass oc )
     {
     }
 
@@ -96,7 +96,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#objectClassModified(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
      */
-    public void objectClassModified( ObjectClassImpl oc )
+    public void objectClassModified( ObjectClass oc )
     {
     }
 
@@ -104,7 +104,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#objectClassRemoved(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
      */
-    public void objectClassRemoved( ObjectClassImpl oc )
+    public void objectClassRemoved( ObjectClass oc )
     {
     }
 
@@ -112,7 +112,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#syntaxAdded(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
      */
-    public void syntaxAdded( SyntaxImpl syntax )
+    public void syntaxAdded( LdapSyntax syntax )
     {
     }
 
@@ -120,7 +120,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#syntaxModified(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
      */
-    public void syntaxModified( SyntaxImpl syntax )
+    public void syntaxModified( LdapSyntax syntax )
     {
     }
 
@@ -128,7 +128,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#syntaxRemoved(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
      */
-    public void syntaxRemoved( SyntaxImpl syntax )
+    public void syntaxRemoved( LdapSyntax syntax )
     {
     }
 }

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=1063841&r1=1063840&r2=1063841&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 Wed Jan 26 19:25:22 2011
@@ -25,12 +25,12 @@ import java.util.List;
 
 import org.apache.commons.collections.MultiMap;
 import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
 
 
 /**
@@ -49,13 +49,13 @@ public class SchemaHandler
     /** The schemas List */
     private List<Schema> schemasList;
     /** The attribute types List */
-    private List<AttributeTypeImpl> attributeTypesList;
+    private List<AttributeType> attributeTypesList;
     /** The matching rules List */
-    private List<MatchingRuleImpl> matchingRulesList;
+    private List<MatchingRule> matchingRulesList;
     /** The object classes List */
-    private List<ObjectClassImpl> objectClassesList;
+    private List<ObjectClass> objectClassesList;
     /** The syntaxes List */
-    private List<SyntaxImpl> syntaxesList;
+    private List<LdapSyntax> syntaxesList;
 
     //
     // The MultiMap (for fast searching)
@@ -87,10 +87,10 @@ public class SchemaHandler
     {
         // Lists
         schemasList = new ArrayList<Schema>();
-        attributeTypesList = new ArrayList<AttributeTypeImpl>();
-        matchingRulesList = new ArrayList<MatchingRuleImpl>();;
-        objectClassesList = new ArrayList<ObjectClassImpl>();
-        syntaxesList = new ArrayList<SyntaxImpl>();
+        attributeTypesList = new ArrayList<AttributeType>();
+        matchingRulesList = new ArrayList<MatchingRule>();;
+        objectClassesList = new ArrayList<ObjectClass>();
+        syntaxesList = new ArrayList<LdapSyntax>();
 
         // Maps
         schemasMap = new MultiValueMap();
@@ -113,7 +113,7 @@ public class SchemaHandler
      * @return
      *      the List of all the attribute types
      */
-    public List<AttributeTypeImpl> getAttributeTypes()
+    public List<AttributeType> getAttributeTypes()
     {
         return attributeTypesList;
     }
@@ -125,7 +125,7 @@ public class SchemaHandler
      * @return
      *      the List of all the matching rules
      */
-    public List<MatchingRuleImpl> getMatchingRules()
+    public List<MatchingRule> getMatchingRules()
     {
         return matchingRulesList;
     }
@@ -137,7 +137,7 @@ public class SchemaHandler
      * @return
      *      the List of all the object classes
      */
-    public List<ObjectClassImpl> getObjectClasses()
+    public List<ObjectClass> getObjectClasses()
     {
         return objectClassesList;
     }
@@ -161,7 +161,7 @@ public class SchemaHandler
      * @return
      *      the List of all the matching rules
      */
-    public List<SyntaxImpl> getSyntaxes()
+    public List<LdapSyntax> getSyntaxes()
     {
         return syntaxesList;
     }
@@ -175,13 +175,13 @@ public class SchemaHandler
      * @return
      *      the corresponding attribute type, or null if no one is found
      */
-    public AttributeTypeImpl getAttributeType( String id )
+    public AttributeType getAttributeType( String id )
     {
         List<?> list = getAttributeTypeList( id.toLowerCase() );
 
         if ( ( list != null ) && ( list.size() >= 1 ) )
         {
-            return ( AttributeTypeImpl ) list.get( 0 );
+            return ( AttributeType ) list.get( 0 );
         }
         else
         {
@@ -212,13 +212,13 @@ public class SchemaHandler
      * @return
      *      the corresponding matching rule, or null if no one is found
      */
-    public MatchingRuleImpl getMatchingRule( String id )
+    public MatchingRule getMatchingRule( String id )
     {
         List<?> list = getMatchingRuleList( id.toLowerCase() );
 
         if ( ( list != null ) && ( list.size() >= 1 ) )
         {
-            return ( MatchingRuleImpl ) list.get( 0 );
+            return ( MatchingRule ) list.get( 0 );
         }
         else
         {
@@ -249,13 +249,13 @@ public class SchemaHandler
      * @return
      *      the corresponding object class, or null if no one is found
      */
-    public ObjectClassImpl getObjectClass( String id )
+    public ObjectClass getObjectClass( String id )
     {
         List<?> list = getObjectClassList( id.toLowerCase() );
 
         if ( ( list != null ) && ( list.size() >= 1 ) )
         {
-            return ( ObjectClassImpl ) list.get( 0 );
+            return ( ObjectClass ) list.get( 0 );
         }
         else
         {
@@ -323,13 +323,13 @@ public class SchemaHandler
      * @return
      *      the corresponding syntax, or null if no one is found
      */
-    public SyntaxImpl getSyntax( String id )
+    public LdapSyntax getSyntax( String id )
     {
         List<?> list = getSyntaxList( id.toLowerCase() );
 
         if ( ( list != null ) && ( list.size() >= 1 ) )
         {
-            return ( SyntaxImpl ) list.get( 0 );
+            return ( LdapSyntax ) list.get( 0 );
         }
         else
         {
@@ -418,7 +418,7 @@ public class SchemaHandler
      * @param listener
      *      the listener
      */
-    public void addListener( AttributeTypeImpl at, AttributeTypeListener listener )
+    public void addListener( AttributeType at, AttributeTypeListener listener )
     {
         if ( !attributeTypeListeners.containsValue( at, listener ) )
         {
@@ -435,7 +435,7 @@ public class SchemaHandler
      * @param listener
      *      the listener
      */
-    public void removeListener( AttributeTypeImpl at, AttributeTypeListener listener )
+    public void removeListener( AttributeType at, AttributeTypeListener listener )
     {
         attributeTypeListeners.remove( at, listener );
     }
@@ -449,7 +449,7 @@ public class SchemaHandler
      * @param listener
      *      the listener
      */
-    public void addListener( ObjectClassImpl oc, ObjectClassListener listener )
+    public void addListener( ObjectClass oc, ObjectClassListener listener )
     {
         if ( !objectClassListeners.containsValue( oc, listener ) )
         {
@@ -466,7 +466,7 @@ public class SchemaHandler
      * @param listener
      *      the listener
      */
-    public void removeListener( ObjectClassImpl oc, ObjectClassListener listener )
+    public void removeListener( ObjectClass oc, ObjectClassListener listener )
     {
         objectClassListeners.remove( oc, listener );
     }
@@ -485,25 +485,25 @@ public class SchemaHandler
         schemasMap.put( schema.getName().toLowerCase(), schema );
 
         // Adding its attribute types
-        for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+        for ( AttributeType at : schema.getAttributeTypes() )
         {
             addSchemaObject( at );
         }
 
         // Adding its matching rules
-        for ( MatchingRuleImpl mr : schema.getMatchingRules() )
+        for ( MatchingRule mr : schema.getMatchingRules() )
         {
             addSchemaObject( mr );
         }
 
         // Adding its object classes
-        for ( ObjectClassImpl oc : schema.getObjectClasses() )
+        for ( ObjectClass oc : schema.getObjectClasses() )
         {
             addSchemaObject( oc );
         }
 
         // Adding its syntaxes
-        for ( SyntaxImpl syntax : schema.getSyntaxes() )
+        for ( LdapSyntax syntax : schema.getSyntaxes() )
         {
             addSchemaObject( syntax );
         }
@@ -520,9 +520,9 @@ public class SchemaHandler
      */
     private void addSchemaObject( SchemaObject object )
     {
-        if ( object instanceof AttributeTypeImpl )
+        if ( object instanceof AttributeType )
         {
-            AttributeTypeImpl at = ( AttributeTypeImpl ) object;
+            AttributeType at = ( AttributeType ) object;
             attributeTypesList.add( at );
             List<String> names = at.getNames();
             if ( names != null )
@@ -534,9 +534,9 @@ public class SchemaHandler
             }
             attributeTypesMap.put( at.getOid(), at );
         }
-        else if ( object instanceof MatchingRuleImpl )
+        else if ( object instanceof MatchingRule )
         {
-            MatchingRuleImpl mr = ( MatchingRuleImpl ) object;
+            MatchingRule mr = ( MatchingRule ) object;
             matchingRulesList.add( mr );
             List<String> names = mr.getNames();
             if ( names != null )
@@ -548,9 +548,9 @@ public class SchemaHandler
             }
             matchingRulesMap.put( mr.getOid(), mr );
         }
-        else if ( object instanceof ObjectClassImpl )
+        else if ( object instanceof ObjectClass )
         {
-            ObjectClassImpl oc = ( ObjectClassImpl ) object;
+            ObjectClass oc = ( ObjectClass ) object;
             objectClassesList.add( oc );
             List<String> names = oc.getNames();
             if ( names != null )
@@ -562,9 +562,9 @@ public class SchemaHandler
             }
             objectClassesMap.put( oc.getOid(), oc );
         }
-        else if ( object instanceof SyntaxImpl )
+        else if ( object instanceof LdapSyntax )
         {
-            SyntaxImpl syntax = ( SyntaxImpl ) object;
+            LdapSyntax syntax = ( LdapSyntax ) object;
             syntaxesList.add( syntax );
             List<String> names = syntax.getNames();
             if ( names != null )
@@ -592,25 +592,25 @@ public class SchemaHandler
         schemasMap.remove( schema.getName().toLowerCase() );
 
         // Removing its attribute types
-        for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+        for ( AttributeType at : schema.getAttributeTypes() )
         {
             removeSchemaObject( at );
         }
 
         // Removing its matching rules
-        for ( MatchingRuleImpl mr : schema.getMatchingRules() )
+        for ( MatchingRule mr : schema.getMatchingRules() )
         {
             removeSchemaObject( mr );
         }
 
         // Removing its object classes
-        for ( ObjectClassImpl oc : schema.getObjectClasses() )
+        for ( ObjectClass oc : schema.getObjectClasses() )
         {
             removeSchemaObject( oc );
         }
 
         // Removing its syntaxes
-        for ( SyntaxImpl syntax : schema.getSyntaxes() )
+        for ( LdapSyntax syntax : schema.getSyntaxes() )
         {
             removeSchemaObject( syntax );
         }
@@ -627,9 +627,9 @@ public class SchemaHandler
      */
     private void removeSchemaObject( SchemaObject object )
     {
-        if ( object instanceof AttributeTypeImpl )
+        if ( object instanceof AttributeType )
         {
-            AttributeTypeImpl at = ( AttributeTypeImpl ) object;
+            AttributeType at = ( AttributeType ) object;
             attributeTypesList.remove( at );
             List<String> names = at.getNames();
             if ( names != null )
@@ -641,9 +641,9 @@ public class SchemaHandler
             }
             attributeTypesMap.remove( at.getOid() );
         }
-        else if ( object instanceof MatchingRuleImpl )
+        else if ( object instanceof MatchingRule )
         {
-            MatchingRuleImpl mr = ( MatchingRuleImpl ) object;
+            MatchingRule mr = ( MatchingRule ) object;
             matchingRulesList.remove( mr );
             List<String> names = mr.getNames();
             if ( names != null )
@@ -655,9 +655,9 @@ public class SchemaHandler
             }
             matchingRulesMap.remove( mr.getOid() );
         }
-        else if ( object instanceof ObjectClassImpl )
+        else if ( object instanceof ObjectClass )
         {
-            ObjectClassImpl oc = ( ObjectClassImpl ) object;
+            ObjectClass oc = ( ObjectClass ) object;
             objectClassesList.remove( oc );
             List<String> names = oc.getNames();
             if ( names != null )
@@ -669,9 +669,9 @@ public class SchemaHandler
             }
             objectClassesMap.remove( oc.getOid() );
         }
-        else if ( object instanceof SyntaxImpl )
+        else if ( object instanceof LdapSyntax )
         {
-            SyntaxImpl syntax = ( SyntaxImpl ) object;
+            LdapSyntax syntax = ( LdapSyntax ) object;
             syntaxesList.remove( syntax );
             List<String> names = syntax.getNames();
             if ( names != null )
@@ -692,7 +692,7 @@ public class SchemaHandler
      * @param at
      *      the attribute type
      */
-    public void addAttributeType( AttributeTypeImpl at )
+    public void addAttributeType( AttributeType at )
     {
         Schema schema = getSchema( at.getSchemaName() );
 
@@ -718,7 +718,7 @@ public class SchemaHandler
      * @param at2
      *      the destination attribute type
      */
-    public void modifyAttributeType( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    public void modifyAttributeType( AttributeType at1, AttributeType at2 )
     {
         // Removing the references (in case of the names or oid have changed)
         removeSchemaObject( at1 );
@@ -753,7 +753,7 @@ public class SchemaHandler
      * @param at
      *      the attribute type
      */
-    public void removeAttributeType( AttributeTypeImpl at )
+    public void removeAttributeType( AttributeType at )
     {
         Schema schema = getSchema( at.getSchemaName() );
 
@@ -776,7 +776,7 @@ public class SchemaHandler
      * @param oc
      *      the object class
      */
-    public void addObjectClass( ObjectClassImpl oc )
+    public void addObjectClass( ObjectClass oc )
     {
         Schema schema = getSchema( oc.getSchemaName() );
 
@@ -802,7 +802,7 @@ public class SchemaHandler
      * @param oc2
      *      the destination object class  
      */
-    public void modifyObjectClass( ObjectClassImpl oc1, ObjectClassImpl oc2 )
+    public void modifyObjectClass( ObjectClass oc1, ObjectClass oc2 )
     {
         // Removing the references (in case of the names or oid have changed)
         removeSchemaObject( oc1 );
@@ -831,7 +831,7 @@ public class SchemaHandler
      * @param oc
      *      the object class
      */
-    public void removeObjectClass( ObjectClassImpl oc )
+    public void removeObjectClass( ObjectClass oc )
     {
         Schema schema = getSchema( oc.getSchemaName() );
 
@@ -883,7 +883,7 @@ public class SchemaHandler
      * @param at
      *      the added attribute type
      */
-    private void notifyAttributeTypeAdded( AttributeTypeImpl at )
+    private void notifyAttributeTypeAdded( AttributeType at )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -909,7 +909,7 @@ public class SchemaHandler
      * @param at
      *      the modified attribute type
      */
-    private void notifyAttributeTypeModified( AttributeTypeImpl at )
+    private void notifyAttributeTypeModified( AttributeType at )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -935,7 +935,7 @@ public class SchemaHandler
      * @param at
      *      the removed attribute type
      */
-    private void notifyAttributeTypeRemoved( AttributeTypeImpl at )
+    private void notifyAttributeTypeRemoved( AttributeType at )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -971,7 +971,7 @@ public class SchemaHandler
      * @param oc
      *      the added object class
      */
-    private void notifyObjectClassAdded( ObjectClassImpl oc )
+    private void notifyObjectClassAdded( ObjectClass oc )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -997,7 +997,7 @@ public class SchemaHandler
      * @param oc
      *      the modified object class
      */
-    private void notifyObjectClassModified( ObjectClassImpl oc )
+    private void notifyObjectClassModified( ObjectClass oc )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1023,7 +1023,7 @@ public class SchemaHandler
      * @param oc
      *      the removed object class
      */
-    private void notifyObjectClassRemoved( ObjectClassImpl oc )
+    private void notifyObjectClassRemoved( ObjectClass oc )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1059,7 +1059,7 @@ public class SchemaHandler
      * @param mr
      *      the added matching rule
      */
-    private void notifyMatchingRuleAdded( MatchingRuleImpl mr )
+    private void notifyMatchingRuleAdded( MatchingRule mr )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1085,7 +1085,7 @@ public class SchemaHandler
      * @param mr
      *      the modified matching rule
      */
-    private void notifyMatchingRuleModified( MatchingRuleImpl mr )
+    private void notifyMatchingRuleModified( MatchingRule mr )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1111,7 +1111,7 @@ public class SchemaHandler
      * @param mr
      *      the removed matching rule
      */
-    private void notifyMatchingRuleRemoved( MatchingRuleImpl mr )
+    private void notifyMatchingRuleRemoved( MatchingRule mr )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1137,7 +1137,7 @@ public class SchemaHandler
      * @param syntax
      *      the added syntax
      */
-    private void notifySyntaxRuleAdded( SyntaxImpl syntax )
+    private void notifySyntaxRuleAdded( LdapSyntax syntax )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1163,7 +1163,7 @@ public class SchemaHandler
      * @param syntax
      *      the modified syntax
      */
-    private void notifySyntaxRuleModified( SyntaxImpl syntax )
+    private void notifySyntaxRuleModified( LdapSyntax syntax )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1189,7 +1189,7 @@ public class SchemaHandler
      * @param syntax
      *      the removed syntax
      */
-    private void notifySyntaxRemoved( SyntaxImpl syntax )
+    private void notifySyntaxRemoved( LdapSyntax syntax )
     {
         // SchemaHandler Listeners
         for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java Wed Jan 26 19:25:22 2011
@@ -20,11 +20,11 @@
 package org.apache.directory.studio.schemaeditor.controller;
 
 
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
+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.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
 
 
 /**
@@ -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( AttributeTypeImpl at )
+    public void attributeTypeAdded( AttributeType 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( AttributeTypeImpl at )
+    public void attributeTypeModified( AttributeType 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( AttributeTypeImpl at )
+    public void attributeTypeRemoved( AttributeType at )
     {
     }
 
@@ -65,7 +65,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#matchingRuleAdded(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleAdded( MatchingRuleImpl mr )
+    public void matchingRuleAdded( MatchingRule mr )
     {
     }
 
@@ -73,7 +73,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#matchingRuleModified(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleModified( MatchingRuleImpl mr )
+    public void matchingRuleModified( MatchingRule mr )
     {
     }
 
@@ -81,7 +81,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#matchingRuleRemoved(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleRemoved( MatchingRuleImpl mr )
+    public void matchingRuleRemoved( MatchingRule mr )
     {
     }
 
@@ -89,7 +89,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassAdded(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
      */
-    public void objectClassAdded( ObjectClassImpl oc )
+    public void objectClassAdded( ObjectClass oc )
     {
     }
 
@@ -97,7 +97,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassModified(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
      */
-    public void objectClassModified( ObjectClassImpl oc )
+    public void objectClassModified( ObjectClass oc )
     {
     }
 
@@ -105,7 +105,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassRemoved(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
      */
-    public void objectClassRemoved( ObjectClassImpl oc )
+    public void objectClassRemoved( ObjectClass oc )
     {
     }
 
@@ -129,7 +129,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#syntaxAdded(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
      */
-    public void syntaxAdded( SyntaxImpl syntax )
+    public void syntaxAdded( LdapSyntax syntax )
     {
     }
 
@@ -137,7 +137,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#syntaxModified(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
      */
-    public void syntaxModified( SyntaxImpl syntax )
+    public void syntaxModified( LdapSyntax syntax )
     {
     }
 
@@ -145,7 +145,7 @@ public abstract class SchemaHandlerAdapt
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#syntaxRemoved(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
      */
-    public void syntaxRemoved( SyntaxImpl syntax )
+    public void syntaxRemoved( LdapSyntax syntax )
     {
     }
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java Wed Jan 26 19:25:22 2011
@@ -20,11 +20,11 @@
 package org.apache.directory.studio.schemaeditor.controller;
 
 
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
+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.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
 
 
 /**
@@ -41,7 +41,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAdded( AttributeTypeImpl at );
+    public void attributeTypeAdded( AttributeType at );
 
 
     /**
@@ -50,7 +50,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModified( AttributeTypeImpl at );
+    public void attributeTypeModified( AttributeType at );
 
 
     /**
@@ -59,7 +59,7 @@ public interface SchemaHandlerListener
      * @param at
      *      the removed attribute type
      */
-    public void attributeTypeRemoved( AttributeTypeImpl at );
+    public void attributeTypeRemoved( AttributeType at );
 
 
     /**
@@ -68,7 +68,7 @@ public interface SchemaHandlerListener
      * @param mr
      *      the added matching rule
      */
-    public void matchingRuleAdded( MatchingRuleImpl mr );
+    public void matchingRuleAdded( MatchingRule mr );
 
 
     /**
@@ -77,7 +77,7 @@ public interface SchemaHandlerListener
      * @param mr
      *      the modified matching rule
      */
-    public void matchingRuleModified( MatchingRuleImpl mr );
+    public void matchingRuleModified( MatchingRule mr );
 
 
     /**
@@ -86,7 +86,7 @@ public interface SchemaHandlerListener
      * @param mr
      *      the removed matching rule
      */
-    public void matchingRuleRemoved( MatchingRuleImpl mr );
+    public void matchingRuleRemoved( MatchingRule mr );
 
 
     /**
@@ -95,7 +95,7 @@ public interface SchemaHandlerListener
      * @param oc
      *      the added object class
      */
-    public void objectClassAdded( ObjectClassImpl oc );
+    public void objectClassAdded( ObjectClass oc );
 
 
     /**
@@ -104,7 +104,7 @@ public interface SchemaHandlerListener
      * @param oc
      *      the modified object class
      */
-    public void objectClassModified( ObjectClassImpl oc );
+    public void objectClassModified( ObjectClass oc );
 
 
     /**
@@ -113,7 +113,7 @@ public interface SchemaHandlerListener
      * @param oc
      *      the removed attribute type
      */
-    public void objectClassRemoved( ObjectClassImpl oc );
+    public void objectClassRemoved( ObjectClass oc );
 
 
     /**
@@ -140,7 +140,7 @@ public interface SchemaHandlerListener
      * @param syntax
      *      the added syntax
      */
-    public void syntaxAdded( SyntaxImpl syntax );
+    public void syntaxAdded( LdapSyntax syntax );
 
 
     /**
@@ -149,7 +149,7 @@ public interface SchemaHandlerListener
      * @param syntax
      *      the modified syntax
      */
-    public void syntaxModified( SyntaxImpl syntax );
+    public void syntaxModified( LdapSyntax syntax );
 
 
     /**
@@ -158,5 +158,5 @@ public interface SchemaHandlerListener
      * @param syntax
      *      the removed syntax
      */
-    public void syntaxRemoved( SyntaxImpl syntax );
+    public void syntaxRemoved( LdapSyntax syntax );
 }
\ No newline at end of file

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java Wed Jan 26 19:25:22 2011
@@ -20,10 +20,10 @@
 package org.apache.directory.studio.schemaeditor.controller;
 
 
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
+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;
 
 
 /**
@@ -40,7 +40,7 @@ public interface SchemaListener
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAdded( AttributeTypeImpl at );
+    public void attributeTypeAdded( AttributeType at );
 
 
     /**
@@ -49,7 +49,7 @@ public interface SchemaListener
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModified( AttributeTypeImpl at );
+    public void attributeTypeModified( AttributeType at );
 
 
     /**
@@ -58,7 +58,7 @@ public interface SchemaListener
      * @param at
      *      the removed attribute type
      */
-    public void attributeTypeRemoved( AttributeTypeImpl at );
+    public void attributeTypeRemoved( AttributeType at );
 
 
     /**
@@ -67,7 +67,7 @@ public interface SchemaListener
      * @param mr
      *      the added matching rule
      */
-    public void matchingRuleAdded( MatchingRuleImpl mr );
+    public void matchingRuleAdded( MatchingRule mr );
 
 
     /**
@@ -76,7 +76,7 @@ public interface SchemaListener
      * @param mr
      *      the modified matching rule
      */
-    public void matchingRuleModified( MatchingRuleImpl mr );
+    public void matchingRuleModified( MatchingRule mr );
 
 
     /**
@@ -85,7 +85,7 @@ public interface SchemaListener
      * @param mr
      *      the removed matching rule
      */
-    public void matchingRuleRemoved( MatchingRuleImpl mr );
+    public void matchingRuleRemoved( MatchingRule mr );
 
 
     /**
@@ -94,7 +94,7 @@ public interface SchemaListener
      * @param oc
      *      the added object class
      */
-    public void objectClassAdded( ObjectClassImpl oc );
+    public void objectClassAdded( ObjectClass oc );
 
 
     /**
@@ -103,7 +103,7 @@ public interface SchemaListener
      * @param oc
      *      the modified object class
      */
-    public void objectClassModified( ObjectClassImpl oc );
+    public void objectClassModified( ObjectClass oc );
 
 
     /**
@@ -112,7 +112,7 @@ public interface SchemaListener
      * @param oc
      *      the removed attribute type
      */
-    public void objectClassRemoved( ObjectClassImpl oc );
+    public void objectClassRemoved( ObjectClass oc );
 
 
     /**
@@ -121,7 +121,7 @@ public interface SchemaListener
      * @param syntax
      *      the added syntax
      */
-    public void syntaxAdded( SyntaxImpl syntax );
+    public void syntaxAdded( LdapSyntax syntax );
 
 
     /**
@@ -130,7 +130,7 @@ public interface SchemaListener
      * @param syntax
      *      the modified syntax
      */
-    public void syntaxModified( SyntaxImpl syntax );
+    public void syntaxModified( LdapSyntax syntax );
 
 
     /**
@@ -139,5 +139,5 @@ public interface SchemaListener
      * @param syntax
      *      the removed syntax
      */
-    public void syntaxRemoved( SyntaxImpl syntax );
+    public void syntaxRemoved( LdapSyntax syntax );
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java Wed Jan 26 19:25:22 2011
@@ -23,6 +23,8 @@ package org.apache.directory.studio.sche
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -45,8 +47,6 @@ import org.apache.directory.studio.schem
 import org.apache.directory.studio.schemaeditor.controller.actions.OpenTypeHierarchyAction;
 import org.apache.directory.studio.schemaeditor.controller.actions.SwitchSchemaPresentationToFlatAction;
 import org.apache.directory.studio.schemaeditor.controller.actions.SwitchSchemaPresentationToHierarchicalAction;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.Project;
 import org.apache.directory.studio.schemaeditor.model.Schema;
 import org.apache.directory.studio.schemaeditor.view.ViewUtils;
@@ -111,7 +111,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeAdded( AttributeTypeImpl at )
+        public void attributeTypeAdded( AttributeType at )
         {
             SchemaViewContentProvider contentProvider = ( SchemaViewContentProvider ) viewer.getContentProvider();
             contentProvider.attributeTypeAdded( at );
@@ -128,7 +128,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeModified( AttributeTypeImpl at )
+        public void attributeTypeModified( AttributeType at )
         {
             ( ( SchemaViewContentProvider ) viewer.getContentProvider() ).attributeTypeModified( at );
             view.refresh();
@@ -138,7 +138,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeRemoved( AttributeTypeImpl at )
+        public void attributeTypeRemoved( AttributeType at )
         {
             ( ( SchemaViewContentProvider ) viewer.getContentProvider() ).attributeTypeRemoved( at );
             view.refresh();
@@ -148,7 +148,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassAdded(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassAdded( ObjectClassImpl oc )
+        public void objectClassAdded( ObjectClass oc )
         {
             SchemaViewContentProvider contentProvider = ( SchemaViewContentProvider ) viewer.getContentProvider();
             contentProvider.objectClassAdded( oc );
@@ -165,7 +165,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassModified(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassModified( ObjectClassImpl oc )
+        public void objectClassModified( ObjectClass oc )
         {
             ( ( SchemaViewContentProvider ) viewer.getContentProvider() ).objectClassModified( oc );
             view.refresh();
@@ -175,7 +175,7 @@ public class SchemaViewController
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#objectClassRemoved(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassRemoved( ObjectClassImpl oc )
+        public void objectClassRemoved( ObjectClass oc )
         {
             ( ( SchemaViewContentProvider ) viewer.getContentProvider() ).objectClassRemoved( oc );
             view.refresh();

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=1063841&r1=1063840&r2=1063841&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 Wed Jan 26 19:25:22 2011
@@ -26,12 +26,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.Schema;
 import org.apache.directory.studio.schemaeditor.view.wrappers.AttributeTypeWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.ObjectClassWrapper;
@@ -165,12 +165,12 @@ public class DeleteSchemaElementAction e
                     }
                     else if ( selectedItem instanceof AttributeTypeWrapper )
                     {
-                        AttributeTypeImpl at = ( ( AttributeTypeWrapper ) selectedItem ).getAttributeType();
+                        AttributeType at = ( ( AttributeTypeWrapper ) selectedItem ).getAttributeType();
                         schemaObjectsList.add( at );
                     }
                     else if ( selectedItem instanceof ObjectClassWrapper )
                     {
-                        ObjectClassImpl oc = ( ( ObjectClassWrapper ) selectedItem ).getObjectClass();
+                        ObjectClass oc = ( ( ObjectClassWrapper ) selectedItem ).getObjectClass();
                         schemaObjectsList.add( oc );
                     }
                 }
@@ -184,13 +184,13 @@ public class DeleteSchemaElementAction e
                         // If the schema object is not part of deleted schema, we need to delete it.
                         // But, we don't delete schema objects that are part of a deleted schema, since
                         // deleting the schema will also delete this schema object.
-                        if ( schemaObject instanceof AttributeTypeImpl )
+                        if ( schemaObject instanceof AttributeType )
                         {
-                            schemaHandler.removeAttributeType( ( AttributeTypeImpl ) schemaObject );
+                            schemaHandler.removeAttributeType( ( AttributeType ) schemaObject );
                         }
-                        else if ( schemaObject instanceof ObjectClassImpl )
+                        else if ( schemaObject instanceof ObjectClass )
                         {
-                            schemaHandler.removeObjectClass( ( ObjectClassImpl ) schemaObject );
+                            schemaHandler.removeObjectClass( ( ObjectClass ) schemaObject );
                         }
                     }
                 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java Wed Jan 26 19:25:22 2011
@@ -20,11 +20,11 @@
 package org.apache.directory.studio.schemaeditor.controller.actions;
 
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.view.editors.attributetype.AttributeTypeEditor;
 import org.apache.directory.studio.schemaeditor.view.editors.objectclass.ObjectClassEditor;
 import org.apache.directory.studio.schemaeditor.view.views.HierarchyView;
@@ -199,11 +199,11 @@ public class LinkWithEditorHierarchyView
      */
     private void linkViewWithEditor( SchemaObject schemaElement )
     {
-        if ( schemaElement instanceof AttributeTypeImpl )
+        if ( schemaElement instanceof AttributeType )
         {
             view.setInput( schemaElement );
         }
-        else if ( schemaElement instanceof ObjectClassImpl )
+        else if ( schemaElement instanceof ObjectClass )
         {
             view.setInput( schemaElement );
         }

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=1063841&r1=1063840&r2=1063841&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 Wed Jan 26 19:25:22 2011
@@ -27,6 +27,10 @@ import java.util.List;
 
 import org.apache.commons.collections.MultiMap;
 import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
 import org.eclipse.osgi.util.NLS;
@@ -84,19 +88,19 @@ public class DependenciesComputer
             // Computing dependencies
             for ( Schema schema : this.schemasList )
             {
-                List<AttributeTypeImpl> attributeTypes = schema.getAttributeTypes();
+                List<AttributeType> attributeTypes = schema.getAttributeTypes();
                 if ( attributeTypes != null )
                 {
-                    for ( AttributeTypeImpl attributeType : attributeTypes )
+                    for ( AttributeType attributeType : attributeTypes )
                     {
                         computeDependencies( schema, attributeType );
                     }
                 }
 
-                List<ObjectClassImpl> objectClasses = schema.getObjectClasses();
+                List<ObjectClass> objectClasses = schema.getObjectClasses();
                 if ( objectClasses != null )
                 {
-                    for ( ObjectClassImpl objectClass : objectClasses )
+                    for ( ObjectClass objectClass : objectClasses )
                     {
                         computeDependencies( schema, objectClass );
                     }
@@ -118,14 +122,14 @@ public class DependenciesComputer
      *      the attribute type
      * @throws DependencyComputerException 
      */
-    private void computeDependencies( Schema schema, AttributeTypeImpl attributeType )
+    private void computeDependencies( Schema schema, AttributeType attributeType )
         throws DependencyComputerException
     {
         // Superior
         String superior = attributeType.getSuperiorOid();
         if ( superior != null )
         {
-            AttributeTypeImpl superiorAT = schemaHandler.getAttributeType( superior );
+            AttributeType superiorAT = schemaHandler.getAttributeType( superior );
             if ( superiorAT == null )
             {
                 throw new DependencyComputerException( NLS.bind( Messages
@@ -145,7 +149,7 @@ public class DependenciesComputer
         String syntaxOID = attributeType.getSyntaxOid();
         if ( syntaxOID != null )
         {
-            SyntaxImpl syntax = schemaHandler.getSyntax( syntaxOID );
+            LdapSyntax syntax = schemaHandler.getSyntax( syntaxOID );
             if ( syntax == null )
             {
                 throw new DependencyComputerException( NLS.bind(
@@ -165,7 +169,7 @@ public class DependenciesComputer
         String equalityName = attributeType.getEqualityOid();
         if ( equalityName != null )
         {
-            MatchingRuleImpl equalityMatchingRule = schemaHandler.getMatchingRule( equalityName );
+            MatchingRule equalityMatchingRule = schemaHandler.getMatchingRule( equalityName );
             if ( equalityMatchingRule == null )
             {
                 throw new DependencyComputerException( NLS.bind(
@@ -185,7 +189,7 @@ public class DependenciesComputer
         String orderingName = attributeType.getOrderingOid();
         if ( orderingName != null )
         {
-            MatchingRuleImpl orderingMatchingRule = schemaHandler.getMatchingRule( orderingName );
+            MatchingRule orderingMatchingRule = schemaHandler.getMatchingRule( orderingName );
             if ( orderingMatchingRule == null )
             {
                 throw new DependencyComputerException( NLS.bind(
@@ -205,7 +209,7 @@ public class DependenciesComputer
         String substringName = attributeType.getSubstringOid();
         if ( substringName != null )
         {
-            MatchingRuleImpl substringMatchingRule = schemaHandler.getMatchingRule( substringName );
+            MatchingRule substringMatchingRule = schemaHandler.getMatchingRule( substringName );
             if ( substringMatchingRule == null )
             {
                 throw new DependencyComputerException( NLS.bind(
@@ -232,7 +236,7 @@ public class DependenciesComputer
      *      the object class
      * @throws DependencyComputerException 
      */
-    private void computeDependencies( Schema schema, ObjectClassImpl objectClass ) throws DependencyComputerException
+    private void computeDependencies( Schema schema, ObjectClass objectClass ) throws DependencyComputerException
     {
         // Super Classes
         List<String> superClassesNames = objectClass.getSuperiorOids();
@@ -240,7 +244,7 @@ public class DependenciesComputer
         {
             for ( String superClassName : superClassesNames )
             {
-                ObjectClassImpl superObjectClass = schemaHandler.getObjectClass( superClassName );
+                ObjectClass superObjectClass = schemaHandler.getObjectClass( superClassName );
                 if ( superObjectClass == null )
                 {
                     throw new DependencyComputerException( NLS.bind( Messages
@@ -263,7 +267,7 @@ public class DependenciesComputer
         {
             for ( String optionalAttributeTypeName : optionalAttributeTypes )
             {
-                AttributeTypeImpl optionalAttributeType = schemaHandler.getAttributeType( optionalAttributeTypeName );
+                AttributeType optionalAttributeType = schemaHandler.getAttributeType( optionalAttributeTypeName );
                 if ( optionalAttributeType == null )
                 {
                     throw new DependencyComputerException( NLS.bind( Messages
@@ -286,7 +290,7 @@ public class DependenciesComputer
         {
             for ( String mandatoryAttributeTypeName : mandatoryAttributeTypes )
             {
-                AttributeTypeImpl mandatoryAttributeType = schemaHandler.getAttributeType( mandatoryAttributeTypeName );
+                AttributeType mandatoryAttributeType = schemaHandler.getAttributeType( mandatoryAttributeTypeName );
                 if ( mandatoryAttributeType == null )
                 {
                     throw new DependencyComputerException( NLS.bind( Messages

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=1063841&r1=1063840&r2=1063841&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 Wed Jan 26 19:25:22 2011
@@ -22,6 +22,11 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+
 
 /**
  * This interface represents a Schema.
@@ -72,7 +77,7 @@ public interface Schema
      * @return
      * 		all the ObjectClassImpl objects contained in the Schema
      */
-    public List<ObjectClassImpl> getObjectClasses();
+    public List<ObjectClass> getObjectClasses();
 
 
     /**
@@ -81,7 +86,7 @@ public interface Schema
      * @return
      * 		all the AttributeTypeImpl objects contained in the Schema
      */
-    public List<AttributeTypeImpl> getAttributeTypes();
+    public List<AttributeType> getAttributeTypes();
 
 
     /**
@@ -90,7 +95,7 @@ public interface Schema
      * @return
      *      all the MatchingRuleImpl objects contained in the Schema
      */
-    public List<MatchingRuleImpl> getMatchingRules();
+    public List<MatchingRule> getMatchingRules();
 
 
     /**
@@ -99,7 +104,7 @@ public interface Schema
      * @return
      *      all the SyntaxImpl objects contained in the Schema
      */
-    public List<SyntaxImpl> getSyntaxes();
+    public List<LdapSyntax> getSyntaxes();
 
 
     /**
@@ -111,7 +116,7 @@ public interface Schema
      * 		the ObjectClassImpl identified by the given id, or null if the 
      * ObjectClassImpl has not been found
      */
-    public ObjectClassImpl getObjectClass( String id );
+    public ObjectClass getObjectClass( String id );
 
 
     /**
@@ -123,7 +128,7 @@ public interface Schema
      * 		the AttributeTypeImpl identified by the given id, or null if the 
      * AttributeTypeImpl has not been found
      */
-    public AttributeTypeImpl getAttributeType( String id );
+    public AttributeType getAttributeType( String id );
 
 
     /**
@@ -135,7 +140,7 @@ public interface Schema
      *      the MatchingRuleImpl identified by the given id, or null if the 
      * MatchingRuleImpl has not been found
      */
-    public MatchingRuleImpl getMatchingRule( String id );
+    public MatchingRule getMatchingRule( String id );
 
 
     /**
@@ -147,7 +152,7 @@ public interface Schema
      *      the SyntaxImpl identified by the given id, or null if the 
      * SyntaxImpl has not been found
      */
-    public SyntaxImpl getSyntax( String id );
+    public LdapSyntax getSyntax( String id );
 
 
     /**
@@ -156,7 +161,7 @@ public interface Schema
      * @param oc
      *      the ObjectClassImpl
      */
-    public boolean addObjectClass( ObjectClassImpl oc );
+    public boolean addObjectClass( ObjectClass oc );
 
 
     /**
@@ -165,7 +170,7 @@ public interface Schema
      * @param at
      *      the AttributeTypeImpl
      */
-    public boolean addAttributeType( AttributeTypeImpl at );
+    public boolean addAttributeType( AttributeType at );
 
 
     /**
@@ -174,7 +179,7 @@ public interface Schema
      * @param mr
      *      the MatchingRuleImpl
      */
-    public boolean addMatchingRule( MatchingRuleImpl mr );
+    public boolean addMatchingRule( MatchingRule mr );
 
 
     /**
@@ -183,7 +188,7 @@ public interface Schema
      * @param syntax
      *      the SyntaxImpl
      */
-    public boolean addSyntax( SyntaxImpl syntax );
+    public boolean addSyntax( LdapSyntax syntax );
 
 
     /**
@@ -192,7 +197,7 @@ public interface Schema
      * @param oc
      *      the ObjectClassImpl
      */
-    public boolean removeObjectClass( ObjectClassImpl oc );
+    public boolean removeObjectClass( ObjectClass oc );
 
 
     /**
@@ -201,7 +206,7 @@ public interface Schema
      * @param at
      *      the AttributeTypeImpl
      */
-    public boolean removeAttributeType( AttributeTypeImpl at );
+    public boolean removeAttributeType( AttributeType at );
 
 
     /**
@@ -210,7 +215,7 @@ public interface Schema
      * @param mr
      *      the MatchingRuleImpl
      */
-    public boolean removeMatchingRule( MatchingRuleImpl mr );
+    public boolean removeMatchingRule( MatchingRule mr );
 
 
     /**
@@ -219,5 +224,5 @@ public interface Schema
      * @param syntax
      *      the SyntaxImpl
      */
-    public boolean removeSyntax( SyntaxImpl syntax );
+    public boolean removeSyntax( LdapSyntax syntax );
 }



Mime
View raw message