directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1063841 [4/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
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -23,9 +23,9 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
 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.view.ViewUtils;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -46,7 +46,7 @@ public class ObjectClassEditorAttributes
      */
     public Image getColumnImage( Object element, int columnIndex )
     {
-        if ( ( element instanceof AttributeTypeImpl ) || ( element instanceof NonExistingAttributeType ) )
+        if ( ( element instanceof AttributeType ) || ( element instanceof NonExistingAttributeType ) )
         {
             return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
         }
@@ -61,9 +61,9 @@ public class ObjectClassEditorAttributes
      */
     public String getColumnText( Object element, int columnIndex )
     {
-        if ( element instanceof AttributeTypeImpl )
+        if ( element instanceof AttributeType )
         {
-            AttributeTypeImpl at = ( AttributeTypeImpl ) element;
+            AttributeType at = ( AttributeType ) element;
 
             List<String> names = at.getNames();
             if ( ( names != null ) && ( names.size() > 0 ) )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java Wed Jan 26 19:25:22 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IEditorInput;
@@ -35,7 +35,7 @@ import org.eclipse.ui.IPersistableElemen
  */
 public class ObjectClassEditorInput implements IEditorInput
 {
-    private ObjectClassImpl objectClass;
+    private ObjectClass objectClass;
 
 
     /**
@@ -44,7 +44,7 @@ public class ObjectClassEditorInput impl
      * @param obj
      *      the object class
      */
-    public ObjectClassEditorInput( ObjectClassImpl obj )
+    public ObjectClassEditorInput( ObjectClass obj )
     {
         super();
         objectClass = obj;
@@ -134,7 +134,7 @@ public class ObjectClassEditorInput impl
      * @return
      *      the input object class
      */
-    public ObjectClassImpl getObjectClass()
+    public ObjectClass getObjectClass()
     {
         return this.objectClass;
     }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Wed Jan 26 19:25:22 2011
@@ -25,16 +25,16 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.shared.asn1.util.OID;
+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.ObjectClassTypeEnum;
 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.controller.SchemaHandlerListener;
-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;
 import org.apache.directory.studio.schemaeditor.model.alias.Alias;
 import org.apache.directory.studio.schemaeditor.model.alias.AliasWithError;
 import org.apache.directory.studio.schemaeditor.model.alias.AliasesStringParser;
@@ -96,10 +96,10 @@ public class ObjectClassEditorOverviewPa
     public static final String ID = ObjectClassEditor.ID + "overviewPage"; //$NON-NLS-1$
 
     /** The original object class */
-    private ObjectClassImpl originalObjectClass;
+    private ObjectClass originalObjectClass;
 
     /** The modified object class */
-    private ObjectClassImpl modifiedObjectClass;
+    private ObjectClass modifiedObjectClass;
 
     /** The original schema */
     private Schema originalSchema;
@@ -113,7 +113,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -122,7 +122,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -131,7 +131,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -140,7 +140,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -149,7 +149,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -158,7 +158,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -167,7 +167,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -176,7 +176,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -185,7 +185,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             if ( !oc.equals( originalObjectClass ) )
             {
@@ -218,7 +218,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -227,7 +227,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -236,7 +236,7 @@ public class ObjectClassEditorOverviewPa
         /* (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 )
         {
             refreshUI();
         }
@@ -324,7 +324,7 @@ public class ObjectClassEditorOverviewPa
 
             String oid = oidText.getText();
 
-            if ( OID.isOID(oid) )
+            if ( OID.isOID( oid ) )
             {
                 if ( ( originalObjectClass.getOid().equals( oid ) )
                     || !( schemaHandler.isAliasOrOidAlreadyTaken( oid ) ) )
@@ -436,12 +436,12 @@ public class ObjectClassEditorOverviewPa
             Object selectedElement = selection.getFirstElement();
             if ( selectedElement != null )
             {
-                if ( selectedElement instanceof AttributeTypeImpl )
+                if ( selectedElement instanceof AttributeType )
                 {
                     IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
                     try
                     {
-                        page.openEditor( new AttributeTypeEditorInput( ( AttributeTypeImpl ) selectedElement ),
+                        page.openEditor( new AttributeTypeEditorInput( ( AttributeType ) selectedElement ),
                             AttributeTypeEditor.ID );
                     }
                     catch ( PartInitException exception )
@@ -470,27 +470,27 @@ public class ObjectClassEditorOverviewPa
         public void widgetSelected( SelectionEvent e )
         {
             AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
-            List<AttributeTypeImpl> hiddenATs = new ArrayList<AttributeTypeImpl>();
+            List<AttributeType> hiddenATs = new ArrayList<AttributeType>();
             List<String> mustsHidden = modifiedObjectClass.getMustAttributeTypeOids();
             if ( mustsHidden != null )
             {
                 for ( String must : mustsHidden )
                 {
-                    AttributeTypeImpl at = schemaHandler.getAttributeType( must );
+                    AttributeType at = schemaHandler.getAttributeType( must );
                     if ( at != null )
                     {
                         hiddenATs.add( at );
                     }
                 }
             }
-            dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeTypeImpl[0] ) );
+            dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeType[0] ) );
 
             if ( dialog.open() != Window.OK )
             {
                 return;
             }
 
-            AttributeTypeImpl at = dialog.getSelectedAttributeType();
+            AttributeType at = dialog.getSelectedAttributeType();
             if ( at == null )
             {
                 return;
@@ -542,9 +542,9 @@ public class ObjectClassEditorOverviewPa
                     newMusts.add( must );
                 }
 
-                if ( selectedElement instanceof AttributeTypeImpl )
+                if ( selectedElement instanceof AttributeType )
                 {
-                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNames() )
+                    for ( String name : ( ( AttributeType ) selectedElement ).getNames() )
                     {
                         newMusts.remove( name );
                     }
@@ -578,12 +578,12 @@ public class ObjectClassEditorOverviewPa
             Object selectedElement = selection.getFirstElement();
             if ( selectedElement != null )
             {
-                if ( selectedElement instanceof AttributeTypeImpl )
+                if ( selectedElement instanceof AttributeType )
                 {
                     IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
                     try
                     {
-                        page.openEditor( new AttributeTypeEditorInput( ( AttributeTypeImpl ) selectedElement ),
+                        page.openEditor( new AttributeTypeEditorInput( ( AttributeType ) selectedElement ),
                             AttributeTypeEditor.ID );
                     }
                     catch ( PartInitException exception )
@@ -607,27 +607,27 @@ public class ObjectClassEditorOverviewPa
         public void widgetSelected( SelectionEvent e )
         {
             AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
-            List<AttributeTypeImpl> hiddenATs = new ArrayList<AttributeTypeImpl>();
+            List<AttributeType> hiddenATs = new ArrayList<AttributeType>();
             List<String> maysHidden = modifiedObjectClass.getMayAttributeTypeOids();
             if ( maysHidden != null )
             {
                 for ( String may : maysHidden )
                 {
-                    AttributeTypeImpl at = schemaHandler.getAttributeType( may );
+                    AttributeType at = schemaHandler.getAttributeType( may );
                     if ( at != null )
                     {
                         hiddenATs.add( at );
                     }
                 }
             }
-            dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeTypeImpl[0] ) );
+            dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeType[0] ) );
 
             if ( dialog.open() != Window.OK )
             {
                 return;
             }
 
-            AttributeTypeImpl at = dialog.getSelectedAttributeType();
+            AttributeType at = dialog.getSelectedAttributeType();
             if ( at == null )
             {
                 return;
@@ -679,9 +679,9 @@ public class ObjectClassEditorOverviewPa
                     newMays.add( may );
                 }
 
-                if ( selectedElement instanceof AttributeTypeImpl )
+                if ( selectedElement instanceof AttributeType )
                 {
-                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNames() )
+                    for ( String name : ( ( AttributeType ) selectedElement ).getNames() )
                     {
                         newMays.remove( name );
                     }
@@ -715,12 +715,12 @@ public class ObjectClassEditorOverviewPa
             Object selectedElement = selection.getFirstElement();
             if ( selectedElement != null )
             {
-                if ( selectedElement instanceof ObjectClassImpl )
+                if ( selectedElement instanceof ObjectClass )
                 {
                     IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
                     try
                     {
-                        page.openEditor( new ObjectClassEditorInput( ( ObjectClassImpl ) selectedElement ),
+                        page.openEditor( new ObjectClassEditorInput( ( ObjectClass ) selectedElement ),
                             ObjectClassEditor.ID );
                     }
                     catch ( PartInitException exception )
@@ -744,24 +744,24 @@ public class ObjectClassEditorOverviewPa
         public void widgetSelected( SelectionEvent e )
         {
             ObjectClassSelectionDialog dialog = new ObjectClassSelectionDialog();
-            List<ObjectClassImpl> hiddenOCs = new ArrayList<ObjectClassImpl>();
+            List<ObjectClass> hiddenOCs = new ArrayList<ObjectClass>();
             for ( String sup : modifiedObjectClass.getSuperiorOids() )
             {
-                ObjectClassImpl oc = schemaHandler.getObjectClass( sup );
+                ObjectClass oc = schemaHandler.getObjectClass( sup );
                 if ( oc != null )
                 {
                     hiddenOCs.add( oc );
                 }
             }
             hiddenOCs.add( originalObjectClass );
-            dialog.setHiddenObjectClasses( hiddenOCs.toArray( new ObjectClassImpl[0] ) );
+            dialog.setHiddenObjectClasses( hiddenOCs.toArray( new ObjectClass[0] ) );
 
             if ( dialog.open() != Window.OK )
             {
                 return;
             }
 
-            ObjectClassImpl oc = dialog.getSelectedObjectClass();
+            ObjectClass oc = dialog.getSelectedObjectClass();
             if ( oc == null )
             {
                 return;
@@ -810,9 +810,9 @@ public class ObjectClassEditorOverviewPa
                     superiors.add( sup );
                 }
 
-                if ( selectedElement instanceof ObjectClassImpl )
+                if ( selectedElement instanceof ObjectClass )
                 {
-                    for ( String name : ( ( ObjectClassImpl ) selectedElement ).getNames() )
+                    for ( String name : ( ( ObjectClass ) selectedElement ).getNames() )
                     {
                         superiors.remove( name );
                     }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java Wed Jan 26 19:25:22 2011
@@ -28,7 +28,6 @@ import java.util.List;
 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.PluginConstants;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
 import org.apache.directory.studio.schemaeditor.view.widget.SchemaSourceViewer;
 import org.eclipse.jface.resource.JFaceResources;
@@ -60,7 +59,7 @@ public class ObjectClassEditorSourceCode
     public static final String TITLE = "Source Code"; //$NON-NLS-1$
 
     /** The modified object class */
-    private ObjectClassImpl modifiedObjectClass;
+    private ObjectClass modifiedObjectClass;
 
     /** The Schema Source Viewer */
     private SchemaSourceViewer schemaSourceViewer;

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java Wed Jan 26 19:25:22 2011
@@ -25,9 +25,9 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingObjectClass;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -69,7 +69,7 @@ public class ObjectClassEditorSuperiorsT
             List<String> superiors = ( List<String> ) inputElement;
             for ( String superior : superiors )
             {
-                ObjectClassImpl oc = schemaHandler.getObjectClass( superior );
+                ObjectClass oc = schemaHandler.getObjectClass( superior );
                 if ( oc != null )
                 {
                     results.add( oc );
@@ -85,10 +85,10 @@ public class ObjectClassEditorSuperiorsT
             {
                 public int compare( Object o1, Object o2 )
                 {
-                    if ( o1 instanceof ObjectClassImpl && o2 instanceof ObjectClassImpl )
+                    if ( o1 instanceof ObjectClass && o2 instanceof ObjectClass )
                     {
-                        List<String> oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
-                        List<String> oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+                        List<String> oc1Names = ( ( ObjectClass ) o1 ).getNames();
+                        List<String> oc2Names = ( ( ObjectClass ) o2 ).getNames();
 
                         if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.size() > 0 )
                             && ( oc2Names.size() > 0 ) )
@@ -96,9 +96,9 @@ public class ObjectClassEditorSuperiorsT
                             return oc1Names.get( 0 ).compareToIgnoreCase( oc2Names.get( 0 ) );
                         }
                     }
-                    else if ( o1 instanceof ObjectClassImpl && o2 instanceof NonExistingObjectClass )
+                    else if ( o1 instanceof ObjectClass && o2 instanceof NonExistingObjectClass )
                     {
-                        List<String> oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
+                        List<String> oc1Names = ( ( ObjectClass ) o1 ).getNames();
                         String oc2Name = ( ( NonExistingObjectClass ) o2 ).getName();
 
                         if ( ( oc1Names != null ) && ( oc2Name != null ) && ( oc1Names.size() > 0 ) )
@@ -106,10 +106,10 @@ public class ObjectClassEditorSuperiorsT
                             return oc1Names.get( 0 ).compareToIgnoreCase( oc2Name );
                         }
                     }
-                    else if ( o1 instanceof NonExistingObjectClass && o2 instanceof ObjectClassImpl )
+                    else if ( o1 instanceof NonExistingObjectClass && o2 instanceof ObjectClass )
                     {
                         String oc1Name = ( ( NonExistingObjectClass ) o1 ).getName();
-                        List<String> oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+                        List<String> oc2Names = ( ( ObjectClass ) o2 ).getNames();
 
                         if ( ( oc1Name != null ) && ( oc2Names != null ) && ( oc2Names.size() > 0 ) )
                         {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -23,9 +23,9 @@ package org.apache.directory.studio.sche
 
 import java.util.List;
 
+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.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.view.ViewUtils;
 import org.apache.directory.studio.schemaeditor.view.editors.NonExistingObjectClass;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -46,7 +46,7 @@ public class ObjectClassEditorSuperiorsT
      */
     public Image getColumnImage( Object element, int columnIndex )
     {
-        if ( ( element instanceof ObjectClassImpl ) || ( element instanceof NonExistingObjectClass ) )
+        if ( ( element instanceof ObjectClass ) || ( element instanceof NonExistingObjectClass ) )
         {
             return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
         }
@@ -61,9 +61,9 @@ public class ObjectClassEditorSuperiorsT
      */
     public String getColumnText( Object element, int columnIndex )
     {
-        if ( element instanceof ObjectClassImpl )
+        if ( element instanceof ObjectClass )
         {
-            ObjectClassImpl oc = ( ObjectClassImpl ) element;
+            ObjectClass oc = ( ObjectClass ) element;
 
             List<String> names = oc.getNames();
             if ( ( names != null ) && ( names.size() > 0 ) )

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=1063841&r1=1063840&r2=1063841&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 Wed Jan 26 19:25:22 2011
@@ -21,14 +21,14 @@
 package org.apache.directory.studio.schemaeditor.view.editors.schema;
 
 
+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;
 import org.apache.directory.studio.schemaeditor.controller.SchemaAdapter;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
 import org.apache.directory.studio.schemaeditor.controller.SchemaListener;
-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.ViewUtils;
 import org.apache.directory.studio.schemaeditor.view.editors.attributetype.AttributeTypeEditor;
@@ -75,7 +75,7 @@ public class SchemaEditorOverviewPage ex
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeAdded( AttributeTypeImpl at )
+        public void attributeTypeAdded( AttributeType at )
         {
             fillInUiFields();
         }
@@ -84,7 +84,7 @@ public class SchemaEditorOverviewPage ex
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeModified( AttributeTypeImpl at )
+        public void attributeTypeModified( AttributeType at )
         {
             fillInUiFields();
         }
@@ -93,7 +93,7 @@ public class SchemaEditorOverviewPage ex
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeRemoved( AttributeTypeImpl at )
+        public void attributeTypeRemoved( AttributeType at )
         {
             fillInUiFields();
         }
@@ -102,7 +102,7 @@ public class SchemaEditorOverviewPage ex
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#objectClassAdded(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassAdded( ObjectClassImpl oc )
+        public void objectClassAdded( ObjectClass oc )
         {
             fillInUiFields();
         }
@@ -111,7 +111,7 @@ public class SchemaEditorOverviewPage ex
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#objectClassModified(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassModified( ObjectClassImpl oc )
+        public void objectClassModified( ObjectClass oc )
         {
             fillInUiFields();
         }
@@ -120,7 +120,7 @@ public class SchemaEditorOverviewPage ex
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#objectClassRemoved(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassRemoved( ObjectClassImpl oc )
+        public void objectClassRemoved( ObjectClass oc )
         {
             fillInUiFields();
         }
@@ -143,7 +143,7 @@ public class SchemaEditorOverviewPage ex
 
             if ( !selection.isEmpty() )
             {
-                AttributeTypeImpl at = ( AttributeTypeImpl ) selection.getFirstElement();
+                AttributeType at = ( AttributeType ) selection.getFirstElement();
 
                 try
                 {
@@ -172,7 +172,7 @@ public class SchemaEditorOverviewPage ex
 
             if ( !selection.isEmpty() )
             {
-                ObjectClassImpl oc = ( ObjectClassImpl ) selection.getFirstElement();
+                ObjectClass oc = ( ObjectClass ) selection.getFirstElement();
 
                 try
                 {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java Wed Jan 26 19:25:22 2011
@@ -21,14 +21,14 @@
 package org.apache.directory.studio.schemaeditor.view.editors.schema;
 
 
+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.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.controller.SchemaListener;
-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;
 import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
 import org.apache.directory.studio.schemaeditor.view.widget.SchemaSourceViewer;
 import org.eclipse.jface.resource.JFaceResources;
@@ -68,7 +68,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeAdded( AttributeTypeImpl at )
+        public void attributeTypeAdded( AttributeType at )
         {
             fillInUiFields();
         }
@@ -77,7 +77,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeModified( AttributeTypeImpl at )
+        public void attributeTypeModified( AttributeType at )
         {
             fillInUiFields();
         }
@@ -86,7 +86,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
          */
-        public void attributeTypeRemoved( AttributeTypeImpl at )
+        public void attributeTypeRemoved( AttributeType at )
         {
             fillInUiFields();
         }
@@ -95,7 +95,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#matchingRuleAdded(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
          */
-        public void matchingRuleAdded( MatchingRuleImpl mr )
+        public void matchingRuleAdded( MatchingRule mr )
         {
             fillInUiFields();
         }
@@ -104,7 +104,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#matchingRuleModified(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
          */
-        public void matchingRuleModified( MatchingRuleImpl mr )
+        public void matchingRuleModified( MatchingRule mr )
         {
             fillInUiFields();
         }
@@ -113,7 +113,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#matchingRuleRemoved(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
          */
-        public void matchingRuleRemoved( MatchingRuleImpl mr )
+        public void matchingRuleRemoved( MatchingRule mr )
         {
             fillInUiFields();
         }
@@ -122,7 +122,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#objectClassAdded(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassAdded( ObjectClassImpl oc )
+        public void objectClassAdded( ObjectClass oc )
         {
             fillInUiFields();
         }
@@ -131,7 +131,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#objectClassModified(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassModified( ObjectClassImpl oc )
+        public void objectClassModified( ObjectClass oc )
         {
             fillInUiFields();
         }
@@ -140,7 +140,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#objectClassRemoved(org.apache.directory.studio.schemaeditor.model.ObjectClassImpl)
          */
-        public void objectClassRemoved( ObjectClassImpl oc )
+        public void objectClassRemoved( ObjectClass oc )
         {
             fillInUiFields();
         }
@@ -149,7 +149,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#syntaxAdded(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
          */
-        public void syntaxAdded( SyntaxImpl syntax )
+        public void syntaxAdded( LdapSyntax syntax )
         {
             fillInUiFields();
         }
@@ -158,7 +158,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#syntaxModified(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
          */
-        public void syntaxModified( SyntaxImpl syntax )
+        public void syntaxModified( LdapSyntax syntax )
         {
             fillInUiFields();
         }
@@ -167,7 +167,7 @@ public class SchemaEditorSourceCodePage 
         /* (non-Javadoc)
          * @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#syntaxRemoved(org.apache.directory.studio.schemaeditor.model.SyntaxImpl)
          */
-        public void syntaxRemoved( SyntaxImpl syntax )
+        public void syntaxRemoved( LdapSyntax syntax )
         {
             fillInUiFields();
         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java Wed Jan 26 19:25:22 2011
@@ -25,8 +25,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-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.ObjectClass;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
@@ -58,10 +58,10 @@ public class SchemaEditorTableViewerCont
             {
                 public int compare( Object o1, Object o2 )
                 {
-                    if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
+                    if ( o1 instanceof AttributeType && o2 instanceof AttributeType )
                     {
-                        List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
-                        List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+                        List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
+                        List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
 
                         if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 )
                             && ( at2Names.size() > 0 ) )
@@ -69,10 +69,10 @@ public class SchemaEditorTableViewerCont
                             return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
                         }
                     }
-                    else if ( o1 instanceof ObjectClassImpl && o2 instanceof ObjectClassImpl )
+                    else if ( o1 instanceof ObjectClass && o2 instanceof ObjectClass )
                     {
-                        List<String> oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
-                        List<String> oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+                        List<String> oc1Names = ( ( ObjectClass ) o1 ).getNames();
+                        List<String> oc2Names = ( ( ObjectClass ) o2 ).getNames();
 
                         if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.size() > 0 )
                             && ( oc2Names.size() > 0 ) )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -23,10 +23,10 @@ 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.ObjectClass;
 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.ViewUtils;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -46,11 +46,11 @@ public class SchemaEditorTableViewerLabe
      */
     public Image getColumnImage( Object element, int columnIndex )
     {
-        if ( element instanceof ObjectClassImpl )
+        if ( element instanceof ObjectClass )
         {
             return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
         }
-        else if ( element instanceof AttributeTypeImpl )
+        else if ( element instanceof AttributeType )
         {
             return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
         }
@@ -65,9 +65,9 @@ public class SchemaEditorTableViewerLabe
      */
     public String getColumnText( Object element, int columnIndex )
     {
-        if ( element instanceof ObjectClassImpl )
+        if ( element instanceof ObjectClass )
         {
-            ObjectClassImpl oc = ( ObjectClassImpl ) element;
+            ObjectClass oc = ( ObjectClass ) element;
 
             List<String> names = oc.getNames();
             if ( ( names != null ) && ( names.size() > 0 ) )
@@ -80,9 +80,9 @@ public class SchemaEditorTableViewerLabe
                     Messages.getString( "SchemaEditorTableViewerLabelProvider.None" ), new String[] { oc.getOid() } ); //$NON-NLS-1$
             }
         }
-        else if ( element instanceof AttributeTypeImpl )
+        else if ( element instanceof AttributeType )
         {
-            AttributeTypeImpl at = ( AttributeTypeImpl ) element;
+            AttributeType at = ( AttributeType ) element;
 
             List<String> names = at.getNames();
             if ( ( names != null ) && ( names.size() > 0 ) )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java Wed Jan 26 19:25:22 2011
@@ -22,12 +22,12 @@ 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.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.HierarchyViewController;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.view.ViewUtils;
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -153,13 +153,13 @@ public class HierarchyView extends ViewP
         }
         else
         {
-            if ( input instanceof AttributeTypeImpl )
+            if ( input instanceof AttributeType )
             {
-                setOverviewLabel( ( AttributeTypeImpl ) input );
+                setOverviewLabel( ( AttributeType ) input );
             }
-            else if ( input instanceof ObjectClassImpl )
+            else if ( input instanceof ObjectClass )
             {
-                setOverviewLabel( ( ObjectClassImpl ) input );
+                setOverviewLabel( ( ObjectClass ) input );
             }
             else
             {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java Wed Jan 26 19:25:22 2011
@@ -24,10 +24,10 @@ 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.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.hierarchy.HierarchyManager;
 import org.apache.directory.studio.schemaeditor.view.wrappers.AttributeTypeWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.ObjectClassWrapper;
@@ -60,15 +60,15 @@ public class HierarchyViewContentProvide
     {
         List<TreeNode> children = new ArrayList<TreeNode>();
 
-        if ( parentElement instanceof ObjectClassImpl )
+        if ( parentElement instanceof ObjectClass )
         {
-            ObjectClassImpl oc = ( ObjectClassImpl ) parentElement;
+            ObjectClass oc = ( ObjectClass ) parentElement;
 
             children = createTypeHierarchyObjectClass( oc );
         }
-        else if ( parentElement instanceof AttributeTypeImpl )
+        else if ( parentElement instanceof AttributeType )
         {
-            AttributeTypeImpl at = ( AttributeTypeImpl ) parentElement;
+            AttributeType at = ( AttributeType ) parentElement;
 
             children = createTypeHierarchyAttributeType( at );
         }
@@ -89,7 +89,7 @@ public class HierarchyViewContentProvide
      * @return
      *      the Type Hierarchy for an object class
      */
-    private List<TreeNode> createTypeHierarchyObjectClass( ObjectClassImpl oc )
+    private List<TreeNode> createTypeHierarchyObjectClass( ObjectClass oc )
     {
         List<TreeNode> children = new ArrayList<TreeNode>();
 
@@ -143,9 +143,9 @@ public class HierarchyViewContentProvide
         {
             for ( Object parent : parents )
             {
-                if ( parent instanceof ObjectClassImpl )
+                if ( parent instanceof ObjectClass )
                 {
-                    ObjectClassImpl parentOC = ( ObjectClassImpl ) parent;
+                    ObjectClass parentOC = ( ObjectClass ) parent;
                     ObjectClassWrapper duplicatedOCW = ( ObjectClassWrapper ) duplicateTreeNode( ocw );
 
                     ObjectClassWrapper ocw2 = new ObjectClassWrapper( parentOC );
@@ -211,7 +211,7 @@ public class HierarchyViewContentProvide
      * @return
      *      the Type Hierarchy for an attribute type
      */
-    private List<TreeNode> createTypeHierarchyAttributeType( AttributeTypeImpl at )
+    private List<TreeNode> createTypeHierarchyAttributeType( AttributeType at )
     {
         List<TreeNode> children = new ArrayList<TreeNode>();
         HierarchyManager hierarchyManager = new HierarchyManager();
@@ -230,9 +230,9 @@ public class HierarchyViewContentProvide
             while ( ( parents != null ) && ( parents.size() == 1 ) )
             {
                 Object parent = parents.get( 0 );
-                if ( parent instanceof AttributeTypeImpl )
+                if ( parent instanceof AttributeType )
                 {
-                    AttributeTypeImpl parentAT = ( AttributeTypeImpl ) parent;
+                    AttributeType parentAT = ( AttributeType ) parent;
 
                     AttributeTypeWrapper atw2 = new AttributeTypeWrapper( parentAT );
                     atw.setParent( atw2 );
@@ -257,9 +257,9 @@ public class HierarchyViewContentProvide
             while ( ( parents != null ) && ( parents.size() == 1 ) )
             {
                 Object parent = parents.get( 0 );
-                if ( parent instanceof AttributeTypeImpl )
+                if ( parent instanceof AttributeType )
                 {
-                    AttributeTypeImpl parentAT = ( AttributeTypeImpl ) parent;
+                    AttributeType parentAT = ( AttributeType ) parent;
 
                     AttributeTypeWrapper atw2 = new AttributeTypeWrapper( parentAT );
                     atw.setParent( atw2 );
@@ -304,15 +304,15 @@ public class HierarchyViewContentProvide
             for ( Object child : children )
             {
                 TreeNode childNode = null;
-                if ( child instanceof AttributeTypeImpl )
+                if ( child instanceof AttributeType )
                 {
-                    AttributeTypeImpl at = ( AttributeTypeImpl ) child;
+                    AttributeType at = ( AttributeType ) child;
                     childNode = new AttributeTypeWrapper( at, node );
                     node.addChild( childNode );
                 }
-                else if ( child instanceof ObjectClassImpl )
+                else if ( child instanceof ObjectClass )
                 {
-                    ObjectClassImpl oc = ( ObjectClassImpl ) child;
+                    ObjectClass oc = ( ObjectClass ) child;
                     childNode = new ObjectClassWrapper( oc, node );
                     node.addChild( childNode );
                 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -23,10 +23,10 @@ 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.ObjectClass;
 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.ViewUtils;
 import org.apache.directory.studio.schemaeditor.view.wrappers.AttributeTypeWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.ObjectClassWrapper;
@@ -81,7 +81,7 @@ public class HierarchyViewLabelProvider 
 
         if ( obj instanceof AttributeTypeWrapper )
         {
-            AttributeTypeImpl at = ( ( AttributeTypeWrapper ) obj ).getAttributeType();
+            AttributeType at = ( ( AttributeTypeWrapper ) obj ).getAttributeType();
 
             // Label
             if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
@@ -134,7 +134,7 @@ public class HierarchyViewLabelProvider 
         }
         else if ( obj instanceof ObjectClassWrapper )
         {
-            ObjectClassImpl oc = ( ( ObjectClassWrapper ) obj ).getObjectClass();
+            ObjectClass oc = ( ( ObjectClassWrapper ) obj ).getObjectClass();
 
             // Label
             if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
@@ -192,7 +192,7 @@ public class HierarchyViewLabelProvider 
             String secondaryLabel = ""; //$NON-NLS-1$
             if ( obj instanceof AttributeTypeWrapper )
             {
-                AttributeTypeImpl at = ( ( AttributeTypeWrapper ) obj ).getAttributeType();
+                AttributeType at = ( ( AttributeTypeWrapper ) obj ).getAttributeType();
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
                 {
@@ -225,7 +225,7 @@ public class HierarchyViewLabelProvider 
             }
             else if ( obj instanceof ObjectClassWrapper )
             {
-                ObjectClassImpl oc = ( ( ObjectClassWrapper ) obj ).getObjectClass();
+                ObjectClass oc = ( ( ObjectClassWrapper ) obj ).getObjectClass();
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
                 {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java Wed Jan 26 19:25:22 2011
@@ -27,8 +27,8 @@ import org.apache.directory.studio.schem
 import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaChecker;
 import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaError;
 import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaWarning;
-import org.apache.directory.studio.schemaeditor.view.wrappers.Folder.FolderType;
 import org.apache.directory.studio.schemaeditor.view.wrappers.Folder;
+import org.apache.directory.studio.schemaeditor.view.wrappers.Folder.FolderType;
 import org.apache.directory.studio.schemaeditor.view.wrappers.ProblemsViewRoot;
 import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaErrorWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaWarningWrapper;

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -20,12 +20,12 @@
 package org.apache.directory.studio.schemaeditor.view.views;
 
 
+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.ObjectClassTypeEnum;
 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.model.schemachecker.ClassTypeHierarchyError;
 import org.apache.directory.studio.schemaeditor.model.schemachecker.DifferentCollectiveAsSuperiorError;
 import org.apache.directory.studio.schemaeditor.model.schemachecker.DifferentUsageAsSuperiorError;
@@ -146,13 +146,13 @@ public class ProblemsViewLabelProvider e
             DuplicateAliasError duplicateAliasError = ( DuplicateAliasError ) element;
 
             SchemaObject duplicate = duplicateAliasError.getDuplicate();
-            if ( duplicate instanceof AttributeTypeImpl )
+            if ( duplicate instanceof AttributeType )
             {
                 return NLS
                     .bind(
                         Messages.getString( "ProblemsViewLabelProvider.DuplicateAliasErrorAttributeType" ), new String[] { duplicateAliasError.getAlias(), duplicate.getOid() } ); //$NON-NLS-1$
             }
-            else if ( duplicate instanceof ObjectClassImpl )
+            else if ( duplicate instanceof ObjectClass )
             {
                 return NLS
                     .bind(
@@ -163,13 +163,13 @@ public class ProblemsViewLabelProvider e
         {
             DuplicateOidError duplicateOidError = ( DuplicateOidError ) element;
             SchemaObject duplicate = duplicateOidError.getDuplicate();
-            if ( duplicate instanceof AttributeTypeImpl )
+            if ( duplicate instanceof AttributeType )
             {
                 return NLS
                     .bind(
                         Messages.getString( "ProblemsViewLabelProvider.DuplicateOidErrorAttributeType" ), new String[] { duplicateOidError.getOid(), duplicate.getName() } ); //$NON-NLS-1$
             }
-            else if ( duplicate instanceof ObjectClassImpl )
+            else if ( duplicate instanceof ObjectClass )
             {
                 return NLS
                     .bind(
@@ -222,13 +222,13 @@ public class ProblemsViewLabelProvider e
         {
             NoAliasWarning noAliasWarning = ( NoAliasWarning ) element;
             SchemaObject source = noAliasWarning.getSource();
-            if ( source instanceof AttributeTypeImpl )
+            if ( source instanceof AttributeType )
             {
                 return NLS
                     .bind(
                         Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningAttributeType" ), new String[] { source.getOid() } ); //$NON-NLS-1$
             }
-            else if ( source instanceof ObjectClassImpl )
+            else if ( source instanceof ObjectClass )
             {
                 return NLS
                     .bind(
@@ -238,8 +238,8 @@ public class ProblemsViewLabelProvider e
         else if ( element instanceof ClassTypeHierarchyError )
         {
             ClassTypeHierarchyError classTypeHierarchyError = ( ClassTypeHierarchyError ) element;
-            ObjectClassImpl source = ( ObjectClassImpl ) classTypeHierarchyError.getSource();
-            ObjectClassImpl superior = ( ObjectClassImpl ) classTypeHierarchyError.getSuperior();
+            ObjectClass source = ( ObjectClass ) classTypeHierarchyError.getSource();
+            ObjectClass superior = ( ObjectClass ) classTypeHierarchyError.getSuperior();
             if ( source.getType().equals( ObjectClassTypeEnum.ABSTRACT ) )
             {
                 if ( superior.getType().equals( ObjectClassTypeEnum.STRUCTURAL ) )
@@ -277,8 +277,8 @@ public class ProblemsViewLabelProvider e
         else if ( element instanceof DifferentUsageAsSuperiorError )
         {
             DifferentUsageAsSuperiorError differentUsageAsSuperiorError = ( DifferentUsageAsSuperiorError ) element;
-            AttributeTypeImpl source = ( AttributeTypeImpl ) differentUsageAsSuperiorError.getSource();
-            AttributeTypeImpl superior = ( AttributeTypeImpl ) differentUsageAsSuperiorError.getSuperior();
+            AttributeType source = ( AttributeType ) differentUsageAsSuperiorError.getSource();
+            AttributeType superior = ( AttributeType ) differentUsageAsSuperiorError.getSuperior();
             return NLS
                 .bind(
                     Messages.getString( "ProblemsViewLabelProvider.AttributeTypeUsage" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
@@ -286,8 +286,8 @@ public class ProblemsViewLabelProvider e
         else if ( element instanceof DifferentCollectiveAsSuperiorError )
         {
             DifferentCollectiveAsSuperiorError differentCollectiveAsSuperiorError = ( DifferentCollectiveAsSuperiorError ) element;
-            AttributeTypeImpl source = ( AttributeTypeImpl ) differentCollectiveAsSuperiorError.getSource();
-            AttributeTypeImpl superior = ( AttributeTypeImpl ) differentCollectiveAsSuperiorError.getSuperior();
+            AttributeType source = ( AttributeType ) differentCollectiveAsSuperiorError.getSource();
+            AttributeType superior = ( AttributeType ) differentCollectiveAsSuperiorError.getSuperior();
             return NLS
                 .bind(
                     Messages.getString( "ProblemsViewLabelProvider.AttributeTypeCollective" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewLabelProvider.java Wed Jan 26 19:25:22 2011
@@ -23,8 +23,8 @@ 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.Project;
-import org.apache.directory.studio.schemaeditor.model.ProjectType;
 import org.apache.directory.studio.schemaeditor.model.Project.ProjectState;
+import org.apache.directory.studio.schemaeditor.model.ProjectType;
 import org.apache.directory.studio.schemaeditor.view.wrappers.ProjectWrapper;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java Wed Jan 26 19:25:22 2011
@@ -25,23 +25,23 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 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.model.hierarchy.HierarchyManager;
 import org.apache.directory.studio.schemaeditor.view.wrappers.AttributeTypeWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.FirstNameSorter;
 import org.apache.directory.studio.schemaeditor.view.wrappers.Folder;
+import org.apache.directory.studio.schemaeditor.view.wrappers.Folder.FolderType;
 import org.apache.directory.studio.schemaeditor.view.wrappers.ObjectClassWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.OidSorter;
 import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaSorter;
 import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaViewRoot;
 import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.TreeNode;
-import org.apache.directory.studio.schemaeditor.view.wrappers.Folder.FolderType;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -176,15 +176,15 @@ public class SchemaViewContentProvider i
                                 TreeNode childNode = null;
 
                                 // Creating the wrapper
-                                if ( rootChild instanceof AttributeTypeImpl )
+                                if ( rootChild instanceof AttributeType )
                                 {
-                                    AttributeTypeImpl at = ( AttributeTypeImpl ) rootChild;
+                                    AttributeType at = ( AttributeType ) rootChild;
                                     childNode = new AttributeTypeWrapper( at, atFolder );
                                     atFolder.addChild( childNode );
                                 }
-                                else if ( rootChild instanceof ObjectClassImpl )
+                                else if ( rootChild instanceof ObjectClass )
                                 {
-                                    ObjectClassImpl oc = ( ObjectClassImpl ) rootChild;
+                                    ObjectClass oc = ( ObjectClass ) rootChild;
                                     childNode = new ObjectClassWrapper( oc, ocFolder );
                                     ocFolder.addChild( childNode );
                                 }
@@ -310,15 +310,15 @@ public class SchemaViewContentProvider i
             for ( Object child : children )
             {
                 TreeNode childNode = null;
-                if ( child instanceof AttributeTypeImpl )
+                if ( child instanceof AttributeType )
                 {
-                    AttributeTypeImpl at = ( AttributeTypeImpl ) child;
+                    AttributeType at = ( AttributeType ) child;
                     childNode = new AttributeTypeWrapper( at, node );
                     node.addChild( childNode );
                 }
-                else if ( child instanceof ObjectClassImpl )
+                else if ( child instanceof ObjectClass )
                 {
-                    ObjectClassImpl oc = ( ObjectClassImpl ) child;
+                    ObjectClass oc = ( ObjectClass ) child;
                     childNode = new ObjectClassWrapper( oc, node );
                     node.addChild( childNode );
                 }
@@ -458,7 +458,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAdded( AttributeTypeImpl at )
+    public void attributeTypeAdded( AttributeType at )
     {
         int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
         if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -479,7 +479,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAddedFlatPresentation( AttributeTypeImpl at )
+    public void attributeTypeAddedFlatPresentation( AttributeType at )
     {
         SchemaWrapper schemaWrapper = ( SchemaWrapper ) getWrapper( Activator.getDefault().getSchemaHandler()
             .getSchema( at.getSchemaName() ) );
@@ -516,7 +516,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAddedHierarchicalPresentation( AttributeTypeImpl at )
+    public void attributeTypeAddedHierarchicalPresentation( AttributeType at )
     {
         hierarchyManager.attributeTypeAdded( at );
 
@@ -575,9 +575,9 @@ public class SchemaViewContentProvider i
 
                 for ( TreeNode createdWrapper : createdWrappers )
                 {
-                    AttributeTypeWrapper atw = new AttributeTypeWrapper( ( AttributeTypeImpl ) child, createdWrapper );
+                    AttributeTypeWrapper atw = new AttributeTypeWrapper( ( AttributeType ) child, createdWrapper );
                     atw.getParent().addChild( atw );
-                    elementsToWrappersMap.put( ( AttributeTypeImpl ) child, atw );
+                    elementsToWrappersMap.put( ( AttributeType ) child, atw );
                 }
             }
         }
@@ -590,7 +590,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModified( AttributeTypeImpl at )
+    public void attributeTypeModified( AttributeType at )
     {
         int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
         if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -611,7 +611,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModifiedFlatPresentation( AttributeTypeImpl at )
+    public void attributeTypeModifiedFlatPresentation( AttributeType at )
     {
         // Nothing to do
     }
@@ -624,7 +624,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModifiedHierarchicalPresentation( AttributeTypeImpl at )
+    public void attributeTypeModifiedHierarchicalPresentation( AttributeType at )
     {
         // Propagating the modification to the hierarchy manager
         hierarchyManager.attributeTypeModified( at );
@@ -691,7 +691,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the removed attribute type
      */
-    public void attributeTypeRemoved( AttributeTypeImpl at )
+    public void attributeTypeRemoved( AttributeType at )
     {
         int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
         if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -712,7 +712,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the removed attribute type
      */
-    private void attributeTypeRemovedFlatPresentation( AttributeTypeImpl at )
+    private void attributeTypeRemovedFlatPresentation( AttributeType at )
     {
         AttributeTypeWrapper atw = ( AttributeTypeWrapper ) getWrapper( at );
         if ( atw != null )
@@ -730,7 +730,7 @@ public class SchemaViewContentProvider i
      * @param at
      *      the removed attribute type
      */
-    private void attributeTypeRemovedHierarchicalPresentation( AttributeTypeImpl at )
+    private void attributeTypeRemovedHierarchicalPresentation( AttributeType at )
     {
         // Creating children nodes of the AT 
         // and attaching them to the root
@@ -750,7 +750,7 @@ public class SchemaViewContentProvider i
                             Folder folder = ( Folder ) rootChild;
                             if ( folder.getType().equals( FolderType.ATTRIBUTE_TYPE ) )
                             {
-                                atw = new AttributeTypeWrapper( ( AttributeTypeImpl ) child, folder );
+                                atw = new AttributeTypeWrapper( ( AttributeType ) child, folder );
                                 break;
                             }
                         }
@@ -758,11 +758,11 @@ public class SchemaViewContentProvider i
                 }
                 else if ( group == PluginConstants.PREFS_SCHEMA_VIEW_GROUPING_MIXED )
                 {
-                    atw = new AttributeTypeWrapper( ( AttributeTypeImpl ) child, root );
+                    atw = new AttributeTypeWrapper( ( AttributeType ) child, root );
                 }
 
                 atw.getParent().addChild( atw );
-                elementsToWrappersMap.put( ( AttributeTypeImpl ) child, atw );
+                elementsToWrappersMap.put( ( AttributeType ) child, atw );
             }
         }
 
@@ -820,7 +820,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the added object class
      */
-    public void objectClassAdded( ObjectClassImpl oc )
+    public void objectClassAdded( ObjectClass oc )
     {
         int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
         if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -841,7 +841,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the added object class
      */
-    public void objectClassAddedFlatPresentation( ObjectClassImpl oc )
+    public void objectClassAddedFlatPresentation( ObjectClass oc )
     {
         SchemaWrapper schemaWrapper = ( SchemaWrapper ) getWrapper( Activator.getDefault().getSchemaHandler()
             .getSchema( oc.getSchemaName() ) );
@@ -878,7 +878,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the added object class
      */
-    public void objectClassAddedHierarchicalPresentation( ObjectClassImpl oc )
+    public void objectClassAddedHierarchicalPresentation( ObjectClass oc )
     {
         // Removing unattached nodes for "top"
         List<Object> ocChildren = new ArrayList<Object>();
@@ -997,9 +997,9 @@ public class SchemaViewContentProvider i
 
                 for ( TreeNode createdWrapper : createdWrappers )
                 {
-                    ObjectClassWrapper ocw = new ObjectClassWrapper( ( ObjectClassImpl ) child, createdWrapper );
+                    ObjectClassWrapper ocw = new ObjectClassWrapper( ( ObjectClass ) child, createdWrapper );
                     ocw.getParent().addChild( ocw );
-                    elementsToWrappersMap.put( ( ObjectClassImpl ) child, ocw );
+                    elementsToWrappersMap.put( ( ObjectClass ) child, ocw );
                     addHierarchyChildren( ocw, hierarchyManager.getChildren( child ) );
                 }
             }
@@ -1013,7 +1013,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the modified object class
      */
-    public void objectClassModified( ObjectClassImpl oc )
+    public void objectClassModified( ObjectClass oc )
     {
         int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
         if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -1034,7 +1034,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the modified object class
      */
-    public void objectClassModifiedFlatPresentation( ObjectClassImpl oc )
+    public void objectClassModifiedFlatPresentation( ObjectClass oc )
     {
         // Nothing to do
     }
@@ -1047,7 +1047,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the modified object class
      */
-    public void objectClassModifiedHierarchicalPresentation( ObjectClassImpl oc )
+    public void objectClassModifiedHierarchicalPresentation( ObjectClass oc )
     {
         // Propagating the modification to the hierarchy manager
         hierarchyManager.objectClassModified( oc );
@@ -1114,7 +1114,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the removed object class
      */
-    public void objectClassRemoved( ObjectClassImpl oc )
+    public void objectClassRemoved( ObjectClass oc )
     {
         int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
         if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -1135,7 +1135,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the removed object class
      */
-    public void objectClassRemovedFlatPresentation( ObjectClassImpl oc )
+    public void objectClassRemovedFlatPresentation( ObjectClass oc )
     {
         ObjectClassWrapper ocw = ( ObjectClassWrapper ) getWrapper( oc );
         if ( ocw != null )
@@ -1153,7 +1153,7 @@ public class SchemaViewContentProvider i
      * @param oc
      *      the removed object class
      */
-    public void objectClassRemovedHierarchicalPresentation( ObjectClassImpl oc )
+    public void objectClassRemovedHierarchicalPresentation( ObjectClass oc )
     {
         // Creating children nodes of the OC 
         // and attaching them to the root
@@ -1173,7 +1173,7 @@ public class SchemaViewContentProvider i
                             Folder folder = ( Folder ) rootChild;
                             if ( folder.getType().equals( FolderType.OBJECT_CLASS ) )
                             {
-                                ocw = new ObjectClassWrapper( ( ObjectClassImpl ) child, folder );
+                                ocw = new ObjectClassWrapper( ( ObjectClass ) child, folder );
                                 break;
                             }
                         }
@@ -1181,11 +1181,11 @@ public class SchemaViewContentProvider i
                 }
                 else if ( group == PluginConstants.PREFS_SCHEMA_VIEW_GROUPING_MIXED )
                 {
-                    ocw = new ObjectClassWrapper( ( ObjectClassImpl ) child, root );
+                    ocw = new ObjectClassWrapper( ( ObjectClass ) child, root );
                 }
 
                 ocw.getParent().addChild( ocw );
-                elementsToWrappersMap.put( ( ObjectClassImpl ) child, ocw );
+                elementsToWrappersMap.put( ( ObjectClass ) child, ocw );
                 addHierarchyChildren( ocw, hierarchyManager.getChildren( child ) );
             }
         }
@@ -1250,12 +1250,12 @@ public class SchemaViewContentProvider i
      */
     private void schemaAddedHierarchicalPresentation( Schema schema )
     {
-        for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+        for ( AttributeType at : schema.getAttributeTypes() )
         {
             attributeTypeAddedHierarchicalPresentation( at );
         }
 
-        for ( ObjectClassImpl oc : schema.getObjectClasses() )
+        for ( ObjectClass oc : schema.getObjectClasses() )
         {
             objectClassAddedHierarchicalPresentation( oc );
         }
@@ -1310,12 +1310,12 @@ public class SchemaViewContentProvider i
      */
     private void schemaRemovedHierarchicalPresentation( Schema schema )
     {
-        for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+        for ( AttributeType at : schema.getAttributeTypes() )
         {
             attributeTypeRemovedHierarchicalPresentation( at );
         }
 
-        for ( ObjectClassImpl oc : schema.getObjectClasses() )
+        for ( ObjectClass oc : schema.getObjectClasses() )
         {
             objectClassRemovedHierarchicalPresentation( oc );
         }
@@ -1339,7 +1339,7 @@ public class SchemaViewContentProvider i
             Folder atFolder = new Folder( FolderType.ATTRIBUTE_TYPE, schemaWrapper );
             schemaWrapper.addChild( atFolder );
 
-            for ( AttributeTypeImpl attributeType : schema.getAttributeTypes() )
+            for ( AttributeType attributeType : schema.getAttributeTypes() )
             {
                 AttributeTypeWrapper atw = new AttributeTypeWrapper( attributeType, atFolder );
                 atw.getParent().addChild( atw );
@@ -1349,7 +1349,7 @@ public class SchemaViewContentProvider i
             Folder ocFolder = new Folder( FolderType.OBJECT_CLASS, schemaWrapper );
             schemaWrapper.addChild( ocFolder );
 
-            for ( ObjectClassImpl objectClass : schema.getObjectClasses() )
+            for ( ObjectClass objectClass : schema.getObjectClasses() )
             {
                 ObjectClassWrapper ocw = new ObjectClassWrapper( objectClass, ocFolder );
                 ocw.getParent().addChild( ocw );
@@ -1358,14 +1358,14 @@ public class SchemaViewContentProvider i
         }
         else if ( group == PluginConstants.PREFS_SCHEMA_VIEW_GROUPING_MIXED )
         {
-            for ( AttributeTypeImpl attributeType : schema.getAttributeTypes() )
+            for ( AttributeType attributeType : schema.getAttributeTypes() )
             {
                 AttributeTypeWrapper atw = new AttributeTypeWrapper( attributeType, schemaWrapper );
                 atw.getParent().addChild( atw );
                 elementsToWrappersMap.put( attributeType, atw );
             }
 
-            for ( ObjectClassImpl objectClass : schema.getObjectClasses() )
+            for ( ObjectClass objectClass : schema.getObjectClasses() )
             {
                 ObjectClassWrapper ocw = new ObjectClassWrapper( objectClass, schemaWrapper );
                 ocw.getParent().addChild( ocw );



Mime
View raw message