directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r657437 [1/2] - in /directory/studio/trunk: ./ aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ jars/META-INF/ schemaeditor/META-INF/ schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/ schemaedi...
Date Sat, 17 May 2008 19:38:12 GMT
Author: seelmann
Date: Sat May 17 12:38:10 2008
New Revision: 657437

URL: http://svn.apache.org/viewvc?rev=657437&view=rev
Log:
o Bumped up to shared 0.9.11-SNAPSHOT
o Fixed API changes


Modified:
    directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
    directory/studio/trunk/jars/META-INF/MANIFEST.MF
    directory/studio/trunk/pom.xml
    directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java
    directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java
    directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java

Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java (original)
+++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java Sat May 17 12:38:10 2008
@@ -35,6 +35,7 @@
 import org.apache.directory.shared.ldap.aci.ACIItemParser;
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.aci.UserFirstACIItem;
+import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.apache.directory.studio.valueeditors.AbstractDialogStringValueEditor;
 import org.eclipse.osgi.util.NLS;
@@ -166,7 +167,7 @@
         if ( userClass.getClass() == UserClass.Name.class )
         {
             UserClass.Name name = ( UserClass.Name ) userClass;
-            Set<Name> jndiNames = name.getNames();
+            Set<LdapDN> jndiNames = name.getNames();
             for ( Name jndiName : jndiNames )
             {
                 values.add( jndiName.toString() );
@@ -175,7 +176,7 @@
         else if ( userClass.getClass() == UserClass.UserGroup.class )
         {
             UserClass.UserGroup userGrops = ( UserClass.UserGroup ) userClass;
-            Set<Name> jndiNames = userGrops.getNames();
+            Set<LdapDN> jndiNames = userGrops.getNames();
             for ( Name jndiName : jndiNames )
             {
                 values.add( jndiName.toString() );

Modified: directory/studio/trunk/jars/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/jars/META-INF/MANIFEST.MF?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/jars/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/jars/META-INF/MANIFEST.MF Sat May 17 12:38:10 2008
@@ -142,8 +142,8 @@
  lib/commons-lang-2.3.jar,
  lib/dom4j-1.6.1.jar,
  lib/nlog4j-1.2.25.jar,
- lib/shared-asn1-0.9.8.jar,
- lib/shared-ldap-0.9.8.jar,
- lib/shared-ldap-constants-0.9.8.jar,
- lib/studio-dsml-parser-0.4.1.SNAPSHOT.jar,
+ lib/shared-asn1-0.9.11-SNAPSHOT.jar,
+ lib/shared-ldap-0.9.11-SNAPSHOT.jar,
+ lib/shared-ldap-constants-0.9.11-SNAPSHOT.jar,
+ lib/studio-dsml-parser-0.4.2.SNAPSHOT.jar,
  lib/xpp3-1.1.3.4.O.jar

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Sat May 17 12:38:10 2008
@@ -1608,17 +1608,17 @@
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap</artifactId>
-        <version>0.9.8</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-asn1</artifactId>
-        <version>0.9.8</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-converter</artifactId>
-        <version>0.9.8</version>
+        <version>0.9.11-SNAPSHOT</version>
       </dependency>
 
       <!-- Other dependencies -->

Modified: directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF Sat May 17 12:38:10 2008
@@ -18,4 +18,4 @@
 Export-Package: org.apache.directory.studio.schemaeditor.model,
  org.apache.directory.studio.schemaeditor.model.io
 Bundle-ClassPath: .,
- lib/shared-converter-0.9.8.jar
+ lib/shared-converter-0.9.11-SNAPSHOT.jar

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java Sat May 17 12:38:10 2008
@@ -91,7 +91,7 @@
     public static AttributeTypeImpl getClone( AttributeTypeImpl at )
     {
         AttributeTypeImpl clone = new AttributeTypeImpl( at.getOid() );
-        clone.setNames( at.getNames() );
+        clone.setNames( at.getNamesRef() );
         clone.setSchema( at.getSchema() );
         clone.setDescription( at.getDescription() );
         clone.setSuperiorName( at.getSuperiorName() );
@@ -121,7 +121,7 @@
     public static ObjectClassImpl getClone( ObjectClassImpl oc )
     {
         ObjectClassImpl clone = new ObjectClassImpl( oc.getOid() );
-        clone.setNames( oc.getNames() );
+        clone.setNames( oc.getNamesRef() );
         clone.setSchema( oc.getSchema() );
         clone.setDescription( oc.getDescription() );
         clone.setSuperClassesNames( oc.getSuperClassesNames() );

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java Sat May 17 12:38:10 2008
@@ -525,7 +525,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) object;
             attributeTypesList.add( at );
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -539,7 +539,7 @@
         {
             MatchingRuleImpl mr = ( MatchingRuleImpl ) object;
             matchingRulesList.add( mr );
-            String[] names = mr.getNames();
+            String[] names = mr.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -553,7 +553,7 @@
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) object;
             objectClassesList.add( oc );
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -567,7 +567,7 @@
         {
             SyntaxImpl syntax = ( SyntaxImpl ) object;
             syntaxesList.add( syntax );
-            String[] names = syntax.getNames();
+            String[] names = syntax.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -632,7 +632,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) object;
             attributeTypesList.remove( at );
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( names != null )
             {
                 for ( String name : names )
@@ -646,10 +646,10 @@
         {
             MatchingRuleImpl mr = ( MatchingRuleImpl ) object;
             matchingRulesList.remove( mr );
-            String[] names = mr.getNames();
+            String[] names = mr.getNamesRef();
             if ( names != null )
             {
-                for ( String name : mr.getNames() )
+                for ( String name : names )
                 {
                     matchingRulesMap.remove( name.toLowerCase() );
                 }
@@ -660,10 +660,10 @@
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) object;
             objectClassesList.remove( oc );
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( names != null )
             {
-                for ( String name : oc.getNames() )
+                for ( String name : names )
                 {
                     objectClassesMap.remove( name.toLowerCase() );
                 }
@@ -674,10 +674,10 @@
         {
             SyntaxImpl syntax = ( SyntaxImpl ) object;
             syntaxesList.remove( syntax );
-            String[] names = syntax.getNames();
+            String[] names = syntax.getNamesRef();
             if ( names != null )
             {
-                for ( String name : syntax.getNames() )
+                for ( String name : names )
                 {
                     syntaxesMap.remove( name.toLowerCase() );
                 }
@@ -725,7 +725,7 @@
         removeSchemaObject( at1 );
 
         // Updating the attribute type
-        at1.setNames( at2.getNames() );
+        at1.setNames( at2.getNamesRef() );
         at1.setOid( at2.getOid() );
         at1.setDescription( at2.getDescription() );
         at1.setSuperiorName( at2.getSuperiorName() );
@@ -809,7 +809,7 @@
         removeSchemaObject( oc1 );
 
         // Updating the object class
-        oc1.setNames( oc2.getNames() );
+        oc1.setNames( oc2.getNamesRef() );
         oc1.setOid( oc2.getOid() );
         oc1.setDescription( oc2.getDescription() );
         oc1.setSuperClassesNames( oc2.getSuperClassesNames() );

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java Sat May 17 12:38:10 2008
@@ -357,17 +357,17 @@
             }
 
             // Aliases
-            if ( ( getNames() == null ) && ( at.getNames() != null ) )
+            if ( ( getNamesRef() == null ) && ( at.getNamesRef() != null ) )
             {
                 return false;
             }
-            else if ( ( getNames() != null ) && ( at.getNames() == null ) )
+            else if ( ( getNamesRef() != null ) && ( at.getNamesRef() == null ) )
             {
                 return false;
             }
-            else if ( ( getNames() != null ) && ( at.getNames() != null ) )
+            else if ( ( getNamesRef() != null ) && ( at.getNamesRef() != null ) )
             {
-                if ( !getNames().equals( at.getNames() ) )
+                if ( !getNamesRef().equals( at.getNamesRef() ) )
                 {
                     return false;
                 }

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java Sat May 17 12:38:10 2008
@@ -307,17 +307,17 @@
             }
 
             // Aliases
-            if ( ( getNames() == null ) && ( oc.getNames() != null ) )
+            if ( ( getNamesRef() == null ) && ( oc.getNamesRef() != null ) )
             {
                 return false;
             }
-            else if ( ( getNames() != null ) && ( oc.getNames() == null ) )
+            else if ( ( getNamesRef() != null ) && ( oc.getNamesRef() == null ) )
             {
                 return false;
             }
-            else if ( ( getNames() != null ) && ( oc.getNames() != null ) )
+            else if ( ( getNamesRef() != null ) && ( oc.getNamesRef() != null ) )
             {
-                if ( !getNames().equals( oc.getNames() ) )
+                if ( !getNamesRef().equals( oc.getNamesRef() ) )
                 {
                     return false;
                 }

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SchemaImpl.java Sat May 17 12:38:10 2008
@@ -103,7 +103,7 @@
     {
         for ( AttributeTypeImpl at : attributeTypes )
         {
-            String[] aliases = at.getNames();
+            String[] aliases = at.getNamesRef();
             if ( aliases != null )
             {
                 for ( String alias : aliases )
@@ -140,7 +140,7 @@
     {
         for ( MatchingRuleImpl mr : matchingRules )
         {
-            String[] aliases = mr.getNames();
+            String[] aliases = mr.getNamesRef();
             if ( aliases != null )
             {
                 for ( String alias : aliases )
@@ -186,7 +186,7 @@
     {
         for ( ObjectClassImpl oc : objectClasses )
         {
-            String[] aliases = oc.getNames();
+            String[] aliases = oc.getNamesRef();
             if ( aliases != null )
             {
                 for ( String alias : aliases )
@@ -223,7 +223,7 @@
     {
         for ( SyntaxImpl syntax : syntaxes )
         {
-            String[] aliases = syntax.getNames();
+            String[] aliases = syntax.getNamesRef();
             if ( aliases != null )
             {
                 for ( String alias : aliases )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java Sat May 17 12:38:10 2008
@@ -404,7 +404,7 @@
     {
         List<PropertyDifference> differences = new ArrayList<PropertyDifference>();
 
-        String[] so1Names = so1.getNames();
+        String[] so1Names = so1.getNamesRef();
         List<String> so1NamesList = new ArrayList<String>();
         if ( so1Names != null )
         {
@@ -414,7 +414,7 @@
             }
         }
 
-        String[] so2Names = so2.getNames();
+        String[] so2Names = so2.getNamesRef();
         List<String> so2NamesList = new ArrayList<String>();
         if ( so2Names != null )
         {

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java Sat May 17 12:38:10 2008
@@ -233,7 +233,7 @@
     private void checkAliasesAndOID( SchemaObject object )
     {
         // Aliases
-        String[] aliases = object.getNames();
+        String[] aliases = object.getNamesRef();
         if ( aliases != null )
         {
             for ( String alias : aliases )
@@ -538,7 +538,7 @@
     {
         if ( childSuperClassesNames != null )
         {
-            List<String> aliases = Arrays.asList( oc.getNames() );
+            List<String> aliases = Arrays.asList( oc.getNamesRef() );
             if ( aliases != null )
             {
                 for ( String childSuperClassName : childSuperClassesNames )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java Sat May 17 12:38:10 2008
@@ -81,7 +81,7 @@
         sb.append( "attributetype ( " + at.getOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
 
         // NAME(S)
-        String[] names = at.getNames();
+        String[] names = at.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             sb.append( "\tNAME " ); //$NON-NLS-1$
@@ -211,7 +211,7 @@
         sb.append( "objectclass ( " + oc.getOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
 
         // NAME(S)
-        String[] names = oc.getNames();
+        String[] names = oc.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             sb.append( "\tNAME " ); //$NON-NLS-1$

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Sat May 17 12:38:10 2008
@@ -240,7 +240,7 @@
         }
 
         // Aliases
-        String[] aliases = at.getNames();
+        String[] aliases = at.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length >= 1 ) )
         {
             Element aliasesNode = atNode.addElement( ALIASES_TAG );
@@ -368,7 +368,7 @@
         }
 
         // Aliases
-        String[] aliases = oc.getNames();
+        String[] aliases = oc.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length >= 1 ) )
         {
             Element aliasesNode = ocNode.addElement( ALIASES_TAG );
@@ -457,7 +457,7 @@
         }
 
         // Aliases
-        String[] aliases = mr.getNames();
+        String[] aliases = mr.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length >= 1 ) )
         {
             Element aliasesNode = mrNode.addElement( ALIASES_TAG );
@@ -516,7 +516,7 @@
         }
 
         // Aliases
-        String[] aliases = syntax.getNames();
+        String[] aliases = syntax.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length >= 1 ) )
         {
             Element aliasesNode = syntaxNode.addElement( ALIASES_TAG );

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Sat May 17 12:38:10 2008
@@ -357,7 +357,7 @@
         }
 
         // Checking aliases
-        String[] aliases = at.getNames();
+        String[] aliases = at.getNamesRef();
         if ( ( aliases == null ) || ( aliases.length == 0 ) )
         {
             SchemaWarning warning = new NoAliasWarning( at );
@@ -541,7 +541,7 @@
         }
 
         // Checking aliases
-        String[] aliases = oc.getNames();
+        String[] aliases = oc.getNamesRef();
         if ( ( aliases == null ) || ( aliases.length == 0 ) )
         {
             SchemaWarning warning = new NoAliasWarning( oc );
@@ -923,7 +923,7 @@
         }
 
         // Checking aliases
-        String[] aliases = sc.getNames();
+        String[] aliases = sc.getNamesRef();
         if ( ( aliases != null ) && ( aliases.length > 0 ) )
         {
             for ( String alias : aliases )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java Sat May 17 12:38:10 2008
@@ -89,8 +89,8 @@
             {
                 public int compare( AttributeTypeImpl at1, AttributeTypeImpl at2 )
                 {
-                    String[] at1Names = ( ( AttributeTypeImpl ) at1 ).getNames();
-                    String[] at2Names = ( ( AttributeTypeImpl ) at2 ).getNames();
+                    String[] at1Names = ( ( AttributeTypeImpl ) at1 ).getNamesRef();
+                    String[] at2Names = ( ( AttributeTypeImpl ) at2 ).getNamesRef();
 
                     if ( ( at1Names == null || at1Names.length == 0 ) && ( at2Names == null || at2Names.length == 0 ) )
                     {
@@ -116,7 +116,7 @@
             // Searching for all matching elements
             for ( AttributeTypeImpl at : atList )
             {
-                for ( String name : at.getNames() )
+                for ( String name : at.getNamesRef() )
                 {
                     Matcher m = pattern.matcher( name );
                     if ( m.matches() )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java Sat May 17 12:38:10 2008
@@ -61,7 +61,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) element;
 
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")";

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java Sat May 17 12:38:10 2008
@@ -89,8 +89,8 @@
             {
                 public int compare( ObjectClassImpl oc1, ObjectClassImpl oc2 )
                 {
-                    String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
-                    String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+                    String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
+                    String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
 
                     if ( ( oc1Names == null || oc1Names.length == 0 ) && ( oc2Names == null || oc2Names.length == 0 ) )
                     {
@@ -116,7 +116,7 @@
             // Searching for all matching elements
             for ( ObjectClassImpl oc : ocList )
             {
-                for ( String name : oc.getNames() )
+                for ( String name : oc.getNamesRef() )
                 {
                     Matcher m = pattern.matcher( name );
                     if ( m.matches() )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java Sat May 17 12:38:10 2008
@@ -61,7 +61,7 @@
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) element;
 
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + oc.getOid() + ")";

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java Sat May 17 12:38:10 2008
@@ -41,8 +41,8 @@
     {
         if ( o1 instanceof MatchingRuleImpl && o2 instanceof MatchingRuleImpl )
         {
-            String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
-            String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
+            String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNamesRef();
+            String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNamesRef();
 
             if ( ( mr1Names != null ) && ( mr2Names != null ) && ( mr1Names.length > 0 ) && ( mr2Names.length > 0 ) )
             {
@@ -51,7 +51,7 @@
         }
         else if ( o1 instanceof MatchingRuleImpl && o2 instanceof NonExistingMatchingRule )
         {
-            String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
+            String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNamesRef();
             String mr2Name = ( ( NonExistingMatchingRule ) o2 ).getName();
 
             if ( ( mr1Names != null ) && ( mr2Name != null ) && ( mr1Names.length > 0 ) )
@@ -62,7 +62,7 @@
         else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof MatchingRuleImpl )
         {
             String mr1Name = ( ( NonExistingMatchingRule ) o1 ).getName();
-            String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
+            String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNamesRef();
 
             if ( ( mr1Name != null ) && ( mr2Names != null ) && ( mr2Names.length > 0 ) )
             {

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java Sat May 17 12:38:10 2008
@@ -41,8 +41,8 @@
     {
         if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
         {
-            String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
-            String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+            String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
+            String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
             if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 ) && ( at2Names.length > 0 ) )
             {
@@ -51,7 +51,7 @@
         }
         else if ( o1 instanceof AttributeTypeImpl && o2 instanceof NonExistingAttributeType )
         {
-            String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+            String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
             String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
 
             if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.length > 0 ) )
@@ -62,7 +62,7 @@
         else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeTypeImpl )
         {
             String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
-            String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+            String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
             if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.length > 0 ) )
             {

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java Sat May 17 12:38:10 2008
@@ -43,7 +43,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) obj;
 
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")";

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java Sat May 17 12:38:10 2008
@@ -41,8 +41,8 @@
     {
         if ( o1 instanceof SyntaxImpl && o2 instanceof SyntaxImpl )
         {
-            String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNames();
-            String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNames();
+            String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNamesRef();
+            String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNamesRef();
 
             if ( ( syntax1Names != null ) && ( syntax2Names != null ) && ( syntax1Names.length > 0 )
                 && ( syntax2Names.length > 0 ) )
@@ -52,7 +52,7 @@
         }
         else if ( o1 instanceof SyntaxImpl && o2 instanceof NonExistingSyntax )
         {
-            String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNames();
+            String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNamesRef();
             String syntax2Name = ( ( NonExistingSyntax ) o2 ).getName();
 
             if ( ( syntax1Names != null ) && ( syntax2Name != null ) && ( syntax1Names.length > 0 ) )
@@ -63,7 +63,7 @@
         else if ( o1 instanceof NonExistingSyntax && o2 instanceof SyntaxImpl )
         {
             String syntax1Name = ( ( NonExistingSyntax ) o1 ).getName();
-            String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNames();
+            String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNamesRef();
 
             if ( ( syntax1Name != null ) && ( syntax2Names != null ) && ( syntax2Names.length > 0 ) )
             {

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java Sat May 17 12:38:10 2008
@@ -54,7 +54,7 @@
 
             List<String> names = new ArrayList<String>();
 
-            String[] atNames = inputAT.getNames();
+            String[] atNames = inputAT.getNamesRef();
             if ( atNames != null )
             {
                 for ( String name : atNames )
@@ -86,8 +86,8 @@
                 {
                     if ( oc1 instanceof ObjectClassImpl && oc1 instanceof ObjectClassImpl )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
-                        String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+                        String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
+                        String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
 
                         if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
                             && ( oc2Names.length > 0 ) )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java Sat May 17 12:38:10 2008
@@ -54,7 +54,7 @@
 
             List<String> names = new ArrayList<String>();
 
-            String[] atNames = inputAT.getNames();
+            String[] atNames = inputAT.getNamesRef();
             if ( atNames != null )
             {
                 for ( String name : atNames )
@@ -86,8 +86,8 @@
                 {
                     if ( oc1 instanceof ObjectClassImpl && oc1 instanceof ObjectClassImpl )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
-                        String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
+                        String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
+                        String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
 
                         if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
                             && ( oc2Names.length > 0 ) )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java Sat May 17 12:38:10 2008
@@ -60,7 +60,7 @@
     {
         if ( element instanceof ObjectClassImpl )
         {
-            return ViewUtils.concateAliases( ( ( ObjectClassImpl ) element ).getNames() );
+            return ViewUtils.concateAliases( ( ( ObjectClassImpl ) element ).getNamesRef() );
         }
 
         // Default

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java Sat May 17 12:38:10 2008
@@ -73,7 +73,7 @@
      */
     public String getName()
     {
-        String[] names = attributeType.getNames();
+        String[] names = attributeType.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             return names[0];

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Sat May 17 12:38:10 2008
@@ -259,7 +259,7 @@
     {
         public void widgetSelected( SelectionEvent e )
         {
-            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedAttributeType.getNames() );
+            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedAttributeType.getNamesRef() );
             if ( editDialog.open() != Window.OK )
             {
                 return;
@@ -267,9 +267,9 @@
             if ( editDialog.isDirty() )
             {
                 modifiedAttributeType.setNames( editDialog.getAliases() );
-                if ( ( modifiedAttributeType.getNames() != null ) && ( modifiedAttributeType.getNames().length != 0 ) )
+                if ( ( modifiedAttributeType.getNamesRef() != null ) && ( modifiedAttributeType.getNamesRef().length != 0 ) )
                 {
-                    aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNames() ) );
+                    aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNamesRef() ) );
                 }
                 else
                 {
@@ -391,7 +391,7 @@
             if ( selectedItem instanceof AttributeTypeImpl )
             {
                 AttributeTypeImpl at = ( AttributeTypeImpl ) selectedItem;
-                String[] names = at.getNames();
+                String[] names = at.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     modifiedAttributeType.setSuperiorName( names[0] );
@@ -843,9 +843,9 @@
     private void fillInUiFields()
     {
         // ALIASES Label
-        if ( ( modifiedAttributeType.getNames() != null ) && ( modifiedAttributeType.getNames().length != 0 ) )
+        if ( ( modifiedAttributeType.getNamesRef() != null ) && ( modifiedAttributeType.getNamesRef().length != 0 ) )
         {
-            aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNames() ) );
+            aliasesLabel.setText( ViewUtils.concateAliases( modifiedAttributeType.getNamesRef() ) );
         }
         else
         {

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java Sat May 17 12:38:10 2008
@@ -262,7 +262,7 @@
         // As Mandatory Attribute Section
         Section mandatoryAttributeSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
             | Section.TITLE_BAR );
-        String names[] = modifiedAttributeType.getNames();
+        String names[] = modifiedAttributeType.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             mandatoryAttributeSection.setDescription( "The attribute type" + " '" + ViewUtils.concateAliases( names )
@@ -305,7 +305,7 @@
         // Matching Rules Section
         Section optionalAttributeSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
             | Section.TITLE_BAR );
-        String names[] = modifiedAttributeType.getNames();
+        String names[] = modifiedAttributeType.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             optionalAttributeSection.setDescription( "The attribute type" + " '" + ViewUtils.concateAliases( names )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java Sat May 17 12:38:10 2008
@@ -84,8 +84,8 @@
                 {
                     if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
                     {
-                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
-                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
+                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
                         if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 )
                             && ( at2Names.length > 0 ) )
@@ -95,7 +95,7 @@
                     }
                     else if ( o1 instanceof AttributeTypeImpl && o2 instanceof NonExistingAttributeType )
                     {
-                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
                         String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
 
                         if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.length > 0 ) )
@@ -106,7 +106,7 @@
                     else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeTypeImpl )
                     {
                         String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
-                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
                         if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.length > 0 ) )
                         {

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java Sat May 17 12:38:10 2008
@@ -63,7 +63,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) element;
 
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")";

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java Sat May 17 12:38:10 2008
@@ -71,7 +71,7 @@
      */
     public String getName()
     {
-        String[] names = objectClass.getNames();
+        String[] names = objectClass.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             return names[0];

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Sat May 17 12:38:10 2008
@@ -266,7 +266,7 @@
     {
         public void widgetSelected( SelectionEvent e )
         {
-            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedObjectClass.getNames() );
+            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedObjectClass.getNamesRef() );
             if ( editDialog.open() != Window.OK )
             {
                 return;
@@ -274,9 +274,9 @@
             if ( editDialog.isDirty() )
             {
                 modifiedObjectClass.setNames( editDialog.getAliases() );
-                if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().length != 0 ) )
+                if ( ( modifiedObjectClass.getNamesRef() != null ) && ( modifiedObjectClass.getNamesRef().length != 0 ) )
                 {
-                    aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNames() ) );
+                    aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNamesRef() ) );
                 }
                 else
                 {
@@ -477,7 +477,7 @@
                     newMusts.add( must );
                 }
             }
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 newMusts.add( names[0] );
@@ -516,7 +516,7 @@
 
                 if ( selectedElement instanceof AttributeTypeImpl )
                 {
-                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNames() )
+                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNamesRef() )
                     {
                         newMusts.remove( name );
                     }
@@ -614,7 +614,7 @@
                     newMays.add( may );
                 }
             }
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 newMays.add( names[0] );
@@ -653,7 +653,7 @@
 
                 if ( selectedElement instanceof AttributeTypeImpl )
                 {
-                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNames() )
+                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNamesRef() )
                     {
                         newMays.remove( name );
                     }
@@ -745,7 +745,7 @@
             {
                 superiors.add( sup );
             }
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 superiors.add( names[0] );
@@ -784,7 +784,7 @@
 
                 if ( selectedElement instanceof ObjectClassImpl )
                 {
-                    for ( String name : ( ( ObjectClassImpl ) selectedElement ).getNames() )
+                    for ( String name : ( ( ObjectClassImpl ) selectedElement ).getNamesRef() )
                     {
                         superiors.remove( name );
                     }
@@ -1036,9 +1036,9 @@
     private void fillInUiFields()
     {
         // ALIASES Label
-        if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().length != 0 ) )
+        if ( ( modifiedObjectClass.getNamesRef() != null ) && ( modifiedObjectClass.getNamesRef().length != 0 ) )
         {
-            aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNames() ) );
+            aliasesLabel.setText( ViewUtils.concateAliases( modifiedObjectClass.getNamesRef() ) );
         }
         else
         {

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java Sat May 17 12:38:10 2008
@@ -88,8 +88,8 @@
                 {
                     if ( o1 instanceof ObjectClassImpl && o2 instanceof ObjectClassImpl )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
-                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
+                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
 
                         if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
                             && ( oc2Names.length > 0 ) )
@@ -99,7 +99,7 @@
                     }
                     else if ( o1 instanceof ObjectClassImpl && o2 instanceof NonExistingObjectClass )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
+                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
                         String oc2Name = ( ( NonExistingObjectClass ) o2 ).getName();
 
                         if ( ( oc1Names != null ) && ( oc2Name != null ) && ( oc1Names.length > 0 ) )
@@ -110,7 +110,7 @@
                     else if ( o1 instanceof NonExistingObjectClass && o2 instanceof ObjectClassImpl )
                     {
                         String oc1Name = ( ( NonExistingObjectClass ) o1 ).getName();
-                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
 
                         if ( ( oc1Name != null ) && ( oc2Names != null ) && ( oc2Names.length > 0 ) )
                         {

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java Sat May 17 12:38:10 2008
@@ -63,7 +63,7 @@
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) element;
 
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + oc.getOid() + ")";

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java Sat May 17 12:38:10 2008
@@ -61,8 +61,8 @@
                 {
                     if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
                     {
-                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
-                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
+                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
+                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
 
                         if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 )
                             && ( at2Names.length > 0 ) )
@@ -72,8 +72,8 @@
                     }
                     else if ( o1 instanceof ObjectClassImpl && o2 instanceof ObjectClassImpl )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
-                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
+                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
+                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
 
                         if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
                             && ( oc2Names.length > 0 ) )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java Sat May 17 12:38:10 2008
@@ -67,7 +67,7 @@
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) element;
 
-            String[] names = oc.getNames();
+            String[] names = oc.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + oc.getOid() + ")";
@@ -81,7 +81,7 @@
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) element;
 
-            String[] names = at.getNames();
+            String[] names = at.getNamesRef();
             if ( ( names != null ) && ( names.length > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")";

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java Sat May 17 12:38:10 2008
@@ -176,7 +176,7 @@
     {
         StringBuffer sb = new StringBuffer();
 
-        String[] names = object.getNames();
+        String[] names = object.getNamesRef();
         if ( ( names != null ) && ( names.length > 0 ) )
         {
             sb.append( ViewUtils.concateAliases( names ) );

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java Sat May 17 12:38:10 2008
@@ -87,7 +87,7 @@
             // Label
             if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
             {
-                String[] names = at.getNames();
+                String[] names = at.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = names[0];
@@ -99,7 +99,7 @@
             }
             else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
             {
-                String[] names = at.getNames();
+                String[] names = at.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = ViewUtils.concateAliases( names );
@@ -116,7 +116,7 @@
             else
             // Default
             {
-                String[] names = at.getNames();
+                String[] names = at.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = names[0];
@@ -140,7 +140,7 @@
             // Label
             if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
             {
-                String[] names = oc.getNames();
+                String[] names = oc.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = names[0];
@@ -152,7 +152,7 @@
             }
             else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
             {
-                String[] names = oc.getNames();
+                String[] names = oc.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = ViewUtils.concateAliases( names );
@@ -169,7 +169,7 @@
             else
             // Default
             {
-                String[] names = oc.getNames();
+                String[] names = oc.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = names[0];
@@ -197,7 +197,7 @@
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
                 {
-                    String[] names = at.getNames();
+                    String[] names = at.getNamesRef();
                     if ( ( names != null ) && ( names.length > 0 ) )
                     {
                         secondaryLabel = names[0];
@@ -209,7 +209,7 @@
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
                 {
-                    String[] names = at.getNames();
+                    String[] names = at.getNamesRef();
                     if ( ( names != null ) && ( names.length > 0 ) )
                     {
                         secondaryLabel = ViewUtils.concateAliases( names );
@@ -230,7 +230,7 @@
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
                 {
-                    String[] names = oc.getNames();
+                    String[] names = oc.getNamesRef();
                     if ( ( names != null ) && ( names.length > 0 ) )
                     {
                         secondaryLabel = names[0];
@@ -242,7 +242,7 @@
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
                 {
-                    String[] names = oc.getNames();
+                    String[] names = oc.getNamesRef();
                     if ( ( names != null ) && ( names.length > 0 ) )
                     {
                         secondaryLabel = ViewUtils.concateAliases( names );

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java Sat May 17 12:38:10 2008
@@ -92,7 +92,7 @@
             // Label
             if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
             {
-                String[] names = at.getNames();
+                String[] names = at.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = names[0];
@@ -104,7 +104,7 @@
             }
             else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
             {
-                String[] names = at.getNames();
+                String[] names = at.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = ViewUtils.concateAliases( names );
@@ -121,7 +121,7 @@
             else
             // Default
             {
-                String[] names = at.getNames();
+                String[] names = at.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = names[0];
@@ -145,7 +145,7 @@
             // Label
             if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
             {
-                String[] names = oc.getNames();
+                String[] names = oc.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = names[0];
@@ -157,7 +157,7 @@
             }
             else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
             {
-                String[] names = oc.getNames();
+                String[] names = oc.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = ViewUtils.concateAliases( names );
@@ -174,7 +174,7 @@
             else
             // Default
             {
-                String[] names = oc.getNames();
+                String[] names = oc.getNamesRef();
                 if ( ( names != null ) && ( names.length > 0 ) )
                 {
                     label = names[0];
@@ -215,7 +215,7 @@
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
                 {
-                    String[] names = at.getNames();
+                    String[] names = at.getNamesRef();
                     if ( ( names != null ) && ( names.length > 0 ) )
                     {
                         secondaryLabel = names[0];
@@ -227,7 +227,7 @@
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
                 {
-                    String[] names = at.getNames();
+                    String[] names = at.getNamesRef();
                     if ( ( names != null ) && ( names.length > 0 ) )
                     {
                         secondaryLabel = ViewUtils.concateAliases( names );
@@ -248,7 +248,7 @@
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
                 {
-                    String[] names = oc.getNames();
+                    String[] names = oc.getNamesRef();
                     if ( ( names != null ) && ( names.length > 0 ) )
                     {
                         secondaryLabel = names[0];
@@ -260,7 +260,7 @@
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
                 {
-                    String[] names = oc.getNames();
+                    String[] names = oc.getNamesRef();
                     if ( ( names != null ) && ( names.length > 0 ) )
                     {
                         secondaryLabel = ViewUtils.concateAliases( names );

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Sat May 17 12:38:10 2008
@@ -703,7 +703,7 @@
                         // Aliases
                         if ( searchScope.contains( SearchInEnum.ALIASES ) )
                         {
-                            if ( checkArray( pattern, at.getNames() ) )
+                            if ( checkArray( pattern, at.getNamesRef() ) )
                             {
                                 searchResults.add( at );
                                 continue;
@@ -787,7 +787,7 @@
                         // Aliases
                         if ( searchScope.contains( SearchInEnum.ALIASES ) )
                         {
-                            if ( checkArray( pattern, oc.getNames() ) )
+                            if ( checkArray( pattern, oc.getNamesRef() ) )
                             {
                                 searchResults.add( oc );
                                 continue;

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java?rev=657437&r1=657436&r2=657437&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java Sat May 17 12:38:10 2008
@@ -74,32 +74,32 @@
                     AttributeTypeImpl at1 = ( AttributeTypeImpl ) o1;
                     AttributeTypeImpl at2 = ( AttributeTypeImpl ) o2;
 
-                    o1Names = at1.getNames();
-                    o2Names = at2.getNames();
+                    o1Names = at1.getNamesRef();
+                    o2Names = at2.getNamesRef();
                 }
                 else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof ObjectClassImpl ) )
                 {
                     ObjectClassImpl oc1 = ( ObjectClassImpl ) o1;
                     ObjectClassImpl oc2 = ( ObjectClassImpl ) o2;
 
-                    o1Names = oc1.getNames();
-                    o2Names = oc2.getNames();
+                    o1Names = oc1.getNamesRef();
+                    o2Names = oc2.getNamesRef();
                 }
                 else if ( ( o1 instanceof AttributeTypeImpl ) && ( o2 instanceof ObjectClassImpl ) )
                 {
                     AttributeTypeImpl at = ( AttributeTypeImpl ) o1;
                     ObjectClassImpl oc = ( ObjectClassImpl ) o2;
 
-                    o1Names = at.getNames();
-                    o2Names = oc.getNames();
+                    o1Names = at.getNamesRef();
+                    o2Names = oc.getNamesRef();
                 }
                 else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof AttributeTypeImpl ) )
                 {
                     ObjectClassImpl oc = ( ObjectClassImpl ) o1;
                     AttributeTypeImpl at = ( AttributeTypeImpl ) o2;
 
-                    o1Names = oc.getNames();
-                    o2Names = at.getNames();
+                    o1Names = oc.getNamesRef();
+                    o2Names = at.getNamesRef();
                 }
 
                 // Comparing the First Name



Mime
View raw message