directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1063841 [2/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/model/SchemaImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java Wed Jan 26 19:25:22 2011
@@ -23,6 +23,11 @@ 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.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+
 
 /**
  * This class represents a schema.
@@ -38,16 +43,16 @@ public class SchemaImpl implements Schem
     private Project project;
 
     /** The AttributeType List */
-    private List<AttributeTypeImpl> attributeTypes = new ArrayList<AttributeTypeImpl>();
+    private List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
 
     /** The ObjectClass List */
-    private List<ObjectClassImpl> objectClasses = new ArrayList<ObjectClassImpl>();
+    private List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
 
     /** The MatchingRule List */
-    private List<MatchingRuleImpl> matchingRules = new ArrayList<MatchingRuleImpl>();
+    private List<MatchingRule> matchingRules = new ArrayList<MatchingRule>();
 
     /** The Syntax List */
-    private List<SyntaxImpl> syntaxes = new ArrayList<SyntaxImpl>();
+    private List<LdapSyntax> syntaxes = new ArrayList<LdapSyntax>();
 
 
     /**
@@ -65,7 +70,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#addAttributeType(org.apache.directory.shared.ldap.schema.AttributeType)
      */
-    public boolean addAttributeType( AttributeTypeImpl at )
+    public boolean addAttributeType( AttributeType at )
     {
         return attributeTypes.add( at );
     }
@@ -74,7 +79,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#addMatchingRule(org.apache.directory.shared.ldap.schema.MatchingRule)
      */
-    public boolean addMatchingRule( MatchingRuleImpl mr )
+    public boolean addMatchingRule( MatchingRule mr )
     {
         return matchingRules.add( mr );
     }
@@ -83,7 +88,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#addObjectClass(org.apache.directory.shared.ldap.schema.ObjectClass)
      */
-    public boolean addObjectClass( ObjectClassImpl oc )
+    public boolean addObjectClass( ObjectClass oc )
     {
         return objectClasses.add( oc );
     }
@@ -92,7 +97,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#addSyntax(org.apache.directory.shared.ldap.schema.Syntax)
      */
-    public boolean addSyntax( SyntaxImpl syntax )
+    public boolean addSyntax( LdapSyntax syntax )
     {
         return syntaxes.add( syntax );
     }
@@ -101,9 +106,9 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#getAttributeType(java.lang.String)
      */
-    public AttributeTypeImpl getAttributeType( String id )
+    public AttributeType getAttributeType( String id )
     {
-        for ( AttributeTypeImpl at : attributeTypes )
+        for ( AttributeType at : attributeTypes )
         {
             List<String> aliases = at.getNames();
             if ( aliases != null )
@@ -129,7 +134,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#getAttributeTypes()
      */
-    public List<AttributeTypeImpl> getAttributeTypes()
+    public List<AttributeType> getAttributeTypes()
     {
         return attributeTypes;
     }
@@ -138,9 +143,9 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#getMatchingRule(java.lang.String)
      */
-    public MatchingRuleImpl getMatchingRule( String id )
+    public MatchingRule getMatchingRule( String id )
     {
-        for ( MatchingRuleImpl mr : matchingRules )
+        for ( MatchingRule mr : matchingRules )
         {
             List<String> aliases = mr.getNames();
             if ( aliases != null )
@@ -166,7 +171,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#getMatchingRules()
      */
-    public List<MatchingRuleImpl> getMatchingRules()
+    public List<MatchingRule> getMatchingRules()
     {
         return matchingRules;
     }
@@ -193,9 +198,9 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#getObjectClass(java.lang.String)
      */
-    public ObjectClassImpl getObjectClass( String id )
+    public ObjectClass getObjectClass( String id )
     {
-        for ( ObjectClassImpl oc : objectClasses )
+        for ( ObjectClass oc : objectClasses )
         {
             List<String> aliases = oc.getNames();
             if ( aliases != null )
@@ -221,7 +226,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#getObjectClasses()
      */
-    public List<ObjectClassImpl> getObjectClasses()
+    public List<ObjectClass> getObjectClasses()
     {
         return objectClasses;
     }
@@ -230,9 +235,9 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#getSyntax(java.lang.String)
      */
-    public SyntaxImpl getSyntax( String id )
+    public LdapSyntax getSyntax( String id )
     {
-        for ( SyntaxImpl syntax : syntaxes )
+        for ( LdapSyntax syntax : syntaxes )
         {
             List<String> aliases = syntax.getNames();
             if ( aliases != null )
@@ -258,7 +263,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#getSyntaxes()
      */
-    public List<SyntaxImpl> getSyntaxes()
+    public List<LdapSyntax> getSyntaxes()
     {
         return syntaxes;
     }
@@ -267,7 +272,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#removeAttributeType(org.apache.directory.shared.ldap.schema.AttributeType)
      */
-    public boolean removeAttributeType( AttributeTypeImpl at )
+    public boolean removeAttributeType( AttributeType at )
     {
         return attributeTypes.remove( at );
     }
@@ -276,7 +281,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#removeMatchingRule(org.apache.directory.shared.ldap.schema.MatchingRule)
      */
-    public boolean removeMatchingRule( MatchingRuleImpl mr )
+    public boolean removeMatchingRule( MatchingRule mr )
     {
         return matchingRules.remove( mr );
     }
@@ -285,7 +290,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#removeObjectClass(org.apache.directory.shared.ldap.schema.ObjectClass)
      */
-    public boolean removeObjectClass( ObjectClassImpl oc )
+    public boolean removeObjectClass( ObjectClass oc )
     {
         return objectClasses.remove( oc );
     }
@@ -294,7 +299,7 @@ public class SchemaImpl implements Schem
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.Schema#removeSyntax(org.apache.directory.shared.ldap.schema.Syntax)
      */
-    public boolean removeSyntax( SyntaxImpl syntax )
+    public boolean removeSyntax( LdapSyntax syntax )
     {
         return syntaxes.remove( syntax );
     }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java Wed Jan 26 19:25:22 2011
@@ -25,11 +25,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.Schema;
 
 
@@ -77,14 +77,14 @@ public class DifferenceEngine
                 differences.add( schemaDifference );
 
                 // Adding attribute types
-                for ( AttributeTypeImpl at : schemaFromL1.getAttributeTypes() )
+                for ( AttributeType at : schemaFromL1.getAttributeTypes() )
                 {
                     schemaDifference.addAttributeTypeDifference( new AttributeTypeDifference( null, at,
                         DifferenceType.REMOVED ) );
                 }
 
                 // Adding object classes
-                for ( ObjectClassImpl oc : schemaFromL1.getObjectClasses() )
+                for ( ObjectClass oc : schemaFromL1.getObjectClasses() )
                 {
                     schemaDifference.addObjectClassDifference( new ObjectClassDifference( null, oc,
                         DifferenceType.REMOVED ) );
@@ -97,21 +97,21 @@ public class DifferenceEngine
                 differences.add( schemaDifference );
 
                 // Building Maps for attribute types
-                Map<String, AttributeTypeImpl> atMapL1 = new HashMap<String, AttributeTypeImpl>();
-                for ( AttributeTypeImpl at : schemaFromL1.getAttributeTypes() )
+                Map<String, AttributeType> atMapL1 = new HashMap<String, AttributeType>();
+                for ( AttributeType at : schemaFromL1.getAttributeTypes() )
                 {
                     atMapL1.put( at.getOid(), at );
                 }
-                Map<String, AttributeTypeImpl> atMapL2 = new HashMap<String, AttributeTypeImpl>();
-                for ( AttributeTypeImpl at : schemaFromL2.getAttributeTypes() )
+                Map<String, AttributeType> atMapL2 = new HashMap<String, AttributeType>();
+                for ( AttributeType at : schemaFromL2.getAttributeTypes() )
                 {
                     atMapL2.put( at.getOid(), at );
                 }
 
                 // Looping on the attribute types from the Schema from the first list
-                for ( AttributeTypeImpl atFromL1 : schemaFromL1.getAttributeTypes() )
+                for ( AttributeType atFromL1 : schemaFromL1.getAttributeTypes() )
                 {
-                    AttributeTypeImpl atFromL2 = atMapL2.get( atFromL1.getOid() );
+                    AttributeType atFromL2 = atMapL2.get( atFromL1.getOid() );
                     if ( atFromL2 == null )
                     {
                         AttributeTypeDifference attributeTypeDifference = new AttributeTypeDifference( atFromL1, null,
@@ -136,9 +136,9 @@ public class DifferenceEngine
                 }
 
                 // Looping on the attribute types from the Schema from the second list
-                for ( AttributeTypeImpl atFromL2 : schemaFromL2.getAttributeTypes() )
+                for ( AttributeType atFromL2 : schemaFromL2.getAttributeTypes() )
                 {
-                    AttributeTypeImpl atFromL1 = atMapL1.get( atFromL2.getOid() );
+                    AttributeType atFromL1 = atMapL1.get( atFromL2.getOid() );
                     if ( atFromL1 == null )
                     {
                         AttributeTypeDifference attributeTypeDifference = new AttributeTypeDifference( null, atFromL2,
@@ -150,21 +150,21 @@ public class DifferenceEngine
                 }
 
                 // Building Maps for object classes
-                Map<String, ObjectClassImpl> ocMapL1 = new HashMap<String, ObjectClassImpl>();
-                for ( ObjectClassImpl oc : schemaFromL1.getObjectClasses() )
+                Map<String, ObjectClass> ocMapL1 = new HashMap<String, ObjectClass>();
+                for ( ObjectClass oc : schemaFromL1.getObjectClasses() )
                 {
                     ocMapL1.put( oc.getOid(), oc );
                 }
-                Map<String, ObjectClassImpl> ocMapL2 = new HashMap<String, ObjectClassImpl>();
-                for ( ObjectClassImpl oc : schemaFromL2.getObjectClasses() )
+                Map<String, ObjectClass> ocMapL2 = new HashMap<String, ObjectClass>();
+                for ( ObjectClass oc : schemaFromL2.getObjectClasses() )
                 {
                     ocMapL2.put( oc.getOid(), oc );
                 }
 
                 // Looping on the object classes from the Schema from the first list
-                for ( ObjectClassImpl ocFromL1 : schemaFromL1.getObjectClasses() )
+                for ( ObjectClass ocFromL1 : schemaFromL1.getObjectClasses() )
                 {
-                    ObjectClassImpl ocFromL2 = ocMapL2.get( ocFromL1.getOid() );
+                    ObjectClass ocFromL2 = ocMapL2.get( ocFromL1.getOid() );
                     if ( ocFromL2 == null )
                     {
                         ObjectClassDifference objectClassDifference = new ObjectClassDifference( ocFromL1, null,
@@ -189,9 +189,9 @@ public class DifferenceEngine
                 }
 
                 // Looping on the object classes from the Schema from the second list
-                for ( ObjectClassImpl ocFromL2 : schemaFromL2.getObjectClasses() )
+                for ( ObjectClass ocFromL2 : schemaFromL2.getObjectClasses() )
                 {
-                    ObjectClassImpl ocFromL1 = ocMapL1.get( ocFromL2.getOid() );
+                    ObjectClass ocFromL1 = ocMapL1.get( ocFromL2.getOid() );
                     if ( ocFromL1 == null )
                     {
                         ObjectClassDifference objectClassDifference = new ObjectClassDifference( null, ocFromL2,
@@ -214,14 +214,14 @@ public class DifferenceEngine
                 differences.add( schemaDifference );
 
                 // Adding attribute types
-                for ( AttributeTypeImpl at : schemaFromL2.getAttributeTypes() )
+                for ( AttributeType at : schemaFromL2.getAttributeTypes() )
                 {
                     schemaDifference.addAttributeTypeDifference( new AttributeTypeDifference( null, at,
                         DifferenceType.ADDED ) );
                 }
 
                 // Adding object classes
-                for ( ObjectClassImpl oc : schemaFromL2.getObjectClasses() )
+                for ( ObjectClass oc : schemaFromL2.getObjectClasses() )
                 {
                     schemaDifference.addObjectClassDifference( new ObjectClassDifference( null, oc,
                         DifferenceType.ADDED ) );
@@ -243,7 +243,7 @@ public class DifferenceEngine
      * @return
      *      the differences between two ObjectClassImpl Objects.
      */
-    public static List<PropertyDifference> getDifferences( ObjectClassImpl oc1, ObjectClassImpl oc2 )
+    public static List<PropertyDifference> getDifferences( ObjectClass oc1, ObjectClass oc2 )
     {
         List<PropertyDifference> differences = new ArrayList<PropertyDifference>();
 
@@ -285,16 +285,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the differences between two AttributeTypeImpl Objects.
+     * Gets the differences between two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the differences between two AttributeTypeImpl Objects.
+     *      the differences between two AttributeType Objects.
      */
-    public static List<PropertyDifference> getDifferences( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    public static List<PropertyDifference> getDifferences( AttributeType at1, AttributeType at2 )
     {
         List<PropertyDifference> differences = new ArrayList<PropertyDifference>();
 
@@ -509,7 +509,7 @@ public class DifferenceEngine
      * @return
      *      the 'Class type' difference between the two ObjectClassImpl Objects
      */
-    private static PropertyDifference getClassTypeDifference( ObjectClassImpl oc1, ObjectClassImpl oc2 )
+    private static PropertyDifference getClassTypeDifference( ObjectClass oc1, ObjectClass oc2 )
     {
         ObjectClassTypeEnum oc1ClassType = oc1.getType();
         ObjectClassTypeEnum oc2ClassType = oc2.getType();
@@ -536,7 +536,7 @@ public class DifferenceEngine
      * @return
      *      the 'Superior Classes' differences between the two ObjectClassImpl Objects
      */
-    private static List<PropertyDifference> getSuperiorClassesDifferences( ObjectClassImpl oc1, ObjectClassImpl oc2 )
+    private static List<PropertyDifference> getSuperiorClassesDifferences( ObjectClass oc1, ObjectClass oc2 )
     {
         List<PropertyDifference> differences = new ArrayList<PropertyDifference>();
 
@@ -577,8 +577,8 @@ public class DifferenceEngine
      * @return
      *      the 'Mandatory attribute types' differences between the two ObjectClassImpl Objects
      */
-    private static List<PropertyDifference> getMandatoryAttributeTypesDifferences( ObjectClassImpl oc1,
-        ObjectClassImpl oc2 )
+    private static List<PropertyDifference> getMandatoryAttributeTypesDifferences( ObjectClass oc1,
+        ObjectClass oc2 )
     {
         List<PropertyDifference> differences = new ArrayList<PropertyDifference>();
 
@@ -619,8 +619,8 @@ public class DifferenceEngine
      * @return
      *      the 'Optional attribute types' differences between the two ObjectClassImpl Objects
      */
-    private static List<PropertyDifference> getOptionalAttributeTypesDifferences( ObjectClassImpl oc1,
-        ObjectClassImpl oc2 )
+    private static List<PropertyDifference> getOptionalAttributeTypesDifferences( ObjectClass oc1,
+        ObjectClass oc2 )
     {
         List<PropertyDifference> differences = new ArrayList<PropertyDifference>();
 
@@ -652,16 +652,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Usage' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Usage' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Usage' difference between the two AttributeTypeImpl Objects
+     *      the 'Usage' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getUsageDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getUsageDifference( AttributeType at1, AttributeType at2 )
     {
         UsageEnum at1Usage = at1.getUsage();
         UsageEnum at2Usage = at2.getUsage();
@@ -679,16 +679,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Superior' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Superior' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Superior' difference between the two AttributeTypeImpl Objects
+     *      the 'Superior' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSuperiorDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getSuperiorDifference( AttributeType at1, AttributeType at2 )
     {
         String at1Superior = at1.getSuperiorOid();
         String at2Superior = at2.getSuperiorOid();
@@ -721,16 +721,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Syntax' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Syntax' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Syntax' difference between the two AttributeTypeImpl Objects
+     *      the 'Syntax' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSyntaxDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getSyntaxDifference( AttributeType at1, AttributeType at2 )
     {
         String at1Syntax = at1.getSyntaxOid();
         String at2Syntax = at2.getSyntaxOid();
@@ -763,16 +763,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Syntax length' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Syntax length' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Syntax length' difference between the two AttributeTypeImpl Objects
+     *      the 'Syntax length' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSyntaxLengthDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getSyntaxLengthDifference( AttributeType at1, AttributeType at2 )
     {
         long at1SyntaxLength = at1.getSyntaxLength();
         long at2SyntaxLength = at2.getSyntaxLength();
@@ -805,16 +805,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Single value' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Single value' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Single value' difference between the two AttributeTypeImpl Objects
+     *      the 'Single value' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSingleValueDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getSingleValueDifference( AttributeType at1, AttributeType at2 )
     {
         boolean at1SingleValued = at1.isSingleValued();
         boolean at2SingleValued = at2.isSingleValued();
@@ -832,16 +832,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Collective' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Collective' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Collective' difference between the two AttributeTypeImpl Objects
+     *      the 'Collective' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getCollectiveDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getCollectiveDifference( AttributeType at1, AttributeType at2 )
     {
         boolean at1Collective = at1.isCollective();
         boolean at2Collective = at2.isCollective();
@@ -859,16 +859,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'No user modification' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'No user modification' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'No user modification' difference between the two AttributeTypeImpl Objects
+     *      the 'No user modification' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getNoUserModificationDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getNoUserModificationDifference( AttributeType at1, AttributeType at2 )
     {
         boolean at1IsUserModifiable = at1.isUserModifiable();
         boolean at2IsUserModifiable = at2.isUserModifiable();
@@ -886,16 +886,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Equality' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Equality' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Equality' difference between the two AttributeTypeImpl Objects
+     *      the 'Equality' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getEqualityDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getEqualityDifference( AttributeType at1, AttributeType at2 )
     {
         String at1Equality = at1.getEqualityOid();
         String at2Equality = at2.getEqualityOid();
@@ -928,16 +928,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Ordering' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Ordering' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Ordering' difference between the two AttributeTypeImpl Objects
+     *      the 'Ordering' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getOrderingDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getOrderingDifference( AttributeType at1, AttributeType at2 )
     {
         String at1Ordering = at1.getOrderingOid();
         String at2Ordering = at2.getOrderingOid();
@@ -970,16 +970,16 @@ public class DifferenceEngine
 
 
     /**
-     * Gets the 'Substring' difference between the two AttributeTypeImpl Objects.
+     * Gets the 'Substring' difference between the two AttributeType Objects.
      *
      * @param at1
-     *      the source AttributeTypeImpl Object
+     *      the source AttributeType Object
      * @param at2
-     *      the destination AttributeTypeImpl Object
+     *      the destination AttributeType Object
      * @return
-     *      the 'Substring' difference between the two AttributeTypeImpl Objects
+     *      the 'Substring' difference between the two AttributeType Objects
      */
-    private static PropertyDifference getSubstringDifference( AttributeTypeImpl at1, AttributeTypeImpl at2 )
+    private static PropertyDifference getSubstringDifference( AttributeType at1, AttributeType at2 )
     {
         String at1Substring = at1.getSubstringOid();
         String at2Substring = at2.getSubstringOid();

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java Wed Jan 26 19:25:22 2011
@@ -23,11 +23,11 @@ package org.apache.directory.studio.sche
 import java.util.List;
 
 import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.studio.schemaeditor.Activator;
 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;
 
 
@@ -74,7 +74,7 @@ public class HierarchyManager
      * @param at
      *      the attribute type
      */
-    private void addAttributeType( AttributeTypeImpl at )
+    private void addAttributeType( AttributeType at )
     {
         // Checking Aliases and OID
         checkAliasesAndOID( at );
@@ -83,7 +83,7 @@ public class HierarchyManager
         if ( superiorName != null )
         // The attribute type has a superior
         {
-            AttributeTypeImpl superior = schemaHandler.getAttributeType( superiorName );
+            AttributeType superior = schemaHandler.getAttributeType( superiorName );
             if ( superior != null )
             // The superior attribute type object exists
             {
@@ -116,7 +116,7 @@ public class HierarchyManager
      * @param oc
      *      the object class
      */
-    private void addObjectClass( ObjectClassImpl oc )
+    private void addObjectClass( ObjectClass oc )
     {
         // Checking Aliases and OID
         checkAliasesAndOID( oc );
@@ -127,7 +127,7 @@ public class HierarchyManager
         {
             for ( String superClassName : superClasseNames )
             {
-                ObjectClassImpl superClass = schemaHandler.getObjectClass( superClassName );
+                ObjectClass superClass = schemaHandler.getObjectClass( superClassName );
                 if ( superClass == null )
                 {
                     parentsMap.put( oc, superClassName.toLowerCase() );
@@ -146,7 +146,7 @@ public class HierarchyManager
         // Then, it is a child of the "top (2.5.6.0)" object class
         // (Unless it is the "top (2.5.6.0)" object class itself)
         {
-            ObjectClassImpl topOC = schemaHandler.getObjectClass( "2.5.6.0" );
+            ObjectClass topOC = schemaHandler.getObjectClass( "2.5.6.0" );
             if ( oc.equals( topOC ) )
             // The given object class is the "top (2.5.6.0)" object class
             {
@@ -179,7 +179,7 @@ public class HierarchyManager
      * @param at
      *      the added attribute type
      */
-    public void attributeTypeAdded( AttributeTypeImpl at )
+    public void attributeTypeAdded( AttributeType at )
     {
         addAttributeType( at );
     }
@@ -191,7 +191,7 @@ public class HierarchyManager
      * @param at
      *      the modified attribute type
      */
-    public void attributeTypeModified( AttributeTypeImpl at )
+    public void attributeTypeModified( AttributeType at )
     {
         // Removing the attribute type
         List<Object> parents = getParents( at );
@@ -216,7 +216,7 @@ public class HierarchyManager
      * @param at
      *      the removed attribute type
      */
-    public void attributeTypeRemoved( AttributeTypeImpl at )
+    public void attributeTypeRemoved( AttributeType at )
     {
         removeAttributeType( at );
     }
@@ -334,13 +334,13 @@ public class HierarchyManager
             for ( Schema schema : schemaHandler.getSchemas() )
             {
                 // Looping on the attribute types
-                for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+                for ( AttributeType at : schema.getAttributeTypes() )
                 {
                     addAttributeType( at );
                 }
 
                 // Looping on the object classes
-                for ( ObjectClassImpl oc : schema.getObjectClasses() )
+                for ( ObjectClass oc : schema.getObjectClasses() )
                 {
                     addObjectClass( oc );
                 }
@@ -355,7 +355,7 @@ public class HierarchyManager
      * @param oc
      *      the added object class
      */
-    public void objectClassAdded( ObjectClassImpl oc )
+    public void objectClassAdded( ObjectClass oc )
     {
         addObjectClass( oc );
     }
@@ -367,7 +367,7 @@ public class HierarchyManager
      * @param oc
      *      the modified object class
      */
-    public void objectClassModified( ObjectClassImpl oc )
+    public void objectClassModified( ObjectClass oc )
     {
         // Removing the object class type
         List<Object> parents = getParents( oc );
@@ -392,7 +392,7 @@ public class HierarchyManager
      * @param oc
      *      the removed object class
      */
-    public void objectClassRemoved( ObjectClassImpl oc )
+    public void objectClassRemoved( ObjectClass oc )
     {
         removeObjectClass( oc );
     }
@@ -404,13 +404,13 @@ public class HierarchyManager
      * @param at
      *      the attribute type
      */
-    private void removeAttributeType( AttributeTypeImpl at )
+    private void removeAttributeType( AttributeType at )
     {
         // Removing the attribute type as child of its superior
         String superiorName = at.getSuperiorOid();
         if ( ( superiorName != null ) && ( !"".equals( superiorName ) ) ) //$NON-NLS-1$
         {
-            AttributeTypeImpl superiorAT = schemaHandler.getAttributeType( superiorName );
+            AttributeType superiorAT = schemaHandler.getAttributeType( superiorName );
             if ( superiorAT == null )
             {
                 childrenMap.remove( superiorName.toLowerCase(), at );
@@ -431,7 +431,7 @@ public class HierarchyManager
         {
             for ( Object child : children )
             {
-                AttributeTypeImpl childAT = ( AttributeTypeImpl ) child;
+                AttributeType childAT = ( AttributeType ) child;
 
                 parentsMap.remove( child, at );
 
@@ -451,7 +451,7 @@ public class HierarchyManager
     }
 
 
-    private void removeObjectClass( ObjectClassImpl oc )
+    private void removeObjectClass( ObjectClass oc )
     {
         // Removing the object class as child of its superiors
         List<String> superClassesNames = oc.getSuperiorOids();
@@ -461,7 +461,7 @@ public class HierarchyManager
             {
                 if ( !"".equals( superClassName ) ) //$NON-NLS-1$
                 {
-                    ObjectClassImpl superClassOC = schemaHandler.getObjectClass( superClassName );
+                    ObjectClass superClassOC = schemaHandler.getObjectClass( superClassName );
                     if ( superClassOC == null )
                     {
                         childrenMap.remove( superClassName.toLowerCase(), oc );
@@ -483,7 +483,7 @@ public class HierarchyManager
             }
             else
             {
-                ObjectClassImpl topOC = schemaHandler.getObjectClass( "2.5.6.0" );
+                ObjectClass topOC = schemaHandler.getObjectClass( "2.5.6.0" );
                 if ( topOC != null )
                 // The "top (2.5.6.0)" object class exists
                 {
@@ -503,7 +503,7 @@ public class HierarchyManager
         {
             for ( Object child : children )
             {
-                ObjectClassImpl childOC = ( ObjectClassImpl ) child;
+                ObjectClass childOC = ( ObjectClass ) child;
 
                 parentsMap.remove( child, oc );
 
@@ -532,7 +532,7 @@ public class HierarchyManager
     }
 
 
-    private String getCorrectSuperClassName( ObjectClassImpl oc, List<String> childSuperClassesNames )
+    private String getCorrectSuperClassName( ObjectClass oc, List<String> childSuperClassesNames )
     {
         if ( childSuperClassesNames != null )
         {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Wed Jan 26 19:25:22 2011
@@ -29,6 +29,10 @@ import javax.naming.directory.Attribute;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.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.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
@@ -36,12 +40,8 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
 import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
-import org.apache.directory.studio.schemaeditor.model.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.SchemaImpl;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
 
 
 /**
@@ -222,27 +222,23 @@ public class ApacheDsSchemaConnector ext
                     switch ( getNodeType( searchResult ) )
                     {
                         case ATTRIBUTE_TYPE:
-                            AttributeTypeImpl at = createAttributeType( searchResult );
+                            AttributeType at = createAttributeType( searchResult );
                             at.setSchemaName( name );
-                            at.setSchemaObject( schema );
                             schema.addAttributeType( at );
                             break;
                         case OBJECT_CLASS:
-                            ObjectClassImpl oc = createObjectClass( searchResult );
+                            ObjectClass oc = createObjectClass( searchResult );
                             oc.setSchemaName( name );
-                            oc.setSchemaObject( schema );
                             schema.addObjectClass( oc );
                             break;
                         case MATCHING_RULE:
-                            MatchingRuleImpl mr = createMatchingRule( searchResult );
+                            MatchingRule mr = createMatchingRule( searchResult );
                             mr.setSchemaName( name );
-                            mr.setSchemaObject( schema );
                             schema.addMatchingRule( mr );
                             break;
                         case SYNTAX:
-                            SyntaxImpl syntax = createSyntax( searchResult );
+                            LdapSyntax syntax = createSyntax( searchResult );
                             syntax.setSchemaName( name );
-                            syntax.setSchemaObject( schema );
                             schema.addSyntax( syntax );
                             break;
                         default:
@@ -312,9 +308,9 @@ public class ApacheDsSchemaConnector ext
      * AttributeTypeImpl could be created
      * @throws NamingException 
      */
-    private static AttributeTypeImpl createAttributeType( SearchResult sr ) throws NamingException
+    private static AttributeType createAttributeType( SearchResult sr ) throws NamingException
     {
-        AttributeTypeImpl at = new AttributeTypeImpl( getOid( sr ) );
+        AttributeType at = new AttributeType( getOid( sr ) );
         at.setNames( getNames( sr ) );
         at.setDescription( getDescription( sr ) );
         at.setObsolete( isObsolete( sr ) );
@@ -342,9 +338,9 @@ public class ApacheDsSchemaConnector ext
      * ObjectClassImpl could be created
      * @throws NamingException 
      */
-    private static ObjectClassImpl createObjectClass( SearchResult sr ) throws NamingException
+    private static ObjectClass createObjectClass( SearchResult sr ) throws NamingException
     {
-        ObjectClassImpl oc = new ObjectClassImpl( getOid( sr ) );
+        ObjectClass oc = new ObjectClass( getOid( sr ) );
         oc.setNames( getNames( sr ) );
         oc.setDescription( getDescription( sr ) );
         oc.setObsolete( isObsolete( sr ) );
@@ -366,9 +362,9 @@ public class ApacheDsSchemaConnector ext
      * ObjectClass could be created
      * @throws NamingException 
      */
-    private static MatchingRuleImpl createMatchingRule( SearchResult sr ) throws NamingException
+    private static MatchingRule createMatchingRule( SearchResult sr ) throws NamingException
     {
-        MatchingRuleImpl mr = new MatchingRuleImpl( getOid( sr ) );
+        MatchingRule mr = new MatchingRule( getOid( sr ) );
         mr.setNames( getNames( sr ) );
         mr.setDescription( getDescription( sr ) );
         mr.setObsolete( isObsolete( sr ) );
@@ -387,9 +383,9 @@ public class ApacheDsSchemaConnector ext
      * ObjectClass could be created
      * @throws NamingException 
      */
-    private static SyntaxImpl createSyntax( SearchResult sr ) throws NamingException
+    private static LdapSyntax createSyntax( SearchResult sr ) throws NamingException
     {
-        SyntaxImpl syntax = new SyntaxImpl( getOid( sr ) );
+        LdapSyntax syntax = new LdapSyntax( getOid( sr ) );
         syntax.setNames( getNames( sr ) );
         syntax.setDescription( getDescription( sr ) );
         syntax.setObsolete( isObsolete( sr ) );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Wed Jan 26 19:25:22 2011
@@ -35,8 +35,8 @@ import org.apache.directory.shared.ldap.
 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.parsers.AttributeTypeDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
+import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser;
 import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
 import org.apache.directory.studio.connection.core.Connection;
@@ -44,12 +44,8 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
 import org.apache.directory.studio.connection.core.Utils;
 import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
-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.SchemaImpl;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
 
 
 /**
@@ -202,7 +198,7 @@ public class GenericSchemaConnector exte
                     parser.setQuirksMode( true );
                     AttributeType atd = parser.parseAttributeTypeDescription( value );
 
-                    AttributeTypeImpl impl = new AttributeTypeImpl( atd.getOid() );
+                    AttributeType impl = new AttributeType( atd.getOid() );
                     impl.setNames( atd.getNames().toArray( new String[0] ) );
                     impl.setDescription( atd.getDescription() );
                     impl.setSuperiorOid( atd.getSuperiorOid() );
@@ -217,7 +213,6 @@ public class GenericSchemaConnector exte
                     impl.setOrderingOid( atd.getOrderingOid() );
                     impl.setSubstringOid( atd.getSubstringOid() );
                     impl.setSchemaName( schema.getName() );
-                    impl.setSchemaObject( schema );
 
                     // Active Directory hack
                     if ( impl.getSyntaxOid() != null && "OctetString".equalsIgnoreCase( impl.getSyntaxOid() ) ) //$NON-NLS-1$
@@ -243,7 +238,7 @@ public class GenericSchemaConnector exte
                     parser.setQuirksMode( true );
                     ObjectClass ocd = parser.parseObjectClassDescription( value );
 
-                    ObjectClassImpl impl = new ObjectClassImpl( ocd.getOid() );
+                    ObjectClass impl = new ObjectClass( ocd.getOid() );
                     impl.setNames( ocd.getNames().toArray( new String[0] ) );
                     impl.setDescription( ocd.getDescription() );
                     impl.setSuperiorOids( ocd.getSuperiorOids() );
@@ -252,7 +247,6 @@ public class GenericSchemaConnector exte
                     impl.setMustAttributeTypeOids( ocd.getMustAttributeTypeOids() );
                     impl.setMayAttributeTypeOids( ocd.getMayAttributeTypeOids() );
                     impl.setSchemaName( schema.getName() );
-                    impl.setSchemaObject( schema );
 
                     schema.addObjectClass( impl );
                 }
@@ -272,28 +266,26 @@ public class GenericSchemaConnector exte
                     parser.setQuirksMode( true );
                     LdapSyntax lsd = parser.parseLdapSyntaxDescription( value );
 
-                    SyntaxImpl impl = new SyntaxImpl( lsd.getOid() );
+                    LdapSyntax impl = new LdapSyntax( lsd.getOid() );
                     impl.setDescription( lsd.getDescription() );
                     impl.setNames( new String[]
                         { lsd.getDescription() } );
                     //impl.setObsolete( lsd.isObsolete() );
                     impl.setHumanReadable( true );
                     impl.setSchemaName( schema.getName() );
-                    impl.setSchemaObject( schema );
 
                     schema.addSyntax( impl );
                 }
             }
         }
         // if online: assume all received syntaxes in attributes are valid -> create dummy syntaxes if missing
-        for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+        for ( AttributeType at : schema.getAttributeTypes() )
         {
             String syntaxOid = at.getSyntaxOid();
             if ( syntaxOid != null && schema.getSyntax( syntaxOid ) == null )
             {
-                SyntaxImpl impl = new SyntaxImpl( syntaxOid );
+                LdapSyntax impl = new LdapSyntax( syntaxOid );
                 impl.setSchemaName( schema.getName() );
-                impl.setSchemaObject( schema );
                 String oidDescription = Utils.getOidDescription( syntaxOid );
                 impl.setDescription( oidDescription != null ? oidDescription : "Dummy" ); //$NON-NLS-1$
                 impl.setNames( new String[]
@@ -315,20 +307,19 @@ public class GenericSchemaConnector exte
                     parser.setQuirksMode( true );
                     MatchingRule mrd = parser.parseMatchingRuleDescription( value );
 
-                    MatchingRuleImpl impl = new MatchingRuleImpl( mrd.getOid() );
+                    MatchingRule impl = new MatchingRule( mrd.getOid() );
                     impl.setDescription( mrd.getDescription() );
                     impl.setNames( mrd.getNames().toArray( new String[0] ) );
                     impl.setObsolete( mrd.isObsolete() );
                     impl.setSyntaxOid( mrd.getSyntaxOid() );
                     impl.setSchemaName( schema.getName() );
-                    impl.setSchemaObject( schema );
 
                     schema.addMatchingRule( impl );
                 }
             }
         }
         // if online: assume all received matching rules in attributes are valid -> create dummy matching rules if missing
-        for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+        for ( AttributeType at : schema.getAttributeTypes() )
         {
             String equalityName = at.getEqualityOid();
             String orderingName = at.getOrderingOid();
@@ -346,9 +337,8 @@ public class GenericSchemaConnector exte
         {
             if ( matchingRuleName != null && schema.getMatchingRule( matchingRuleName ) == null )
             {
-                MatchingRuleImpl impl = new MatchingRuleImpl( matchingRuleName );
+                MatchingRule impl = new MatchingRule( matchingRuleName );
                 impl.setSchemaName( schema.getName() );
-                impl.setSchemaObject( schema );
                 impl.setDescription( "Dummy" ); //$NON-NLS-1$
                 impl.setNames( new String[]
                     { matchingRuleName } );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java Wed Jan 26 19:25:22 2011
@@ -22,10 +22,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.shared.ldap.model.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
-import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
-import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.Schema;
 
 
@@ -49,13 +49,13 @@ public class OpenLdapSchemaFileExporter
     {
         StringBuffer sb = new StringBuffer();
 
-        for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+        for ( AttributeType at : schema.getAttributeTypes() )
         {
             sb.append( toSourceCode( at ) );
             sb.append( "\n" ); //$NON-NLS-1$
         }
 
-        for ( ObjectClassImpl oc : schema.getObjectClasses() )
+        for ( ObjectClass oc : schema.getObjectClasses() )
         {
             sb.append( toSourceCode( oc ) );
             sb.append( "\n" ); //$NON-NLS-1$
@@ -74,7 +74,7 @@ public class OpenLdapSchemaFileExporter
      * @return
      *      the corresponding source code representation
      */
-    public static String toSourceCode( AttributeTypeImpl at )
+    public static String toSourceCode( AttributeType at )
     {
         StringBuffer sb = new StringBuffer();
 
@@ -204,7 +204,7 @@ public class OpenLdapSchemaFileExporter
      * @return
      *      the corresponding source code representation
      */
-    public static String toSourceCode( ObjectClassImpl oc )
+    public static String toSourceCode( ObjectClass oc )
     {
         StringBuffer sb = new StringBuffer();
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Wed Jan 26 19:25:22 2011
@@ -32,8 +32,6 @@ import java.util.regex.MatchResult;
 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.parsers.OpenLdapSchemaParser;
-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.SchemaImpl;
 import org.eclipse.osgi.util.NLS;
@@ -98,18 +96,16 @@ public class OpenLdapSchemaFileImporter
         List<?> ats = parser.getAttributeTypes();
         for ( int i = 0; i < ats.size(); i++ )
         {
-            AttributeTypeImpl at = convertAttributeType( ( AttributeType ) ats.get( i ) );
+            AttributeType at = convertAttributeType( ( AttributeType ) ats.get( i ) );
             at.setSchemaName( schemaName );
-            at.setSchemaObject( schema );
             schema.addAttributeType( at );
         }
 
         List<?> ocs = parser.getObjectClassTypes();
         for ( int i = 0; i < ocs.size(); i++ )
         {
-            ObjectClassImpl oc = convertObjectClass( ( ObjectClass ) ocs.get( i ) );
+            ObjectClass oc = convertObjectClass( ( ObjectClass ) ocs.get( i ) );
             oc.setSchemaName( schemaName );
-            oc.setSchemaObject( schema );
             schema.addObjectClass( oc );
         }
 
@@ -147,9 +143,9 @@ public class OpenLdapSchemaFileImporter
      * @return
      *      the corresponding AttributeTypeImpl
      */
-    private static final AttributeTypeImpl convertAttributeType( AttributeType at )
+    private static final AttributeType convertAttributeType( AttributeType at )
     {
-        AttributeTypeImpl newAT = new AttributeTypeImpl( at.getOid() );
+        AttributeType newAT = new AttributeType( at.getOid() );
         newAT.setNames( at.getNames() );
         newAT.setDescription( at.getDescription() );
         newAT.setSuperiorOid( at.getSuperiorOid() );
@@ -176,9 +172,9 @@ public class OpenLdapSchemaFileImporter
      * @return
      *      the corresponding ObjectClassImpl
      */
-    private static final ObjectClassImpl convertObjectClass( ObjectClass oc )
+    private static final ObjectClass convertObjectClass( ObjectClass oc )
     {
-        ObjectClassImpl newOC = new ObjectClassImpl( oc.getOid() );
+        ObjectClass newOC = new ObjectClass( oc.getOid() );
         newOC.setNames( oc.getNames() );
         newOC.setDescription( oc.getDescription() );
         newOC.setSuperiorOids( oc.getSuperiorOids() );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Wed Jan 26 19:25:22 2011
@@ -25,13 +25,13 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.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.shared.ldap.model.schema.UsageEnum;
-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.dom4j.Branch;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
@@ -193,44 +193,44 @@ public class XMLSchemaFileExporter
             }
 
             // Attribute Types
-            List<AttributeTypeImpl> ats = schema.getAttributeTypes();
+            List<AttributeType> ats = schema.getAttributeTypes();
             if ( ( ats != null ) && ( ats.size() >= 1 ) )
             {
                 Element attributeTypesNode = element.addElement( ATTRIBUTE_TYPES_TAG );
-                for ( AttributeTypeImpl at : ats )
+                for ( AttributeType at : ats )
                 {
                     toXml( at, attributeTypesNode );
                 }
             }
 
             // Object Classes
-            List<ObjectClassImpl> ocs = schema.getObjectClasses();
+            List<ObjectClass> ocs = schema.getObjectClasses();
             if ( ( ocs != null ) && ( ocs.size() >= 1 ) )
             {
                 Element objectClassesNode = element.addElement( OBJECT_CLASSES_TAG );
-                for ( ObjectClassImpl oc : ocs )
+                for ( ObjectClass oc : ocs )
                 {
                     toXml( oc, objectClassesNode );
                 }
             }
 
             // Matching Rules
-            List<MatchingRuleImpl> mrs = schema.getMatchingRules();
+            List<MatchingRule> mrs = schema.getMatchingRules();
             if ( ( mrs != null ) && ( mrs.size() >= 1 ) )
             {
                 Element matchingRulesNode = element.addElement( MATCHING_RULES_TAG );
-                for ( MatchingRuleImpl mr : mrs )
+                for ( MatchingRule mr : mrs )
                 {
                     toXml( mr, matchingRulesNode );
                 }
             }
 
             // Syntaxes
-            List<SyntaxImpl> syntaxes = schema.getSyntaxes();
+            List<LdapSyntax> syntaxes = schema.getSyntaxes();
             if ( ( syntaxes != null ) && ( syntaxes.size() >= 1 ) )
             {
                 Element syntaxesNode = element.addElement( SYNTAXES_TAG );
-                for ( SyntaxImpl syntax : syntaxes )
+                for ( LdapSyntax syntax : syntaxes )
                 {
                     toXml( syntax, syntaxesNode );
                 }
@@ -247,7 +247,7 @@ public class XMLSchemaFileExporter
      * @param root
      *      the root Element
      */
-    private static void toXml( AttributeTypeImpl at, Element root )
+    private static void toXml( AttributeType at, Element root )
     {
         Element atNode = root.addElement( ATTRIBUTE_TYPE_TAG );
 
@@ -375,7 +375,7 @@ public class XMLSchemaFileExporter
      * @param root
      *      the root Element
      */
-    private static void toXml( ObjectClassImpl oc, Element root )
+    private static void toXml( ObjectClass oc, Element root )
     {
         Element ocNode = root.addElement( OBJECT_CLASS_TAG );
 
@@ -464,7 +464,7 @@ public class XMLSchemaFileExporter
      * @param root
      *      the root Element
      */
-    private static void toXml( MatchingRuleImpl mr, Element root )
+    private static void toXml( MatchingRule mr, Element root )
     {
         Element mrNode = root.addElement( MATCHING_RULE_TAG );
 
@@ -523,7 +523,7 @@ public class XMLSchemaFileExporter
      * @return
      *      the corresponding source code representation
      */
-    private static void toXml( SyntaxImpl syntax, Element root )
+    private static void toXml( LdapSyntax syntax, Element root )
     {
         Element syntaxNode = root.addElement( SYNTAX_TAG );
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Wed Jan 26 19:25:22 2011
@@ -26,14 +26,14 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.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.shared.ldap.model.schema.UsageEnum;
-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.SchemaImpl;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -308,13 +308,13 @@ public class XMLSchemaFileImporter
      */
     private static void readAttributeType( Element element, Schema schema ) throws XMLSchemaFileImportException
     {
-        AttributeTypeImpl at = null;
+        AttributeType at = null;
 
         // OID
         Attribute oidAttribute = element.attribute( OID_TAG );
         if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
         {
-            at = new AttributeTypeImpl( oidAttribute.getValue() );
+            at = new AttributeType( oidAttribute.getValue() );
         }
         else
         {
@@ -323,7 +323,6 @@ public class XMLSchemaFileImporter
 
         // Schema
         at.setSchemaName( schema.getName() );
-        at.setSchemaObject( schema );
 
         // Aliases
         Element aliasesElement = element.element( ALIASES_TAG );
@@ -479,13 +478,13 @@ public class XMLSchemaFileImporter
      */
     private static void readObjectClass( Element element, Schema schema ) throws XMLSchemaFileImportException
     {
-        ObjectClassImpl oc = null;
+        ObjectClass oc = null;
 
         // OID
         Attribute oidAttribute = element.attribute( OID_TAG );
         if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
         {
-            oc = new ObjectClassImpl( oidAttribute.getValue() );
+            oc = new ObjectClass( oidAttribute.getValue() );
         }
         else
         {
@@ -494,7 +493,6 @@ public class XMLSchemaFileImporter
 
         // Schema
         oc.setSchemaName( schema.getName() );
-        oc.setSchemaObject( schema );
 
         // Aliases
         Element aliasesElement = element.element( ALIASES_TAG );
@@ -627,13 +625,13 @@ public class XMLSchemaFileImporter
      */
     private static void readMatchingRule( Element element, Schema schema ) throws XMLSchemaFileImportException
     {
-        MatchingRuleImpl mr = null;
+        MatchingRule mr = null;
 
         // OID
         Attribute oidAttribute = element.attribute( OID_TAG );
         if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
         {
-            mr = new MatchingRuleImpl( oidAttribute.getValue() );
+            mr = new MatchingRule( oidAttribute.getValue() );
         }
         else
         {
@@ -642,7 +640,6 @@ public class XMLSchemaFileImporter
 
         // Schema
         mr.setSchemaName( schema.getName() );
-        mr.setSchemaObject( schema );
 
         // Aliases
         Element aliasesElement = element.element( ALIASES_TAG );
@@ -719,13 +716,13 @@ public class XMLSchemaFileImporter
      */
     private static void readSyntax( Element element, Schema schema ) throws XMLSchemaFileImportException
     {
-        SyntaxImpl syntax = null;
+        LdapSyntax syntax = null;
 
         // OID
         Attribute oidAttribute = element.attribute( OID_TAG );
         if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
         {
-            syntax = new SyntaxImpl( oidAttribute.getValue() );
+            syntax = new LdapSyntax( oidAttribute.getValue() );
         }
         else
         {
@@ -734,7 +731,6 @@ public class XMLSchemaFileImporter
 
         // Schema
         syntax.setSchemaName( schema.getName() );
-        syntax.setSchemaObject( schema );
 
         // Aliases
         Element aliasesElement = element.element( ALIASES_TAG );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Wed Jan 26 19:25:22 2011
@@ -25,6 +25,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.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -33,12 +37,8 @@ import org.apache.directory.studio.schem
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
 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.Project;
 import org.apache.directory.studio.schemaeditor.model.Schema;
-import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
 import org.apache.directory.studio.schemaeditor.model.schemachecker.NonExistingMatchingRuleError.NonExistingMatchingRuleErrorEnum;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -85,7 +85,7 @@ public class SchemaChecker
     /** The SchemaHandlerListener */
     private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
     {
-        public void attributeTypeAdded( AttributeTypeImpl at )
+        public void attributeTypeAdded( AttributeType at )
         {
             synchronized ( this )
             {
@@ -100,7 +100,7 @@ public class SchemaChecker
         }
 
 
-        public void attributeTypeModified( AttributeTypeImpl at )
+        public void attributeTypeModified( AttributeType at )
         {
             synchronized ( this )
             {
@@ -120,7 +120,7 @@ public class SchemaChecker
         }
 
 
-        public void attributeTypeRemoved( AttributeTypeImpl at )
+        public void attributeTypeRemoved( AttributeType at )
         {
             synchronized ( this )
             {
@@ -140,7 +140,7 @@ public class SchemaChecker
         }
 
 
-        public void objectClassAdded( ObjectClassImpl oc )
+        public void objectClassAdded( ObjectClass oc )
         {
             synchronized ( this )
             {
@@ -155,7 +155,7 @@ public class SchemaChecker
         }
 
 
-        public void objectClassModified( ObjectClassImpl oc )
+        public void objectClassModified( ObjectClass oc )
         {
             synchronized ( this )
             {
@@ -175,7 +175,7 @@ public class SchemaChecker
         }
 
 
-        public void objectClassRemoved( ObjectClassImpl oc )
+        public void objectClassRemoved( ObjectClass oc )
         {
             synchronized ( this )
             {
@@ -199,14 +199,14 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-                List<AttributeTypeImpl> ats = schema.getAttributeTypes();
-                for ( AttributeTypeImpl at : ats )
+                List<AttributeType> ats = schema.getAttributeTypes();
+                for ( AttributeType at : ats )
                 {
                     checkAttributeType( at );
                 }
 
-                List<ObjectClassImpl> ocs = schema.getObjectClasses();
-                for ( ObjectClassImpl oc : ocs )
+                List<ObjectClass> ocs = schema.getObjectClasses();
+                for ( ObjectClass oc : ocs )
                 {
                     checkObjectClass( oc );
                 }
@@ -220,14 +220,14 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-                List<AttributeTypeImpl> ats = schema.getAttributeTypes();
-                for ( AttributeTypeImpl at : ats )
+                List<AttributeType> ats = schema.getAttributeTypes();
+                for ( AttributeType at : ats )
                 {
                     removeSchemaObject( at );
                 }
 
-                List<ObjectClassImpl> ocs = schema.getObjectClasses();
-                for ( ObjectClassImpl oc : ocs )
+                List<ObjectClass> ocs = schema.getObjectClasses();
+                for ( ObjectClass oc : ocs )
                 {
                     removeSchemaObject( oc );
                 }
@@ -382,14 +382,14 @@ public class SchemaChecker
                     {
                         monitor.subTask( schema.getName() );
 
-                        List<AttributeTypeImpl> ats = schema.getAttributeTypes();
-                        for ( AttributeTypeImpl at : ats )
+                        List<AttributeType> ats = schema.getAttributeTypes();
+                        for ( AttributeType at : ats )
                         {
                             checkAttributeType( at );
                         }
 
-                        List<ObjectClassImpl> ocs = schema.getObjectClasses();
-                        for ( ObjectClassImpl oc : ocs )
+                        List<ObjectClass> ocs = schema.getObjectClasses();
+                        for ( ObjectClass oc : ocs )
                         {
                             checkObjectClass( oc );
                         }
@@ -416,7 +416,7 @@ public class SchemaChecker
      * @param at
      *      an attribute type
      */
-    private void checkAttributeType( AttributeTypeImpl at )
+    private void checkAttributeType( AttributeType at )
     {
         removeSchemaObject( at );
 
@@ -473,7 +473,7 @@ public class SchemaChecker
         String superior = at.getSuperiorOid();
         if ( ( superior != null ) && ( !"".equals( superior ) ) )
         {
-            AttributeTypeImpl superiorAT = Activator.getDefault().getSchemaHandler().getAttributeType( superior );
+            AttributeType superiorAT = Activator.getDefault().getSchemaHandler().getAttributeType( superior );
             if ( superiorAT == null )
             {
                 SchemaError error = new NonExistingATSuperiorError( at, superior );
@@ -513,7 +513,7 @@ public class SchemaChecker
         String syntaxOid = at.getSyntaxOid();
         if ( ( syntaxOid != null ) && ( !"".equals( syntaxOid ) ) )
         {
-            SyntaxImpl syntax = Activator.getDefault().getSchemaHandler().getSyntax( syntaxOid );
+            LdapSyntax syntax = Activator.getDefault().getSchemaHandler().getSyntax( syntaxOid );
             if ( syntax == null )
             {
                 SchemaError error = new NonExistingSyntaxError( at, syntaxOid );
@@ -533,7 +533,7 @@ public class SchemaChecker
         String equality = at.getEqualityOid();
         if ( ( equality != null ) && ( !"".equals( equality ) ) )
         {
-            MatchingRuleImpl equalityMR = Activator.getDefault().getSchemaHandler().getMatchingRule( equality );
+            MatchingRule equalityMR = Activator.getDefault().getSchemaHandler().getMatchingRule( equality );
             if ( equalityMR == null )
             {
                 SchemaError error = new NonExistingMatchingRuleError( at, equality,
@@ -554,7 +554,7 @@ public class SchemaChecker
         String ordering = at.getOrderingOid();
         if ( ( ordering != null ) && ( !"".equals( ordering ) ) )
         {
-            MatchingRuleImpl orderingMR = Activator.getDefault().getSchemaHandler().getMatchingRule( ordering );
+            MatchingRule orderingMR = Activator.getDefault().getSchemaHandler().getMatchingRule( ordering );
             if ( orderingMR == null )
             {
                 SchemaError error = new NonExistingMatchingRuleError( at, ordering,
@@ -575,7 +575,7 @@ public class SchemaChecker
         String substring = at.getSubstringOid();
         if ( ( substring != null ) && ( !"".equals( substring ) ) )
         {
-            MatchingRuleImpl substringMR = Activator.getDefault().getSchemaHandler().getMatchingRule( substring );
+            MatchingRule substringMR = Activator.getDefault().getSchemaHandler().getMatchingRule( substring );
             if ( substringMR == null )
             {
                 SchemaError error = new NonExistingMatchingRuleError( at, substring,
@@ -600,7 +600,7 @@ public class SchemaChecker
      * @param oc
      *      an object class
      */
-    private void checkObjectClass( ObjectClassImpl oc )
+    private void checkObjectClass( ObjectClass oc )
     {
         removeSchemaObject( oc );
 
@@ -661,7 +661,7 @@ public class SchemaChecker
 
             for ( String superior : superiors )
             {
-                ObjectClassImpl superiorOC = Activator.getDefault().getSchemaHandler().getObjectClass( superior );
+                ObjectClass superiorOC = Activator.getDefault().getSchemaHandler().getObjectClass( superior );
                 if ( superiorOC == null )
                 {
                     SchemaError error = new NonExistingOCSuperiorError( oc, superior );
@@ -712,7 +712,7 @@ public class SchemaChecker
         {
             for ( String mandatoryATName : mandatoryATNames )
             {
-                AttributeTypeImpl mandatoryAT = Activator.getDefault().getSchemaHandler().getAttributeType(
+                AttributeType mandatoryAT = Activator.getDefault().getSchemaHandler().getAttributeType(
                     mandatoryATName );
                 if ( mandatoryAT == null )
                 {
@@ -731,7 +731,7 @@ public class SchemaChecker
 
             for ( String optionalATName : optionalATNames )
             {
-                AttributeTypeImpl optionalAT = Activator.getDefault().getSchemaHandler().getAttributeType(
+                AttributeType optionalAT = Activator.getDefault().getSchemaHandler().getAttributeType(
                     optionalATName );
                 if ( optionalAT == null )
                 {
@@ -964,13 +964,13 @@ public class SchemaChecker
         {
             for ( Object object : deps )
             {
-                if ( object instanceof AttributeTypeImpl )
+                if ( object instanceof AttributeType )
                 {
-                    checkAttributeType( ( AttributeTypeImpl ) object );
+                    checkAttributeType( ( AttributeType ) object );
                 }
-                else if ( object instanceof ObjectClassImpl )
+                else if ( object instanceof ObjectClass )
                 {
-                    checkObjectClass( ( ObjectClassImpl ) object );
+                    checkObjectClass( ( ObjectClass ) object );
                 }
             }
         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorSchemaCheckerLabelDecorator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorSchemaCheckerLabelDecorator.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorSchemaCheckerLabelDecorator.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorSchemaCheckerLabelDecorator.java Wed Jan 26 19:25:22 2011
@@ -22,10 +22,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.model.Schema;
 import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaChecker;
 import org.apache.directory.studio.schemaeditor.view.wrappers.AttributeTypeWrapper;
@@ -57,7 +57,7 @@ public class SchemaEditorSchemaCheckerLa
 
         if ( element instanceof AttributeTypeWrapper )
         {
-            AttributeTypeImpl at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
+            AttributeType at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
 
             if ( schemaChecker.hasErrors( at ) )
             {
@@ -72,7 +72,7 @@ public class SchemaEditorSchemaCheckerLa
         }
         else if ( element instanceof ObjectClassWrapper )
         {
-            ObjectClassImpl oc = ( ( ObjectClassWrapper ) element ).getObjectClass();
+            ObjectClass oc = ( ( ObjectClassWrapper ) element ).getObjectClass();
 
             if ( schemaChecker.hasErrors( oc ) )
             {
@@ -89,7 +89,7 @@ public class SchemaEditorSchemaCheckerLa
         {
             Schema schema = ( ( SchemaWrapper ) element ).getSchema();
 
-            for ( AttributeTypeImpl at : schema.getAttributeTypes() )
+            for ( AttributeType at : schema.getAttributeTypes() )
             {
                 if ( schemaChecker.hasErrors( at ) )
                 {
@@ -103,7 +103,7 @@ public class SchemaEditorSchemaCheckerLa
                 }
             }
 
-            for ( ObjectClassImpl oc : schema.getObjectClasses() )
+            for ( ObjectClass oc : schema.getObjectClasses() )
             {
                 if ( schemaChecker.hasErrors( oc ) )
                 {
@@ -180,7 +180,7 @@ public class SchemaEditorSchemaCheckerLa
             {
                 if ( child instanceof AttributeTypeWrapper )
                 {
-                    AttributeTypeImpl at = ( ( AttributeTypeWrapper ) child ).getAttributeType();
+                    AttributeType at = ( ( AttributeTypeWrapper ) child ).getAttributeType();
 
                     if ( schemaChecker.hasWarnings( at ) )
                     {
@@ -196,7 +196,7 @@ public class SchemaEditorSchemaCheckerLa
                 }
                 else if ( child instanceof ObjectClassWrapper )
                 {
-                    ObjectClassImpl oc = ( ( ObjectClassWrapper ) child ).getObjectClass();
+                    ObjectClass oc = ( ( ObjectClassWrapper ) child ).getObjectClass();
 
                     if ( schemaChecker.hasWarnings( oc ) )
                     {
@@ -235,7 +235,7 @@ public class SchemaEditorSchemaCheckerLa
             {
                 if ( child instanceof AttributeTypeWrapper )
                 {
-                    AttributeTypeImpl at = ( ( AttributeTypeWrapper ) child ).getAttributeType();
+                    AttributeType at = ( ( AttributeTypeWrapper ) child ).getAttributeType();
 
                     if ( schemaChecker.hasErrors( at ) )
                     {
@@ -251,7 +251,7 @@ public class SchemaEditorSchemaCheckerLa
                 }
                 else if ( child instanceof ObjectClassWrapper )
                 {
-                    ObjectClassImpl oc = ( ( ObjectClassWrapper ) child ).getObjectClass();
+                    ObjectClass oc = ( ( ObjectClassWrapper ) child ).getObjectClass();
 
                     if ( schemaChecker.hasErrors( oc ) )
                     {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java?rev=1063841&r1=1063840&r2=1063841&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java Wed Jan 26 19:25:22 2011
@@ -20,12 +20,12 @@
 package org.apache.directory.studio.schemaeditor.view;
 
 
+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.UsageEnum;
 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.wrappers.AttributeTypeWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.ObjectClassWrapper;
 import org.eclipse.jface.viewers.IDecoration;
@@ -80,9 +80,9 @@ public class SchemaEditorTypeLabelDecora
                     PluginConstants.IMG_OBJECT_CLASS_OVERLAY_AUXILIARY ), IDecoration.BOTTOM_RIGHT );
             }
         }
-        else if ( element instanceof AttributeTypeImpl )
+        else if ( element instanceof AttributeType )
         {
-            UsageEnum usage = ( ( AttributeTypeImpl ) element ).getUsage();
+            UsageEnum usage = ( ( AttributeType ) element ).getUsage();
             if ( usage == UsageEnum.USER_APPLICATIONS )
             {
                 decoration.addOverlay( Activator.getDefault().getImageDescriptor(
@@ -95,9 +95,9 @@ public class SchemaEditorTypeLabelDecora
                     PluginConstants.IMG_ATTRIBUTE_TYPE_OVERLAY_OPERATION ), IDecoration.BOTTOM_RIGHT );
             }
         }
-        else if ( element instanceof ObjectClassImpl )
+        else if ( element instanceof ObjectClass )
         {
-            ObjectClassTypeEnum classType = ( ( ObjectClassImpl ) element ).getType();
+            ObjectClassTypeEnum classType = ( ( ObjectClass ) element ).getType();
             if ( classType == ObjectClassTypeEnum.ABSTRACT )
             {
                 decoration.addOverlay( Activator.getDefault().getImageDescriptor(



Mime
View raw message