Commit emails of the iDok project

["Apache" <apache AT savannah.psi.ch>]

Author: huebner AT PSI.CH
Date: Tue Jul 29 11:35:39 2008
New Revision: 153

Log:
Added improvement IDO-163: Sort key names in advanced search dialog

Modified:
   trunk/java/ch/idok/qtgui/AdvancedSearchController.java

Modified: trunk/java/ch/idok/qtgui/AdvancedSearchController.java
==============================================================================
--- trunk/java/ch/idok/qtgui/AdvancedSearchController.java      (original)
+++ trunk/java/ch/idok/qtgui/AdvancedSearchController.java      Tue Jul 29 
11:35:39 2008
@@ -19,7 +19,9 @@
 
 package ch.idok.qtgui;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import ch.idok.common.errorhandling.DmsException;
@@ -121,6 +123,7 @@
 
         if (fieldList != null) {
             gui_.metaDataComboBox.clear();
+            Arrays.sort(fieldList);
             gui_.metaDataComboBox.addItems(Arrays.asList(fieldList));
         }
     }
@@ -138,14 +141,17 @@
 
     private void fillMetadataListsFromSchema() {
         gui_.metaDataComboBox.clear();
+        List<String> records = new ArrayList<String>();
         for (int i = 0; i < schemaController_.size(); i++) {
             Field record = schemaController_.getRecord(i);
             if (record.ntupleHeader != null) {
-                gui_.metaDataComboBox.addItems(record.ntupleHeader);
+                records.addAll(record.ntupleHeader);
             } else {
-                gui_.metaDataComboBox.addItem(record.key);
+                records.add(record.key);
             }
         }
+        Collections.sort(records);
+        gui_.metaDataComboBox.addItems(records);
         fillValueListsFromSchema(gui_.metaDataComboBox.currentText());
     }