directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1005894 [3/5] - in /directory/studio/trunk/plugins/schemaeditor: ./ src/main/java/org/apache/directory/studio/schemaeditor/ src/main/java/org/apache/directory/studio/schemaeditor/controller/ src/main/java/org/apache/directory/studio/schema...
Date Fri, 08 Oct 2010 16:45:17 GMT
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Fri Oct  8 16:45:14 2010
@@ -291,7 +291,7 @@ public class AttributeTypeEditorOverview
     {
         public void widgetSelected( SelectionEvent e )
         {
-            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedAttributeType.getNamesRef() );
+            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedAttributeType.getNames() );
             if ( editDialog.open() != Window.OK )
             {
                 return;
@@ -299,10 +299,10 @@ public class AttributeTypeEditorOverview
             if ( editDialog.isDirty() )
             {
                 modifiedAttributeType.setNames( editDialog.getAliases() );
-                if ( ( modifiedAttributeType.getNamesRef() != null )
-                    && ( modifiedAttributeType.getNamesRef().length != 0 ) )
+                if ( ( modifiedAttributeType.getNames() != null )
+                    && ( modifiedAttributeType.getNames().size() != 0 ) )
                 {
-                    aliasesText.setText( ViewUtils.concateAliases( modifiedAttributeType.getNamesRef() ) );
+                    aliasesText.setText( ViewUtils.concateAliases( modifiedAttributeType.getNames() ) );
                 }
                 else
                 {
@@ -365,7 +365,7 @@ public class AttributeTypeEditorOverview
             IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 
             SchemaEditorInput input = new SchemaEditorInput( schemaHandler
-                .getSchema( modifiedAttributeType.getSchema() ) );
+                .getSchema( modifiedAttributeType.getSchemaName() ) );
             String editorId = SchemaEditor.ID;
             try
             {
@@ -424,14 +424,14 @@ public class AttributeTypeEditorOverview
             if ( selectedItem instanceof AttributeTypeImpl )
             {
                 AttributeTypeImpl at = ( AttributeTypeImpl ) selectedItem;
-                String[] names = at.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = at.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    modifiedAttributeType.setSuperiorName( names[0] );
+                    modifiedAttributeType.setSuperiorOid( names.get( 0 ) );
                 }
                 else
                 {
-                    modifiedAttributeType.setSuperiorName( at.getOid() );
+                    modifiedAttributeType.setSuperiorOid( at.getOid() );
                 }
             }
             else if ( selectedItem instanceof NonExistingAttributeType )
@@ -440,11 +440,11 @@ public class AttributeTypeEditorOverview
 
                 if ( NonExistingAttributeType.NONE.equals( neat.getName() ) )
                 {
-                    modifiedAttributeType.setSuperiorName( null );
+                    modifiedAttributeType.setSuperiorOid( null );
                 }
                 else
                 {
-                    modifiedAttributeType.setSuperiorName( ( ( NonExistingAttributeType ) selectedItem ).getName() );
+                    modifiedAttributeType.setSuperiorOid( ( ( NonExistingAttributeType ) selectedItem ).getName() );
                 }
             }
             setEditorDirty();
@@ -511,11 +511,11 @@ public class AttributeTypeEditorOverview
         {
             if ( syntaxLengthText.getText().length() == 0 )
             {
-                modifiedAttributeType.setLength( -1 );
+                modifiedAttributeType.setSyntaxLength( -1 );
             }
             else
             {
-                modifiedAttributeType.setLength( Integer.parseInt( syntaxLengthText.getText() ) );
+                modifiedAttributeType.setSyntaxLength( Integer.parseInt( syntaxLengthText.getText() ) );
             }
             setEditorDirty();
         }
@@ -548,7 +548,7 @@ public class AttributeTypeEditorOverview
     {
         public void widgetSelected( SelectionEvent e )
         {
-            modifiedAttributeType.setSingleValue( singleValueCheckbox.getSelection() );
+            modifiedAttributeType.setSingleValued( singleValueCheckbox.getSelection() );
             setEditorDirty();
         }
     };
@@ -568,7 +568,7 @@ public class AttributeTypeEditorOverview
     {
         public void widgetSelected( SelectionEvent e )
         {
-            modifiedAttributeType.setCanUserModify( !noUserModificationCheckbox.getSelection() );
+            modifiedAttributeType.setUserModifiable( !noUserModificationCheckbox.getSelection() );
             setEditorDirty();
         }
     };
@@ -582,7 +582,7 @@ public class AttributeTypeEditorOverview
 
             if ( selectedItem instanceof MatchingRuleImpl )
             {
-                modifiedAttributeType.setEqualityName( ( ( MatchingRuleImpl ) selectedItem ).getName() );
+                modifiedAttributeType.setEqualityOid( ( ( MatchingRuleImpl ) selectedItem ).getName() );
             }
             else if ( selectedItem instanceof NonExistingMatchingRule )
             {
@@ -590,11 +590,11 @@ public class AttributeTypeEditorOverview
 
                 if ( NonExistingMatchingRule.NONE.equals( nemr.getName() ) )
                 {
-                    modifiedAttributeType.setEqualityName( null );
+                    modifiedAttributeType.setEqualityOid( null );
                 }
                 else
                 {
-                    modifiedAttributeType.setEqualityName( ( ( NonExistingMatchingRule ) selectedItem ).getName() );
+                    modifiedAttributeType.setEqualityOid( ( ( NonExistingMatchingRule ) selectedItem ).getName() );
                 }
             }
             setEditorDirty();
@@ -610,7 +610,7 @@ public class AttributeTypeEditorOverview
 
             if ( selectedItem instanceof MatchingRuleImpl )
             {
-                modifiedAttributeType.setOrderingName( ( ( MatchingRuleImpl ) selectedItem ).getName() );
+                modifiedAttributeType.setOrderingOid( ( ( MatchingRuleImpl ) selectedItem ).getName() );
             }
             else if ( selectedItem instanceof NonExistingMatchingRule )
             {
@@ -618,11 +618,11 @@ public class AttributeTypeEditorOverview
 
                 if ( NonExistingMatchingRule.NONE.equals( nemr.getName() ) )
                 {
-                    modifiedAttributeType.setOrderingName( null );
+                    modifiedAttributeType.setOrderingOid( null );
                 }
                 else
                 {
-                    modifiedAttributeType.setOrderingName( ( ( NonExistingMatchingRule ) selectedItem ).getName() );
+                    modifiedAttributeType.setOrderingOid( ( ( NonExistingMatchingRule ) selectedItem ).getName() );
                 }
             }
             setEditorDirty();
@@ -638,7 +638,7 @@ public class AttributeTypeEditorOverview
 
             if ( selectedItem instanceof MatchingRuleImpl )
             {
-                modifiedAttributeType.setSubstrName( ( ( MatchingRuleImpl ) selectedItem ).getName() );
+                modifiedAttributeType.setSubstringOid( ( ( MatchingRuleImpl ) selectedItem ).getName() );
             }
             else if ( selectedItem instanceof NonExistingMatchingRule )
             {
@@ -646,11 +646,11 @@ public class AttributeTypeEditorOverview
 
                 if ( NonExistingMatchingRule.NONE.equals( nemr.getName() ) )
                 {
-                    modifiedAttributeType.setSubstrName( null );
+                    modifiedAttributeType.setSubstringOid( null );
                 }
                 else
                 {
-                    modifiedAttributeType.setSubstrName( ( ( NonExistingMatchingRule ) selectedItem ).getName() );
+                    modifiedAttributeType.setSubstringOid( ( ( NonExistingMatchingRule ) selectedItem ).getName() );
                 }
             }
             setEditorDirty();
@@ -693,7 +693,7 @@ public class AttributeTypeEditorOverview
         // Getting the original and modified attribute types
         modifiedAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getModifiedAttributeType();
         originalAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getOriginalAttributeType();
-        originalSchema = schemaHandler.getSchema( originalAttributeType.getSchema() );
+        originalSchema = schemaHandler.getSchema( originalAttributeType.getSchemaName() );
 
         // Creating the base UI
         ScrolledForm form = managedForm.getForm();
@@ -914,9 +914,9 @@ public class AttributeTypeEditorOverview
     private void fillInUiFields()
     {
         // ALIASES Label
-        if ( ( modifiedAttributeType.getNamesRef() != null ) && ( modifiedAttributeType.getNamesRef().length != 0 ) )
+        if ( ( modifiedAttributeType.getNames() != null ) && ( modifiedAttributeType.getNames().size() != 0 ) )
         {
-            aliasesText.setText( ViewUtils.concateAliases( modifiedAttributeType.getNamesRef() ) );
+            aliasesText.setText( ViewUtils.concateAliases( modifiedAttributeType.getNames() ) );
         }
         else
         {
@@ -930,7 +930,7 @@ public class AttributeTypeEditorOverview
         }
 
         // SCHEMA Field
-        schemaLabel.setText( modifiedAttributeType.getSchema() );
+        schemaLabel.setText( modifiedAttributeType.getSchemaName() );
 
         // DESCRIPTION Field
         if ( modifiedAttributeType.getDescription() != null )
@@ -948,22 +948,22 @@ public class AttributeTypeEditorOverview
         fillSyntaxCombo();
 
         // SYNTAX LENGTH Field
-        if ( modifiedAttributeType.getLength() != -1 )
+        if ( modifiedAttributeType.getSyntaxLength() != 0 )
         {
-            syntaxLengthText.setText( modifiedAttributeType.getLength() + "" ); //$NON-NLS-1$
+            syntaxLengthText.setText( modifiedAttributeType.getSyntaxLength() + "" ); //$NON-NLS-1$
         }
 
         // OBSOLETE Checkbox
         obsoleteCheckbox.setSelection( modifiedAttributeType.isObsolete() );
 
         // SINGLE-VALUE Checkbox
-        singleValueCheckbox.setSelection( modifiedAttributeType.isSingleValue() );
+        singleValueCheckbox.setSelection( modifiedAttributeType.isSingleValued() );
 
         // COLLECTIVE Checkbox
         collectiveCheckbox.setSelection( modifiedAttributeType.isCollective() );
 
         // NO-USER-MODIFICATION Checkbox
-        noUserModificationCheckbox.setSelection( !modifiedAttributeType.isCanUserModify() );
+        noUserModificationCheckbox.setSelection( !modifiedAttributeType.isUserModifiable() );
 
         // EQUALITY Combo
         fillEqualityCombo();
@@ -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(
@@ -1077,7 +1077,7 @@ public class AttributeTypeEditorOverview
     {
         equalityComboViewer.setInput( new ATEMatchingRulesComboInput() );
 
-        String equalityName = modifiedAttributeType.getEqualityName();
+        String equalityName = modifiedAttributeType.getEqualityOid();
         if ( equalityName == null )
         {
             equalityComboViewer.setSelection( new StructuredSelection( new NonExistingMatchingRule(
@@ -1112,7 +1112,7 @@ public class AttributeTypeEditorOverview
     {
         orderingComboViewer.setInput( new ATEMatchingRulesComboInput() );
 
-        String orderingName = modifiedAttributeType.getOrderingName();
+        String orderingName = modifiedAttributeType.getOrderingOid();
         if ( orderingName == null )
         {
             orderingComboViewer.setSelection( new StructuredSelection( new NonExistingMatchingRule(
@@ -1148,7 +1148,7 @@ public class AttributeTypeEditorOverview
     {
         substringComboViewer.setInput( new ATEMatchingRulesComboInput() );
 
-        String substringName = modifiedAttributeType.getSubstrName();
+        String substringName = modifiedAttributeType.getSubstringOid();
         if ( substringName == null )
         {
             substringComboViewer.setSelection( new StructuredSelection( new NonExistingMatchingRule(

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java Fri Oct  8 16:45:14 2010
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeLiteral;
+import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
@@ -83,7 +83,7 @@ public class AttributeTypeEditorSourceCo
                 }
                 else
                 {
-                    updateAttributeType( ( AttributeTypeLiteral ) attributeTypes.get( 0 ) );
+                    updateAttributeType( ( AttributeType ) attributeTypes.get( 0 ) );
                 }
             }
             catch ( IOException e1 )
@@ -180,22 +180,22 @@ public class AttributeTypeEditorSourceCo
      * @param atl
      *            the Attribute Type Literal
      */
-    private void updateAttributeType( AttributeTypeLiteral atl )
+    private void updateAttributeType( AttributeType atl )
     {
-        modifiedAttributeType.setCanUserModify( !atl.isNoUserModification() );
         modifiedAttributeType.setCollective( atl.isCollective() );
         modifiedAttributeType.setDescription( atl.getDescription() );
-        modifiedAttributeType.setEqualityName( atl.getEquality() );
-        modifiedAttributeType.setLength( atl.getLength() );
+        modifiedAttributeType.setEqualityOid( atl.getEqualityOid() );
+        modifiedAttributeType.setSyntaxLength( atl.getSyntaxLength() );
         modifiedAttributeType.setNames( atl.getNames() );
         modifiedAttributeType.setObsolete( atl.isObsolete() );
         modifiedAttributeType.setOid( atl.getOid() );
-        modifiedAttributeType.setOrderingName( atl.getOrdering() );
-        modifiedAttributeType.setSingleValue( atl.isSingleValue() );
-        modifiedAttributeType.setSubstrName( atl.getSubstr() );
-        modifiedAttributeType.setSuperiorName( atl.getSuperior() );
-        modifiedAttributeType.setSyntaxOid( atl.getSyntax() );
+        modifiedAttributeType.setOrderingOid( atl.getOrderingOid() );
+        modifiedAttributeType.setSingleValued( atl.isSingleValued() );
+        modifiedAttributeType.setSubstringOid( atl.getSubstringOid() );
+        modifiedAttributeType.setSuperiorOid( atl.getSuperiorOid() );
+        modifiedAttributeType.setSyntaxOid( atl.getSyntaxOid() );
         modifiedAttributeType.setUsage( atl.getUsage() );
+        modifiedAttributeType.setUserModifiable( atl.isUserModifiable() );
     }
 
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java Fri Oct  8 16:45:14 2010
@@ -21,6 +21,8 @@
 package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
 
 
+import java.util.List;
+
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -262,8 +264,8 @@ public class AttributeTypeEditorUsedByPa
         // As Mandatory Attribute Section
         Section mandatoryAttributeSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
             | Section.TITLE_BAR );
-        String names[] = modifiedAttributeType.getNamesRef();
-        if ( ( names != null ) && ( names.length > 0 ) )
+        List<String> names = modifiedAttributeType.getNames();
+        if ( ( names != null ) && ( names.size() > 0 ) )
         {
             mandatoryAttributeSection
                 .setDescription( NLS
@@ -309,8 +311,8 @@ public class AttributeTypeEditorUsedByPa
         // Matching Rules Section
         Section optionalAttributeSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
             | Section.TITLE_BAR );
-        String names[] = modifiedAttributeType.getNamesRef();
-        if ( ( names != null ) && ( names.length > 0 ) )
+        List<String> names = modifiedAttributeType.getNames();
+        if ( ( names != null ) && ( names.size() > 0 ) )
         {
             optionalAttributeSection
                 .setDescription( NLS

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
            ('svn:mergeinfo' removed)

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
            ('svn:mergeinfo' removed)

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java Fri Oct  8 16:45:14 2010
@@ -142,7 +142,7 @@ public class ObjectClassEditor extends F
         modifiedObjectClass = PluginUtils.getClone( originalObjectClass );
 
         SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
-        originalSchema = schemaHandler.getSchema( originalObjectClass.getSchema() );
+        originalSchema = schemaHandler.getSchema( originalObjectClass.getSchemaName() );
         schemaHandler.addListener( originalObjectClass, objectClassListener );
         schemaHandler.addListener( schemaHandlerListener );
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java Fri Oct  8 16:45:14 2010
@@ -58,11 +58,11 @@ public class ObjectClassEditorAttributes
      */
     public Object[] getElements( Object inputElement )
     {
-        if ( inputElement instanceof String[] )
+        if ( inputElement instanceof List<?> )
         {
             List<Object> results = new ArrayList<Object>();
 
-            String[] attributes = ( String[] ) inputElement;
+            List<String> attributes = ( List<String> ) inputElement;
             for ( String attribute : attributes )
             {
                 AttributeTypeImpl at = schemaHandler.getAttributeType( attribute );
@@ -83,33 +83,33 @@ public class ObjectClassEditorAttributes
                 {
                     if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
                     {
-                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
-                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
+                        List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+                        List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
 
-                        if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 )
-                            && ( at2Names.length > 0 ) )
+                        if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 )
+                            && ( at2Names.size() > 0 ) )
                         {
-                            return at1Names[0].compareToIgnoreCase( at2Names[0] );
+                            return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
                         }
                     }
                     else if ( o1 instanceof AttributeTypeImpl && o2 instanceof NonExistingAttributeType )
                     {
-                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
+                        List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
                         String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
 
-                        if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.length > 0 ) )
+                        if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.size() > 0 ) )
                         {
-                            return at1Names[0].compareToIgnoreCase( at2Name );
+                            return at1Names.get( 0 ).compareToIgnoreCase( at2Name );
                         }
                     }
                     else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeTypeImpl )
                     {
                         String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
-                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
+                        List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
 
-                        if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.length > 0 ) )
+                        if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.size() > 0 ) )
                         {
-                            return at1Name.compareToIgnoreCase( at2Names[0] );
+                            return at1Name.compareToIgnoreCase( at2Names.get( 0 ) );
                         }
                     }
                     else if ( o1 instanceof NonExistingAttributeType && o2 instanceof NonExistingAttributeType )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java Fri Oct  8 16:45:14 2010
@@ -21,6 +21,8 @@
 package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
 
 
+import java.util.List;
+
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
@@ -63,8 +65,8 @@ public class ObjectClassEditorAttributes
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) element;
 
-            String[] names = at.getNamesRef();
-            if ( ( names != null ) && ( names.length > 0 ) )
+            List<String> names = at.getNames();
+            if ( ( names != null ) && ( names.size() > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
             }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java Fri Oct  8 16:45:14 2010
@@ -21,6 +21,8 @@
 package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
 
 
+import java.util.List;
+
 import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osgi.util.NLS;
@@ -72,10 +74,10 @@ public class ObjectClassEditorInput impl
      */
     public String getName()
     {
-        String[] names = objectClass.getNamesRef();
-        if ( ( names != null ) && ( names.length > 0 ) )
+        List<String> names = objectClass.getNames();
+        if ( ( names != null ) && ( names.size() > 0 ) )
         {
-            return names[0];
+            return names.get( 0 );
         }
         else
         {
@@ -99,14 +101,13 @@ public class ObjectClassEditorInput impl
     public String getToolTipText()
     {
         return NLS.bind( Messages.getString( "ObjectClassEditorInput.FromSchema" ), new String[] //$NON-NLS-1$
-            { getName(), objectClass.getSchema() } );
+            { getName(), objectClass.getSchemaName() } );
     }
 
 
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
      */
-    @SuppressWarnings("unchecked")
     public Object getAdapter( Class adapter )
     {
         return null;

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Fri Oct  8 16:45:14 2010
@@ -293,7 +293,7 @@ public class ObjectClassEditorOverviewPa
     {
         public void widgetSelected( SelectionEvent e )
         {
-            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedObjectClass.getNamesRef() );
+            EditAliasesDialog editDialog = new EditAliasesDialog( modifiedObjectClass.getNames() );
             if ( editDialog.open() != Window.OK )
             {
                 return;
@@ -301,9 +301,9 @@ public class ObjectClassEditorOverviewPa
             if ( editDialog.isDirty() )
             {
                 modifiedObjectClass.setNames( editDialog.getAliases() );
-                if ( ( modifiedObjectClass.getNamesRef() != null ) && ( modifiedObjectClass.getNamesRef().length != 0 ) )
+                if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().size() != 0 ) )
                 {
-                    aliasesText.setText( ViewUtils.concateAliases( modifiedObjectClass.getNamesRef() ) );
+                    aliasesText.setText( ViewUtils.concateAliases( modifiedObjectClass.getNames() ) );
                 }
                 else
                 {
@@ -365,7 +365,8 @@ public class ObjectClassEditorOverviewPa
         {
             IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 
-            SchemaEditorInput input = new SchemaEditorInput( schemaHandler.getSchema( modifiedObjectClass.getSchema() ) );
+            SchemaEditorInput input = new SchemaEditorInput( schemaHandler.getSchema( modifiedObjectClass
+                .getSchemaName() ) );
             String editorId = SchemaEditor.ID;
             try
             {
@@ -470,7 +471,7 @@ public class ObjectClassEditorOverviewPa
         {
             AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
             List<AttributeTypeImpl> hiddenATs = new ArrayList<AttributeTypeImpl>();
-            String[] mustsHidden = modifiedObjectClass.getMustNamesList();
+            List<String> mustsHidden = modifiedObjectClass.getMustAttributeTypeOids();
             if ( mustsHidden != null )
             {
                 for ( String must : mustsHidden )
@@ -496,7 +497,7 @@ public class ObjectClassEditorOverviewPa
             }
 
             List<String> newMusts = new ArrayList<String>();
-            String[] musts = modifiedObjectClass.getMustNamesList();
+            List<String> musts = modifiedObjectClass.getMustAttributeTypeOids();
             if ( musts != null )
             {
                 for ( String must : musts )
@@ -504,16 +505,16 @@ public class ObjectClassEditorOverviewPa
                     newMusts.add( must );
                 }
             }
-            String[] names = at.getNamesRef();
-            if ( ( names != null ) && ( names.length > 0 ) )
+            List<String> names = at.getNames();
+            if ( ( names != null ) && ( names.size() > 0 ) )
             {
-                newMusts.add( names[0] );
+                newMusts.add( names.get( 0 ) );
             }
             else
             {
                 newMusts.add( at.getOid() );
             }
-            modifiedObjectClass.setMustNamesList( newMusts.toArray( new String[0] ) );
+            modifiedObjectClass.setMustAttributeTypeOids( newMusts );
 
             fillInMandatoryAttributesTable();
             setEditorDirty();
@@ -535,7 +536,7 @@ public class ObjectClassEditorOverviewPa
             if ( selectedElement != null )
             {
                 List<String> newMusts = new ArrayList<String>();
-                String[] musts = modifiedObjectClass.getMustNamesList();
+                List<String> musts = modifiedObjectClass.getMustAttributeTypeOids();
                 for ( String must : musts )
                 {
                     newMusts.add( must );
@@ -543,7 +544,7 @@ public class ObjectClassEditorOverviewPa
 
                 if ( selectedElement instanceof AttributeTypeImpl )
                 {
-                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNamesRef() )
+                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNames() )
                     {
                         newMusts.remove( name );
                     }
@@ -553,7 +554,7 @@ public class ObjectClassEditorOverviewPa
                     newMusts.remove( ( ( NonExistingAttributeType ) selectedElement ).getName() );
                 }
 
-                modifiedObjectClass.setMustNamesList( newMusts.toArray( new String[0] ) );
+                modifiedObjectClass.setMustAttributeTypeOids( newMusts );
 
                 fillInMandatoryAttributesTable();
                 addButtonMandatoryTable.setFocus();
@@ -607,7 +608,7 @@ public class ObjectClassEditorOverviewPa
         {
             AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
             List<AttributeTypeImpl> hiddenATs = new ArrayList<AttributeTypeImpl>();
-            String[] maysHidden = modifiedObjectClass.getMayNamesList();
+            List<String> maysHidden = modifiedObjectClass.getMayAttributeTypeOids();
             if ( maysHidden != null )
             {
                 for ( String may : maysHidden )
@@ -633,7 +634,7 @@ public class ObjectClassEditorOverviewPa
             }
 
             List<String> newMays = new ArrayList<String>();
-            String[] mays = modifiedObjectClass.getMayNamesList();
+            List<String> mays = modifiedObjectClass.getMayAttributeTypeOids();
             if ( mays != null )
             {
                 for ( String may : mays )
@@ -641,16 +642,16 @@ public class ObjectClassEditorOverviewPa
                     newMays.add( may );
                 }
             }
-            String[] names = at.getNamesRef();
-            if ( ( names != null ) && ( names.length > 0 ) )
+            List<String> names = at.getNames();
+            if ( ( names != null ) && ( names.size() > 0 ) )
             {
-                newMays.add( names[0] );
+                newMays.add( names.get( 0 ) );
             }
             else
             {
                 newMays.add( at.getOid() );
             }
-            modifiedObjectClass.setMayNamesList( newMays.toArray( new String[0] ) );
+            modifiedObjectClass.setMayAttributeTypeOids( newMays );
 
             fillInOptionalAttributesTable();
             setEditorDirty();
@@ -672,7 +673,7 @@ public class ObjectClassEditorOverviewPa
             if ( selectedElement != null )
             {
                 List<String> newMays = new ArrayList<String>();
-                String[] mays = modifiedObjectClass.getMayNamesList();
+                List<String> mays = modifiedObjectClass.getMayAttributeTypeOids();
                 for ( String may : mays )
                 {
                     newMays.add( may );
@@ -680,7 +681,7 @@ public class ObjectClassEditorOverviewPa
 
                 if ( selectedElement instanceof AttributeTypeImpl )
                 {
-                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNamesRef() )
+                    for ( String name : ( ( AttributeTypeImpl ) selectedElement ).getNames() )
                     {
                         newMays.remove( name );
                     }
@@ -690,7 +691,7 @@ public class ObjectClassEditorOverviewPa
                     newMays.remove( ( ( NonExistingAttributeType ) selectedElement ).getName() );
                 }
 
-                modifiedObjectClass.setMayNamesList( newMays.toArray( new String[0] ) );
+                modifiedObjectClass.setMayAttributeTypeOids( newMays );
 
                 fillInOptionalAttributesTable();
                 addButtonOptionalTable.setFocus();
@@ -744,7 +745,7 @@ public class ObjectClassEditorOverviewPa
         {
             ObjectClassSelectionDialog dialog = new ObjectClassSelectionDialog();
             List<ObjectClassImpl> hiddenOCs = new ArrayList<ObjectClassImpl>();
-            for ( String sup : modifiedObjectClass.getSuperClassesNames() )
+            for ( String sup : modifiedObjectClass.getSuperiorOids() )
             {
                 ObjectClassImpl oc = schemaHandler.getObjectClass( sup );
                 if ( oc != null )
@@ -767,21 +768,21 @@ public class ObjectClassEditorOverviewPa
             }
 
             List<String> superiors = new ArrayList<String>();
-            String[] sups = modifiedObjectClass.getSuperClassesNames();
+            List<String> sups = modifiedObjectClass.getSuperiorOids();
             for ( String sup : sups )
             {
                 superiors.add( sup );
             }
-            String[] names = oc.getNamesRef();
-            if ( ( names != null ) && ( names.length > 0 ) )
+            List<String> names = oc.getNames();
+            if ( ( names != null ) && ( names.size() > 0 ) )
             {
-                superiors.add( names[0] );
+                superiors.add( names.get( 0 ) );
             }
             else
             {
                 superiors.add( oc.getOid() );
             }
-            modifiedObjectClass.setSuperClassesNames( superiors.toArray( new String[0] ) );
+            modifiedObjectClass.setSuperiorOids( superiors );
 
             fillInSuperiorsTable();
             setEditorDirty();
@@ -803,7 +804,7 @@ public class ObjectClassEditorOverviewPa
             if ( selectedElement != null )
             {
                 List<String> superiors = new ArrayList<String>();
-                String[] sups = modifiedObjectClass.getSuperClassesNames();
+                List<String> sups = modifiedObjectClass.getSuperiorOids();
                 for ( String sup : sups )
                 {
                     superiors.add( sup );
@@ -811,7 +812,7 @@ public class ObjectClassEditorOverviewPa
 
                 if ( selectedElement instanceof ObjectClassImpl )
                 {
-                    for ( String name : ( ( ObjectClassImpl ) selectedElement ).getNamesRef() )
+                    for ( String name : ( ( ObjectClassImpl ) selectedElement ).getNames() )
                     {
                         superiors.remove( name );
                     }
@@ -821,7 +822,7 @@ public class ObjectClassEditorOverviewPa
                     superiors.remove( ( ( NonExistingObjectClass ) selectedElement ).getName() );
                 }
 
-                modifiedObjectClass.setSuperClassesNames( superiors.toArray( new String[0] ) );
+                modifiedObjectClass.setSuperiorOids( superiors );
 
                 fillInSuperiorsTable();
                 addButtonSuperiorsTable.setFocus();
@@ -866,7 +867,7 @@ public class ObjectClassEditorOverviewPa
         // Getting the original and modified object classes
         modifiedObjectClass = ( ( ObjectClassEditor ) getEditor() ).getModifiedObjectClass();
         originalObjectClass = ( ( ObjectClassEditor ) getEditor() ).getOriginalObjectClass();
-        originalSchema = schemaHandler.getSchema( originalObjectClass.getSchema() );
+        originalSchema = schemaHandler.getSchema( originalObjectClass.getSchemaName() );
 
         // Creating the base UI
         ScrolledForm form = managedForm.getForm();
@@ -1106,9 +1107,9 @@ public class ObjectClassEditorOverviewPa
     private void fillInUiFields()
     {
         // ALIASES Label
-        if ( ( modifiedObjectClass.getNamesRef() != null ) && ( modifiedObjectClass.getNamesRef().length != 0 ) )
+        if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().size() != 0 ) )
         {
-            aliasesText.setText( ViewUtils.concateAliases( modifiedObjectClass.getNamesRef() ) );
+            aliasesText.setText( ViewUtils.concateAliases( modifiedObjectClass.getNames() ) );
         }
         else
         {
@@ -1121,7 +1122,7 @@ public class ObjectClassEditorOverviewPa
             oidText.setText( modifiedObjectClass.getOid() );
         }
 
-        schemaLabel.setText( modifiedObjectClass.getSchema() );
+        schemaLabel.setText( modifiedObjectClass.getSchemaName() );
 
         // DESCRIPTION Field
         if ( modifiedObjectClass.getDescription() != null )
@@ -1151,7 +1152,10 @@ public class ObjectClassEditorOverviewPa
      */
     private void fillInSuperiorsTable()
     {
-        superiorsTableViewer.setInput( modifiedObjectClass.getSuperClassesNames() );
+        if ( modifiedObjectClass.getSuperiorOids() != null )
+        {
+            superiorsTableViewer.setInput( modifiedObjectClass.getSuperiorOids() );
+        }
     }
 
 
@@ -1191,7 +1195,10 @@ public class ObjectClassEditorOverviewPa
      */
     private void fillInMandatoryAttributesTable()
     {
-        mandatoryAttributesTableViewer.setInput( modifiedObjectClass.getMustNamesList() );
+        if ( modifiedObjectClass.getMustAttributeTypeOids() != null )
+        {
+            mandatoryAttributesTableViewer.setInput( modifiedObjectClass.getMustAttributeTypeOids() );
+        }
     }
 
 
@@ -1200,7 +1207,10 @@ public class ObjectClassEditorOverviewPa
      */
     private void fillInOptionalAttributesTable()
     {
-        optionalAttributesTableViewer.setInput( modifiedObjectClass.getMayNamesList() );
+        if ( modifiedObjectClass.getMayAttributeTypeOids() != null )
+        {
+            optionalAttributesTableViewer.setInput( modifiedObjectClass.getMayAttributeTypeOids() );
+        }
     }
 
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java Fri Oct  8 16:45:14 2010
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassLiteral;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
@@ -87,7 +87,7 @@ public class ObjectClassEditorSourceCode
                 }
                 else
                 {
-                    updateObjectClass( ( ObjectClassLiteral ) objectclasses.get( 0 ) );
+                    updateObjectClass( ( ObjectClass ) objectclasses.get( 0 ) );
                 }
             }
             catch ( IOException e1 )
@@ -178,16 +178,16 @@ public class ObjectClassEditorSourceCode
      * @param ocl
      *      the Object Class Literal
      */
-    private void updateObjectClass( ObjectClassLiteral ocl )
+    private void updateObjectClass( ObjectClass ocl )
     {
         modifiedObjectClass.setDescription( ocl.getDescription() );
-        modifiedObjectClass.setMayNamesList( ocl.getMay() );
-        modifiedObjectClass.setMustNamesList( ocl.getMust() );
+        modifiedObjectClass.setMayAttributeTypeOids( ocl.getMayAttributeTypeOids() );
+        modifiedObjectClass.setMustAttributeTypeOids( ocl.getMustAttributeTypeOids() );
         modifiedObjectClass.setNames( ocl.getNames() );
         modifiedObjectClass.setObsolete( ocl.isObsolete() );
         modifiedObjectClass.setOid( ocl.getOid() );
-        modifiedObjectClass.setSuperClassesNames( ocl.getSuperiors() );
-        modifiedObjectClass.setType( ocl.getClassType() );
+        modifiedObjectClass.setSuperiorOids( ocl.getSuperiorOids() );
+        modifiedObjectClass.setType( ocl.getType() );
     }
 
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java Fri Oct  8 16:45:14 2010
@@ -62,11 +62,11 @@ public class ObjectClassEditorSuperiorsT
      */
     public Object[] getElements( Object inputElement )
     {
-        if ( inputElement instanceof String[] )
+        if ( inputElement instanceof List<?> )
         {
             List<Object> results = new ArrayList<Object>();
 
-            String[] superiors = ( String[] ) inputElement;
+            List<String> superiors = ( List<String> ) inputElement;
             for ( String superior : superiors )
             {
                 ObjectClassImpl oc = schemaHandler.getObjectClass( superior );
@@ -87,33 +87,33 @@ public class ObjectClassEditorSuperiorsT
                 {
                     if ( o1 instanceof ObjectClassImpl && o2 instanceof ObjectClassImpl )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
-                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
+                        List<String> oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
+                        List<String> oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
 
-                        if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
-                            && ( oc2Names.length > 0 ) )
+                        if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.size() > 0 )
+                            && ( oc2Names.size() > 0 ) )
                         {
-                            return oc1Names[0].compareToIgnoreCase( oc2Names[0] );
+                            return oc1Names.get( 0 ).compareToIgnoreCase( oc2Names.get( 0 ) );
                         }
                     }
                     else if ( o1 instanceof ObjectClassImpl && o2 instanceof NonExistingObjectClass )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
+                        List<String> oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
                         String oc2Name = ( ( NonExistingObjectClass ) o2 ).getName();
 
-                        if ( ( oc1Names != null ) && ( oc2Name != null ) && ( oc1Names.length > 0 ) )
+                        if ( ( oc1Names != null ) && ( oc2Name != null ) && ( oc1Names.size() > 0 ) )
                         {
-                            return oc1Names[0].compareToIgnoreCase( oc2Name );
+                            return oc1Names.get( 0 ).compareToIgnoreCase( oc2Name );
                         }
                     }
                     else if ( o1 instanceof NonExistingObjectClass && o2 instanceof ObjectClassImpl )
                     {
                         String oc1Name = ( ( NonExistingObjectClass ) o1 ).getName();
-                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
+                        List<String> oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
 
-                        if ( ( oc1Name != null ) && ( oc2Names != null ) && ( oc2Names.length > 0 ) )
+                        if ( ( oc1Name != null ) && ( oc2Names != null ) && ( oc2Names.size() > 0 ) )
                         {
-                            return oc1Name.compareToIgnoreCase( oc2Names[0] );
+                            return oc1Name.compareToIgnoreCase( oc2Names.get( 0 ) );
                         }
                     }
                     else if ( o1 instanceof NonExistingObjectClass && o2 instanceof NonExistingObjectClass )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableLabelProvider.java Fri Oct  8 16:45:14 2010
@@ -21,6 +21,8 @@
 package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
 
 
+import java.util.List;
+
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
@@ -63,8 +65,8 @@ public class ObjectClassEditorSuperiorsT
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) element;
 
-            String[] names = oc.getNamesRef();
-            if ( ( names != null ) && ( names.length > 0 ) )
+            List<String> names = oc.getNames();
+            if ( ( names != null ) && ( names.size() > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + oc.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
             }

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
            ('svn:mergeinfo' removed)

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
            ('svn:mergeinfo' removed)

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java Fri Oct  8 16:45:14 2010
@@ -60,24 +60,24 @@ public class SchemaEditorTableViewerCont
                 {
                     if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
                     {
-                        String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
-                        String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
+                        List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+                        List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
 
-                        if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 )
-                            && ( at2Names.length > 0 ) )
+                        if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 )
+                            && ( at2Names.size() > 0 ) )
                         {
-                            return at1Names[0].compareToIgnoreCase( at2Names[0] );
+                            return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
                         }
                     }
                     else if ( o1 instanceof ObjectClassImpl && o2 instanceof ObjectClassImpl )
                     {
-                        String[] oc1Names = ( ( ObjectClassImpl ) o1 ).getNamesRef();
-                        String[] oc2Names = ( ( ObjectClassImpl ) o2 ).getNamesRef();
+                        List<String> oc1Names = ( ( ObjectClassImpl ) o1 ).getNames();
+                        List<String> oc2Names = ( ( ObjectClassImpl ) o2 ).getNames();
 
-                        if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
-                            && ( oc2Names.length > 0 ) )
+                        if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.size() > 0 )
+                            && ( oc2Names.size() > 0 ) )
                         {
-                            return oc1Names[0].compareToIgnoreCase( oc2Names[0] );
+                            return oc1Names.get( 0 ).compareToIgnoreCase( oc2Names.get( 0 ) );
                         }
                     }
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java Fri Oct  8 16:45:14 2010
@@ -21,6 +21,8 @@
 package org.apache.directory.studio.schemaeditor.view.editors.schema;
 
 
+import java.util.List;
+
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
@@ -67,8 +69,8 @@ public class SchemaEditorTableViewerLabe
         {
             ObjectClassImpl oc = ( ObjectClassImpl ) element;
 
-            String[] names = oc.getNamesRef();
-            if ( ( names != null ) && ( names.length > 0 ) )
+            List<String> names = oc.getNames();
+            if ( ( names != null ) && ( names.size() > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + oc.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
             }
@@ -82,8 +84,8 @@ public class SchemaEditorTableViewerLabe
         {
             AttributeTypeImpl at = ( AttributeTypeImpl ) element;
 
-            String[] names = at.getNamesRef();
-            if ( ( names != null ) && ( names.length > 0 ) )
+            List<String> names = at.getNames();
+            if ( ( names != null ) && ( names.size() > 0 ) )
             {
                 return ViewUtils.concateAliases( names ) + "  -  (" + at.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
             }

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/messages.properties
            ('svn:mergeinfo' removed)

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/messages_de.properties
            ('svn:mergeinfo' removed)

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/messages.properties
            ('svn:mergeinfo' removed)

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/messages.properties
            ('svn:mergeinfo' removed)

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/messages_de.properties
            ('svn:mergeinfo' removed)

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages.properties
            ('svn:mergeinfo' removed)

Propchange: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages_de.properties
            ('svn:mergeinfo' removed)

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java Fri Oct  8 16:45:14 2010
@@ -20,6 +20,8 @@
 package org.apache.directory.studio.schemaeditor.view.views;
 
 
+import java.util.List;
+
 import org.apache.directory.shared.ldap.schema.SchemaObject;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -177,8 +179,8 @@ public class HierarchyView extends ViewP
     {
         StringBuffer sb = new StringBuffer();
 
-        String[] names = object.getNamesRef();
-        if ( ( names != null ) && ( names.length > 0 ) )
+        List<String> names = object.getNames();
+        if ( ( names != null ) && ( names.size() > 0 ) )
         {
             sb.append( ViewUtils.concateAliases( names ) );
         }
@@ -187,7 +189,7 @@ public class HierarchyView extends ViewP
             sb.append( Messages.getString( "HierarchyView.None" ) ); //$NON-NLS-1$
         }
         sb.append( NLS.bind(
-            Messages.getString( "HierarchyView.Schema" ), new String[] { object.getOid(), object.getSchema() } ) ); //$NON-NLS-1$
+            Messages.getString( "HierarchyView.Schema" ), new String[] { object.getOid(), object.getSchemaName() } ) ); //$NON-NLS-1$
 
         overviewLabel.setText( sb.toString() );
     }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java Fri Oct  8 16:45:14 2010
@@ -21,6 +21,8 @@
 package org.apache.directory.studio.schemaeditor.view.views;
 
 
+import java.util.List;
+
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
 import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
@@ -84,10 +86,10 @@ public class HierarchyViewLabelProvider 
             // Label
             if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
             {
-                String[] names = at.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = at.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    label = names[0];
+                    label = names.get( 0 );
                 }
                 else
                 {
@@ -96,8 +98,8 @@ public class HierarchyViewLabelProvider 
             }
             else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
             {
-                String[] names = at.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = at.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
                     label = ViewUtils.concateAliases( names );
                 }
@@ -113,10 +115,10 @@ public class HierarchyViewLabelProvider 
             else
             // Default
             {
-                String[] names = at.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = at.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    label = names[0];
+                    label = names.get( 0 );
                 }
                 else
                 {
@@ -137,10 +139,10 @@ public class HierarchyViewLabelProvider 
             // Label
             if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
             {
-                String[] names = oc.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = oc.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    label = names[0];
+                    label = names.get( 0 );
                 }
                 else
                 {
@@ -149,8 +151,8 @@ public class HierarchyViewLabelProvider 
             }
             else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
             {
-                String[] names = oc.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = oc.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
                     label = ViewUtils.concateAliases( names );
                 }
@@ -166,10 +168,10 @@ public class HierarchyViewLabelProvider 
             else
             // Default
             {
-                String[] names = oc.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = oc.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    label = names[0];
+                    label = names.get( 0 );
                 }
                 else
                 {
@@ -194,10 +196,10 @@ public class HierarchyViewLabelProvider 
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
                 {
-                    String[] names = at.getNamesRef();
-                    if ( ( names != null ) && ( names.length > 0 ) )
+                    List<String> names = at.getNames();
+                    if ( ( names != null ) && ( names.size() > 0 ) )
                     {
-                        secondaryLabel = names[0];
+                        secondaryLabel = names.get( 0 );
                     }
                     else
                     {
@@ -206,8 +208,8 @@ public class HierarchyViewLabelProvider 
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
                 {
-                    String[] names = at.getNamesRef();
-                    if ( ( names != null ) && ( names.length > 0 ) )
+                    List<String> names = at.getNames();
+                    if ( ( names != null ) && ( names.size() > 0 ) )
                     {
                         secondaryLabel = ViewUtils.concateAliases( names );
                     }
@@ -227,10 +229,10 @@ public class HierarchyViewLabelProvider 
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
                 {
-                    String[] names = oc.getNamesRef();
-                    if ( ( names != null ) && ( names.length > 0 ) )
+                    List<String> names = oc.getNames();
+                    if ( ( names != null ) && ( names.size() > 0 ) )
                     {
-                        secondaryLabel = names[0];
+                        secondaryLabel = names.get( 0 );
                     }
                     else
                     {
@@ -239,8 +241,8 @@ public class HierarchyViewLabelProvider 
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
                 {
-                    String[] names = oc.getNamesRef();
-                    if ( ( names != null ) && ( names.length > 0 ) )
+                    List<String> names = oc.getNames();
+                    if ( ( names != null ) && ( names.size() > 0 ) )
                     {
                         secondaryLabel = ViewUtils.concateAliases( names );
                     }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java Fri Oct  8 16:45:14 2010
@@ -482,7 +482,7 @@ public class SchemaViewContentProvider i
     public void attributeTypeAddedFlatPresentation( AttributeTypeImpl at )
     {
         SchemaWrapper schemaWrapper = ( SchemaWrapper ) getWrapper( Activator.getDefault().getSchemaHandler()
-            .getSchema( at.getSchema() ) );
+            .getSchema( at.getSchemaName() ) );
         if ( schemaWrapper != null )
         {
             AttributeTypeWrapper atw = null;
@@ -844,7 +844,7 @@ public class SchemaViewContentProvider i
     public void objectClassAddedFlatPresentation( ObjectClassImpl oc )
     {
         SchemaWrapper schemaWrapper = ( SchemaWrapper ) getWrapper( Activator.getDefault().getSchemaHandler()
-            .getSchema( oc.getSchema() ) );
+            .getSchema( oc.getSchemaName() ) );
         if ( schemaWrapper != null )
         {
             ObjectClassWrapper ocw = null;

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java Fri Oct  8 16:45:14 2010
@@ -89,10 +89,10 @@ public class SchemaViewLabelProvider ext
             // Label
             if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
             {
-                String[] names = at.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = at.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    label = names[0];
+                    label = names.get( 0 );
                 }
                 else
                 {
@@ -101,8 +101,8 @@ public class SchemaViewLabelProvider ext
             }
             else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
             {
-                String[] names = at.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = at.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
                     label = ViewUtils.concateAliases( names );
                 }
@@ -118,10 +118,10 @@ public class SchemaViewLabelProvider ext
             else
             // Default
             {
-                String[] names = at.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = at.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    label = names[0];
+                    label = names.get( 0 );
                 }
                 else
                 {
@@ -142,10 +142,10 @@ public class SchemaViewLabelProvider ext
             // Label
             if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
             {
-                String[] names = oc.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = oc.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    label = names[0];
+                    label = names.get( 0 );
                 }
                 else
                 {
@@ -154,8 +154,8 @@ public class SchemaViewLabelProvider ext
             }
             else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
             {
-                String[] names = oc.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = oc.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
                     label = ViewUtils.concateAliases( names );
                 }
@@ -171,10 +171,10 @@ public class SchemaViewLabelProvider ext
             else
             // Default
             {
-                String[] names = oc.getNamesRef();
-                if ( ( names != null ) && ( names.length > 0 ) )
+                List<String> names = oc.getNames();
+                if ( ( names != null ) && ( names.size() > 0 ) )
                 {
-                    label = names[0];
+                    label = names.get( 0 );
                 }
                 else
                 {
@@ -212,10 +212,10 @@ public class SchemaViewLabelProvider ext
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
                 {
-                    String[] names = at.getNamesRef();
-                    if ( ( names != null ) && ( names.length > 0 ) )
+                    List<String> names = at.getNames();
+                    if ( ( names != null ) && ( names.size() > 0 ) )
                     {
-                        secondaryLabel = names[0];
+                        secondaryLabel = names.get( 0 );
                     }
                     else
                     {
@@ -224,8 +224,8 @@ public class SchemaViewLabelProvider ext
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
                 {
-                    String[] names = at.getNamesRef();
-                    if ( ( names != null ) && ( names.length > 0 ) )
+                    List<String> names = at.getNames();
+                    if ( ( names != null ) && ( names.size() > 0 ) )
                     {
                         secondaryLabel = ViewUtils.concateAliases( names );
                     }
@@ -245,10 +245,10 @@ public class SchemaViewLabelProvider ext
 
                 if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
                 {
-                    String[] names = oc.getNamesRef();
-                    if ( ( names != null ) && ( names.length > 0 ) )
+                    List<String> names = oc.getNames();
+                    if ( ( names != null ) && ( names.size() > 0 ) )
                     {
-                        secondaryLabel = names[0];
+                        secondaryLabel = names.get( 0 );
                     }
                     else
                     {
@@ -257,8 +257,8 @@ public class SchemaViewLabelProvider ext
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
                 {
-                    String[] names = oc.getNamesRef();
-                    if ( ( names != null ) && ( names.length > 0 ) )
+                    List<String> names = oc.getNames();
+                    if ( ( names != null ) && ( names.size() > 0 ) )
                     {
                         secondaryLabel = ViewUtils.concateAliases( names );
                     }
@@ -300,11 +300,11 @@ public class SchemaViewLabelProvider ext
         {
             if ( element instanceof AttributeTypeWrapper )
             {
-                label += "  [" + ( ( AttributeTypeWrapper ) element ).getAttributeType().getSchema() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+                label += "  [" + ( ( AttributeTypeWrapper ) element ).getAttributeType().getSchemaName() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
             }
             else if ( element instanceof ObjectClassWrapper )
             {
-                label += "  [" + ( ( ObjectClassWrapper ) element ).getObjectClass().getSchema() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+                label += "  [" + ( ( ObjectClassWrapper ) element ).getObjectClass().getSchemaName() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
             }
         }
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Fri Oct  8 16:45:14 2010
@@ -704,7 +704,7 @@ public class SearchView extends ViewPart
                         // Aliases
                         if ( searchScope.contains( SearchInEnum.ALIASES ) )
                         {
-                            if ( checkArray( pattern, at.getNamesRef() ) )
+                            if ( checkList( pattern, at.getNames() ) )
                             {
                                 searchResults.add( at );
                                 continue;
@@ -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;
@@ -755,21 +755,21 @@ public class SearchView extends ViewPart
                         if ( searchScope.contains( SearchInEnum.MATCHING_RULES ) )
                         {
                             // Equality
-                            if ( checkString( pattern, at.getEqualityName() ) )
+                            if ( checkString( pattern, at.getEqualityOid() ) )
                             {
                                 searchResults.add( at );
                                 continue;
                             }
 
                             // Ordering
-                            if ( checkString( pattern, at.getOrderingName() ) )
+                            if ( checkString( pattern, at.getOrderingOid() ) )
                             {
                                 searchResults.add( at );
                                 continue;
                             }
 
                             // Substring
-                            if ( checkString( pattern, at.getSubstrName() ) )
+                            if ( checkString( pattern, at.getSubstringOid() ) )
                             {
                                 searchResults.add( at );
                                 continue;
@@ -788,7 +788,7 @@ public class SearchView extends ViewPart
                         // Aliases
                         if ( searchScope.contains( SearchInEnum.ALIASES ) )
                         {
-                            if ( checkArray( pattern, oc.getNamesRef() ) )
+                            if ( checkList( pattern, oc.getNames() ) )
                             {
                                 searchResults.add( oc );
                                 continue;
@@ -818,7 +818,7 @@ public class SearchView extends ViewPart
                         // Superiors
                         if ( searchScope.contains( SearchInEnum.SUPERIORS ) )
                         {
-                            if ( checkArray( pattern, oc.getSuperClassesNames() ) )
+                            if ( checkList( pattern, oc.getSuperiorOids() ) )
                             {
                                 searchResults.add( oc );
                                 continue;
@@ -828,7 +828,7 @@ public class SearchView extends ViewPart
                         // Mandatory Attributes
                         if ( searchScope.contains( SearchInEnum.MANDATORY_ATTRIBUTES ) )
                         {
-                            if ( checkArray( pattern, oc.getMustNamesList() ) )
+                            if ( checkList( pattern, oc.getMustAttributeTypeOids() ) )
                             {
                                 searchResults.add( oc );
                                 continue;
@@ -838,7 +838,7 @@ public class SearchView extends ViewPart
                         // Optional Attributes
                         if ( searchScope.contains( SearchInEnum.OPTIONAL_ATTRIBUTES ) )
                         {
-                            if ( checkArray( pattern, oc.getMayNamesList() ) )
+                            if ( checkList( pattern, oc.getMayAttributeTypeOids() ) )
                             {
                                 searchResults.add( oc );
                                 continue;
@@ -858,16 +858,16 @@ public class SearchView extends ViewPart
      *
      * @param pattern
      *      the Regex pattern
-     * @param array
+     * @param list
      *      the array
      * @return
      *      true if the pattern matches one of the aliases, false, if not.
      */
-    private boolean checkArray( Pattern pattern, String[] array )
+    private boolean checkList( Pattern pattern, List<String> list )
     {
-        if ( array != null )
+        if ( list != null )
         {
-            for ( String string : array )
+            for ( String string : list )
             {
                 return pattern.matcher( string ).matches();
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java?rev=1005894&r1=1005893&r2=1005894&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java Fri Oct  8 16:45:14 2010
@@ -65,56 +65,56 @@ public class SearchViewContentProvider i
         {
             public int compare( SchemaObject o1, SchemaObject o2 )
             {
-                String[] o1Names = null;
-                String[] o2Names = null;
+                List<String> o1Names = null;
+                List<String> o2Names = null;
 
                 if ( ( o1 instanceof AttributeTypeImpl ) && ( o2 instanceof AttributeTypeImpl ) )
                 {
                     AttributeTypeImpl at1 = ( AttributeTypeImpl ) o1;
                     AttributeTypeImpl at2 = ( AttributeTypeImpl ) o2;
 
-                    o1Names = at1.getNamesRef();
-                    o2Names = at2.getNamesRef();
+                    o1Names = at1.getNames();
+                    o2Names = at2.getNames();
                 }
                 else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof ObjectClassImpl ) )
                 {
                     ObjectClassImpl oc1 = ( ObjectClassImpl ) o1;
                     ObjectClassImpl oc2 = ( ObjectClassImpl ) o2;
 
-                    o1Names = oc1.getNamesRef();
-                    o2Names = oc2.getNamesRef();
+                    o1Names = oc1.getNames();
+                    o2Names = oc2.getNames();
                 }
                 else if ( ( o1 instanceof AttributeTypeImpl ) && ( o2 instanceof ObjectClassImpl ) )
                 {
                     AttributeTypeImpl at = ( AttributeTypeImpl ) o1;
                     ObjectClassImpl oc = ( ObjectClassImpl ) o2;
 
-                    o1Names = at.getNamesRef();
-                    o2Names = oc.getNamesRef();
+                    o1Names = at.getNames();
+                    o2Names = oc.getNames();
                 }
                 else if ( ( o1 instanceof ObjectClassImpl ) && ( o2 instanceof AttributeTypeImpl ) )
                 {
                     ObjectClassImpl oc = ( ObjectClassImpl ) o1;
                     AttributeTypeImpl at = ( AttributeTypeImpl ) o2;
 
-                    o1Names = oc.getNamesRef();
-                    o2Names = at.getNamesRef();
+                    o1Names = oc.getNames();
+                    o2Names = at.getNames();
                 }
 
                 // Comparing the First Name
                 if ( ( o1Names != null ) && ( o2Names != null ) )
                 {
-                    if ( ( o1Names.length > 0 ) && ( o2Names.length > 0 ) )
+                    if ( ( o1Names.size() > 0 ) && ( o2Names.size() > 0 ) )
                     {
-                        return o1Names[0].compareToIgnoreCase( o2Names[0] );
+                        return o1Names.get(0).compareToIgnoreCase( o2Names.get(0) );
                     }
-                    else if ( ( o1Names.length == 0 ) && ( o2Names.length > 0 ) )
+                    else if ( ( o1Names.size() == 0 ) && ( o2Names.size() > 0 ) )
                     {
-                        return "".compareToIgnoreCase( o2Names[0] ); //$NON-NLS-1$
+                        return "".compareToIgnoreCase( o2Names.get(0) ); //$NON-NLS-1$
                     }
-                    else if ( ( o1Names.length > 0 ) && ( o2Names.length == 0 ) )
+                    else if ( ( o1Names.size() > 0 ) && ( o2Names.size() == 0 ) )
                     {
-                        return o1Names[0].compareToIgnoreCase( "" ); //$NON-NLS-1$
+                        return o1Names.get(0).compareToIgnoreCase( "" ); //$NON-NLS-1$
                     }
                 }
 



Mime
View raw message