You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2007/07/23 17:27:11 UTC
svn commit: r558773 - in
/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards:
NewAttributeTypeGeneralWizardPage.java
NewObjectClassGeneralPageWizardPage.java
Author: pamarcelot
Date: Mon Jul 23 08:27:10 2007
New Revision: 558773
URL: http://svn.apache.org/viewvc?view=rev&rev=558773
Log:
Added sorting to the schema combo list.
Modified:
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java?view=diff&rev=558773&r1=558772&r2=558773
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java Mon Jul 23 08:27:10 2007
@@ -20,6 +20,11 @@
package org.apache.directory.studio.apacheds.schemaeditor.view.wizards;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.studio.apacheds.schemaeditor.Activator;
import org.apache.directory.studio.apacheds.schemaeditor.PluginConstants;
@@ -224,10 +229,22 @@
*/
private void initFields()
{
- schemaComboViewer.setInput( schemaHandler.getSchemas() );
-
- if ( selectedSchema != null )
+ // Filling the Schemas table
+ if ( schemaHandler != null )
{
+ List<Schema> schemas = new ArrayList<Schema>();
+ schemas.addAll( schemaHandler.getSchemas() );
+
+ Collections.sort( schemas, new Comparator<Schema>()
+ {
+ public int compare( Schema o1, Schema o2 )
+ {
+ return o1.getName().compareToIgnoreCase( o2.getName() );
+ }
+ } );
+
+ schemaComboViewer.setInput( schemas );
+
schemaComboViewer.setSelection( new StructuredSelection( selectedSchema ) );
}
}
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java?view=diff&rev=558773&r1=558772&r2=558773
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java Mon Jul 23 08:27:10 2007
@@ -20,6 +20,11 @@
package org.apache.directory.studio.apacheds.schemaeditor.view.wizards;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.studio.apacheds.schemaeditor.Activator;
import org.apache.directory.studio.apacheds.schemaeditor.PluginConstants;
@@ -224,10 +229,22 @@
*/
private void initFields()
{
- schemaComboViewer.setInput( schemaHandler.getSchemas() );
-
- if ( selectedSchema != null )
+ // Filling the Schemas table
+ if ( schemaHandler != null )
{
+ List<Schema> schemas = new ArrayList<Schema>();
+ schemas.addAll( schemaHandler.getSchemas() );
+
+ Collections.sort( schemas, new Comparator<Schema>()
+ {
+ public int compare( Schema o1, Schema o2 )
+ {
+ return o1.getName().compareToIgnoreCase( o2.getName() );
+ }
+ } );
+
+ schemaComboViewer.setInput( schemas );
+
schemaComboViewer.setSelection( new StructuredSelection( selectedSchema ) );
}
}