Changeset 9642

Timestamp:

2005-04-12T11:03:02+12:00 (19 years ago)

Author:

kjdon

Message:

fixed up language type arguments - the list now displays the name not the code, and the existing value will be selected in the list

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java

@@ -426 +426 @@
         case Argument.LANGUAGE:
         value = new GComboBox(CollectionDesignManager.language_manager.getLanguageCodes().toArray(), false);
-
-        // Now ensure we have the existing value or default value selected if either exist.
-        Language selected = null;
-        if(existing_value != null && existing_value.length() > 0) {
-            selected = CollectionDesignManager.language_manager.getLanguage(existing_value);
-        }
-        else if(default_value != null) {
-            selected = CollectionDesignManager.language_manager.getLanguage(default_value);
-        }
-        if(selected != null) {
-            ((JComboBox)value).setSelectedItem(selected.getCode());
+        // we want to display the language name not the code
+        ((JComboBox)value).setRenderer(new LanguageListCellRenderer());
+        // Now ensure we have the existing value or default value selected if either exist in our known languages
+        String lang_name = null;
+        String selected_code = existing_value;
+        if(existing_value != null && !existing_value.equals("")) {
+            lang_name = CollectionDesignManager.language_manager.getLanguageName(existing_value);
+        }
+        if(lang_name == null && default_value != null) {
+            lang_name = CollectionDesignManager.language_manager.getLanguageName(default_value);
+            selected_code = default_value;
+        }
+        if (lang_name != null) {
+            ((JComboBox)value).setSelectedItem(selected_code);
         }
         break;