directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1005807 - in /directory/studio/branches/shared-trunk-merge/plugins: ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema...
Date Fri, 08 Oct 2010 12:41:21 GMT
Author: pamarcelot
Date: Fri Oct  8 12:41:20 2010
New Revision: 1005807

URL: http://svn.apache.org/viewvc?rev=1005807&view=rev
Log:
Moved the methods used to the new Schema API.
Fixed a few NPEs in the Schema Browser of the LDAP Browser.

Modified:
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
    directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
    directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
Fri Oct  8 12:41:20 2010
@@ -267,7 +267,7 @@ public class AttributeDescription implem
         if ( myAtd != otherAtd )
         {
             AttributeType superiorAtd = null;
-            String superiorName = myAtd.getSuperiorName();
+            String superiorName = myAtd.getSuperiorOid();
             while ( superiorName != null )
             {
                 superiorAtd = schema.getAttributeTypeDescription( superiorName );
@@ -275,7 +275,7 @@ public class AttributeDescription implem
                 {
                     break;
                 }
-                superiorName = superiorAtd.getSuperiorName();
+                superiorName = superiorAtd.getSuperiorOid();
             }
             if ( superiorAtd != otherAtd )
             {

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
Fri Oct  8 12:41:20 2010
@@ -320,9 +320,9 @@ public class Schema
             }
 
             // assume all received matching rules in attributes are valid -> create pseudo
matching rules if missing
-            String emr = atd.getEqualityName();
-            String omr = atd.getOrderingName();
-            String smr = atd.getSubstringName();
+            String emr = atd.getEqualityOid();
+            String omr = atd.getOrderingOid();
+            String smr = atd.getSubstringOid();
             checkMatchingRules( emr, omr, smr );
         }
 
@@ -484,7 +484,12 @@ public class Schema
      */
     public boolean hasObjectClassDescription( String nameOrOid )
     {
-        return ocdMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() );
+        if ( nameOrOid != null )
+        {
+            return ocdMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() );
+        }
+
+        return false;
     }
 
 
@@ -565,7 +570,12 @@ public class Schema
      */
     public boolean hasAttributeTypeDescription( String nameOrOid )
     {
-        return atdMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() );
+        if ( nameOrOid != null )
+        {
+            return atdMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() );
+        }
+
+        return false;
     }
 
 
@@ -643,7 +653,12 @@ public class Schema
      */
     public boolean hasLdapSyntaxDescription( String numericOid )
     {
-        return lsdMapByNumericOid.containsKey( numericOid.toLowerCase() );
+        if ( numericOid != null )
+        {
+            return lsdMapByNumericOid.containsKey( numericOid.toLowerCase() );
+        }
+
+        return false;
     }
 
 
@@ -724,7 +739,12 @@ public class Schema
      */
     public boolean hasMatchingRuleDescription( String nameOrOid )
     {
-        return mrdMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() );
+        if ( nameOrOid != null )
+        {
+            return mrdMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() );
+        }
+
+        return false;
     }
 
 
@@ -803,7 +823,12 @@ public class Schema
      */
     public boolean hasMatchingRuleUseDescription( String nameOrOid )
     {
-        return mrudMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() );
+        if ( nameOrOid != null )
+        {
+            return mrudMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() );
+        }
+
+        return false;
     }
 
 

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
Fri Oct  8 12:41:20 2010
@@ -576,14 +576,14 @@ public class SchemaUtils
      */
     public static String getEqualityMatchingRuleNameOrNumericOidTransitive( AttributeType
atd, Schema schema )
     {
-        if ( atd.getEqualityName() != null )
+        if ( atd.getEqualityOid() != null )
         {
-            return atd.getEqualityName();
+            return atd.getEqualityOid();
         }
 
-        if ( atd.getSuperiorName() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorName() ) )
+        if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorName()
);
+            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorOid()
);
             return getEqualityMatchingRuleNameOrNumericOidTransitive( superior, schema );
         }
 
@@ -603,14 +603,14 @@ public class SchemaUtils
      */
     public static String getSubstringMatchingRuleNameOrNumericOidTransitive( AttributeType
atd, Schema schema )
     {
-        if ( atd.getSubstringName() != null )
+        if ( atd.getSubstringOid() != null )
         {
-            return atd.getSubstringName();
+            return atd.getSubstringOid();
         }
 
-        if ( atd.getSuperiorName() != null && schema.hasAttributeTypeDescription(
atd.getSubstringName() ) )
+        if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription(
atd.getSubstringOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSubstringName()
);
+            AttributeType superior = schema.getAttributeTypeDescription( atd.getSubstringOid()
);
             return getSubstringMatchingRuleNameOrNumericOidTransitive( superior, schema );
         }
 
@@ -630,14 +630,14 @@ public class SchemaUtils
      */
     public static String getOrderingMatchingRuleNameOrNumericOidTransitive( AttributeType
atd, Schema schema )
     {
-        if ( atd.getOrderingName() != null )
+        if ( atd.getOrderingOid() != null )
         {
-            return atd.getOrderingName();
+            return atd.getOrderingOid();
         }
 
-        if ( atd.getSuperiorName() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorName() ) )
+        if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorName()
);
+            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorOid()
);
             return getOrderingMatchingRuleNameOrNumericOidTransitive( superior, schema );
         }
 
@@ -662,9 +662,9 @@ public class SchemaUtils
             return atd.getSyntaxName();
         }
 
-        if ( atd.getSuperiorName() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorName() ) )
+        if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorName()
);
+            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorOid()
);
             return getSyntaxNumericOidTransitive( superior, schema );
         }
 
@@ -689,9 +689,9 @@ public class SchemaUtils
             return atd.getSyntaxLength();
         }
 
-        if ( atd.getSuperiorName() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorName() ) )
+        if ( atd.getSuperiorOid() != null && schema.hasAttributeTypeDescription(
atd.getSuperiorOid() ) )
         {
-            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorName()
);
+            AttributeType superior = schema.getAttributeTypeDescription( atd.getSuperiorOid()
);
             return getSyntaxLengthTransitive( superior, schema );
         }
 
@@ -742,7 +742,7 @@ public class SchemaUtils
         Set<AttributeType> derivedAtds = new TreeSet<AttributeType>( schemaElementNameComparator
);
         for ( AttributeType derivedAtd : schema.getAttributeTypeDescriptions() )
         {
-            String superType = derivedAtd.getSuperiorName();
+            String superType = derivedAtd.getSuperiorOid();
             if ( superType != null && getLowerCaseIdentifiers( atd ).contains( superType.toLowerCase()
) )
             {
                 derivedAtds.add( derivedAtd );

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
Fri Oct  8 12:41:20 2010
@@ -592,7 +592,7 @@ public class AttributeTypeDescriptionDet
         // or a dash if no supertype exists.
         if ( atd != null )
         {
-            String superType = atd.getSuperiorName();
+            String superType = atd.getSuperiorOid();
             if ( superType != null )
             {
                 supertypeSection.setText( NLS.bind( Messages

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
Fri Oct  8 12:41:20 2010
@@ -121,17 +121,17 @@ public class AttributeTypeImpl extends A
             }
 
             // Superior
-            if ( ( getSuperiorName() == null ) && ( at.getSuperiorName() != null
) )
+            if ( ( getSuperiorOid() == null ) && ( at.getSuperiorOid() != null )
)
             {
                 return false;
             }
-            else if ( ( getSuperiorName() != null ) && ( at.getSuperiorName() ==
null ) )
+            else if ( ( getSuperiorOid() != null ) && ( at.getSuperiorOid() == null
) )
             {
                 return false;
             }
-            else if ( ( getSuperiorName() != null ) && ( at.getSuperiorName() !=
null ) )
+            else if ( ( getSuperiorOid() != null ) && ( at.getSuperiorOid() != null
) )
             {
-                if ( !getSuperiorName().equals( at.getSuperiorName() ) )
+                if ( !getSuperiorOid().equals( at.getSuperiorOid() ) )
                 {
                     return false;
                 }
@@ -202,51 +202,51 @@ public class AttributeTypeImpl extends A
             }
 
             // Equality matching rule
-            if ( ( getEqualityName() == null ) && ( at.getEqualityName() != null
) )
+            if ( ( getEqualityOid() == null ) && ( at.getEqualityOid() != null )
)
             {
                 return false;
             }
-            else if ( ( getEqualityName() != null ) && ( at.getEqualityName() ==
null ) )
+            else if ( ( getEqualityOid() != null ) && ( at.getEqualityOid() == null
) )
             {
                 return false;
             }
-            else if ( ( getEqualityName() != null ) && ( at.getEqualityName() !=
null ) )
+            else if ( ( getEqualityOid() != null ) && ( at.getEqualityOid() != null
) )
             {
-                if ( !getEqualityName().equals( at.getEqualityName() ) )
+                if ( !getEqualityOid().equals( at.getEqualityOid() ) )
                 {
                     return false;
                 }
             }
 
             // Ordering matching rule
-            if ( ( getOrderingName() == null ) && ( at.getOrderingName() != null
) )
+            if ( ( getOrderingOid() == null ) && ( at.getOrderingOid() != null )
)
             {
                 return false;
             }
-            else if ( ( getOrderingName() != null ) && ( at.getOrderingName() ==
null ) )
+            else if ( ( getOrderingOid() != null ) && ( at.getOrderingOid() == null
) )
             {
                 return false;
             }
-            else if ( ( getOrderingName() != null ) && ( at.getOrderingName() !=
null ) )
+            else if ( ( getOrderingOid() != null ) && ( at.getOrderingOid() != null
) )
             {
-                if ( !getOrderingName().equals( at.getOrderingName() ) )
+                if ( !getOrderingOid().equals( at.getOrderingOid() ) )
                 {
                     return false;
                 }
             }
 
             // Substring matching rule
-            if ( ( getSubstringName() == null ) && ( at.getSubstringName() != null
) )
+            if ( ( getSubstringOid() == null ) && ( at.getSubstringOid() != null
) )
             {
                 return false;
             }
-            else if ( ( getSubstringName() != null ) && ( at.getSubstringName() ==
null ) )
+            else if ( ( getSubstringOid() != null ) && ( at.getSubstringOid() ==
null ) )
             {
                 return false;
             }
-            else if ( ( getSubstringName() != null ) && ( at.getSubstringName() !=
null ) )
+            else if ( ( getSubstringOid() != null ) && ( at.getSubstringOid() !=
null ) )
             {
-                if ( !getSubstringName().equals( at.getSubstringName() ) )
+                if ( !getSubstringOid().equals( at.getSubstringOid() ) )
                 {
                     return false;
                 }

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
Fri Oct  8 12:41:20 2010
@@ -122,7 +122,7 @@ public class DependenciesComputer
         throws DependencyComputerException
     {
         // Superior
-        String superior = attributeType.getSuperiorName();
+        String superior = attributeType.getSuperiorOid();
         if ( superior != null )
         {
             AttributeTypeImpl superiorAT = schemaHandler.getAttributeType( superior );
@@ -162,7 +162,7 @@ public class DependenciesComputer
         }
 
         // Equality Matching Rule
-        String equalityName = attributeType.getEqualityName();
+        String equalityName = attributeType.getEqualityOid();
         if ( equalityName != null )
         {
             MatchingRuleImpl equalityMatchingRule = schemaHandler.getMatchingRule( equalityName
);
@@ -182,7 +182,7 @@ public class DependenciesComputer
         }
 
         // Ordering Matching Rule
-        String orderingName = attributeType.getEqualityName();
+        String orderingName = attributeType.getOrderingOid();
         if ( orderingName != null )
         {
             MatchingRuleImpl orderingMatchingRule = schemaHandler.getMatchingRule( orderingName
);
@@ -202,7 +202,7 @@ public class DependenciesComputer
         }
 
         // Substring Matching Rule
-        String substringName = attributeType.getEqualityName();
+        String substringName = attributeType.getSubstringOid();
         if ( substringName != null )
         {
             MatchingRuleImpl substringMatchingRule = schemaHandler.getMatchingRule( substringName
);

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
Fri Oct  8 12:41:20 2010
@@ -690,8 +690,8 @@ public class DifferenceEngine
      */
     private static PropertyDifference getSuperiorDifference( AttributeTypeImpl at1, AttributeTypeImpl
at2 )
     {
-        String at1Superior = at1.getSuperiorName();
-        String at2Superior = at2.getSuperiorName();
+        String at1Superior = at1.getSuperiorOid();
+        String at2Superior = at2.getSuperiorOid();
 
         if ( ( at1Superior == null ) && ( at2Superior != null ) )
         {

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
Fri Oct  8 12:41:20 2010
@@ -79,7 +79,7 @@ public class HierarchyManager
         // Checking Aliases and OID
         checkAliasesAndOID( at );
 
-        String superiorName = at.getSuperiorName();
+        String superiorName = at.getSuperiorOid();
         if ( superiorName != null )
         // The attribute type has a superior
         {
@@ -407,7 +407,7 @@ public class HierarchyManager
     private void removeAttributeType( AttributeTypeImpl at )
     {
         // Removing the attribute type as child of its superior
-        String superiorName = at.getSuperiorName();
+        String superiorName = at.getSuperiorOid();
         if ( ( superiorName != null ) && ( !"".equals( superiorName ) ) ) //$NON-NLS-1$
         {
             AttributeTypeImpl superiorAT = schemaHandler.getAttributeType( superiorName );
@@ -437,7 +437,7 @@ public class HierarchyManager
 
                 parentsMap.put( child, root );
                 childrenMap.put( root, child );
-                String childSuperiorName = childAT.getSuperiorName();
+                String childSuperiorName = childAT.getSuperiorOid();
                 if ( ( childSuperiorName != null ) && ( !"".equals( childSuperiorName
) ) ) //$NON-NLS-1$
                 {
                     parentsMap.put( child, childSuperiorName.toLowerCase() );

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
Fri Oct  8 12:41:20 2010
@@ -114,21 +114,21 @@ public class OpenLdapSchemaFileExporter
         }
 
         // SUP
-        if ( ( at.getSuperiorName() != null ) && ( !at.getSuperiorName().equals(
"" ) ) ) //$NON-NLS-1$
+        if ( ( at.getSuperiorOid() != null ) && ( !at.getSuperiorOid().equals( ""
) ) ) //$NON-NLS-1$
         {
-            sb.append( "\tSUP " + at.getSuperiorName() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
+            sb.append( "\tSUP " + at.getSuperiorOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
         // EQUALITY
-        if ( ( at.getEqualityName() != null ) && ( !at.getEqualityName().equals(
"" ) ) ) //$NON-NLS-1$
+        if ( ( at.getEqualityOid() != null ) && ( !at.getEqualityOid().equals( ""
) ) ) //$NON-NLS-1$
         {
-            sb.append( "\tEQUALITY " + at.getEqualityName() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
+            sb.append( "\tEQUALITY " + at.getEqualityOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
         // ORDERING
-        if ( ( at.getOrderingName() != null ) && ( !at.getOrderingName().equals(
"" ) ) ) //$NON-NLS-1$
+        if ( ( at.getOrderingOid() != null ) && ( !at.getOrderingOid().equals( ""
) ) ) //$NON-NLS-1$
         {
-            sb.append( "\tORDERING " + at.getOrderingName() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
+            sb.append( "\tORDERING " + at.getOrderingOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
         // SUBSTR

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
Fri Oct  8 12:41:20 2010
@@ -277,7 +277,7 @@ public class XMLSchemaFileExporter
         }
 
         // Superior
-        String superior = at.getSuperiorName();
+        String superior = at.getSuperiorOid();
         if ( ( superior != null ) && ( !superior.equals( "" ) ) ) //$NON-NLS-1$
         {
             atNode.addElement( SUPERIOR_TAG ).setText( superior );

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
Fri Oct  8 12:41:20 2010
@@ -470,7 +470,7 @@ public class SchemaChecker
         }
 
         // Checking superior
-        String superior = at.getSuperiorName();
+        String superior = at.getSuperiorOid();
         if ( ( superior != null ) && ( !"".equals( superior ) ) )
         {
             AttributeTypeImpl superiorAT = Activator.getDefault().getSchemaHandler().getAttributeType(
superior );

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboContentProvider.java
Fri Oct  8 12:41:20 2010
@@ -126,7 +126,7 @@ public class ATESuperiorComboContentProv
         }
         else
         {
-            String sup = at1.getSuperiorName();
+            String sup = at1.getSuperiorOid();
 
             if ( sup == null )
             {

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
Fri Oct  8 12:41:20 2010
@@ -983,7 +983,7 @@ public class AttributeTypeEditorOverview
     {
         supComboViewer.setInput( new ATESuperiorComboInput( originalAttributeType ) );
 
-        String supAtName = modifiedAttributeType.getSuperiorName();
+        String supAtName = modifiedAttributeType.getSuperiorOid();
         if ( supAtName == null )
         {
             supComboViewer.setSelection( new StructuredSelection( new NonExistingAttributeType(

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
Fri Oct  8 12:41:20 2010
@@ -734,7 +734,7 @@ public class SearchView extends ViewPart
                         // Superior
                         if ( searchScope.contains( SearchInEnum.SUPERIOR ) )
                         {
-                            if ( checkString( pattern, at.getSuperiorName() ) )
+                            if ( checkString( pattern, at.getSuperiorOid() ) )
                             {
                                 searchResults.add( at );
                                 continue;

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
Fri Oct  8 12:41:20 2010
@@ -469,7 +469,7 @@ public class ExportSchemasForADSWizard e
         for ( AttributeTypeImpl at : schema.getAttributeTypes() )
         {
             // Superior
-            String supName = at.getSuperiorName();
+            String supName = at.getSuperiorOid();
             if ( supName != null )
             {
                 AttributeTypeImpl sup = schemaHandler.getAttributeType( supName );

Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java?rev=1005807&r1=1005806&r2=1005807&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
(original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
Fri Oct  8 12:41:20 2010
@@ -335,7 +335,7 @@ public class MergeSchemasWizard extends 
                 // merge dependencies: super attribute type
                 if ( mergeDependencies )
                 {
-                    String superiorName = clonedAttributeType.getSuperiorName();
+                    String superiorName = clonedAttributeType.getSuperiorOid();
                     if ( superiorName != null )
                     {
                         AttributeTypeImpl superiorAttributeType = sourceAttributeType.getSchemaObject().getProject()



Mime
View raw message