Changeset 11464

Timestamp:

2006-03-22T15:36:48+12:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed a bug where the variable model wasn't updated correctly, and removed some dead code.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/FormatManager.java (modified) (5 diffs)

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

@@ -183 +183 @@
     }
 
-    private HashMap buildDefaultMappings(ArrayList features_model, ArrayList parts_model) {
-    DebugStream.println("buildDefaultMappings(): replace me with something that reads in a data xml file.");
-    return new HashMap();
-    }
-
     private ArrayList buildFeatureModel() {
     // Rebuild feature model.
@@ -214 +209 @@
     }
 
-    private ArrayList buildVariableModel() {
-    DebugStream.println("buildVariableModel(): replace me with something that reads in a data xml file.");
+    private ArrayList buildVariableModel()
+    {
     ArrayList variable_model = new ArrayList();
     variable_model.add("[Text]");
@@ -248 +243 @@
     private boolean ready = false; // Are these controls available to be refreshed
     private CardLayout card_layout;
-    private HashMap default_mappings;
     private JButton add_button;
     private JButton insert_button;
@@ -270 +264 @@
         part_model = buildPartModel();
         variable_model = buildVariableModel();
-        default_mappings = buildDefaultMappings(feature_model, part_model);
 
         // Create
@@ -437 +430 @@
         if(ready) {
         model.refresh();
+
+        // Update the feature model, trying to maintain the same selected object
+        Object selected_feature = feature_combobox.getSelectedItem();
         feature_model = buildFeatureModel();
-        // Remember the current selection
-        Object selected_object = feature_combobox.getSelectedItem();
         feature_combobox.setModel(new DefaultComboBoxModel(feature_model.toArray()));
-        // Now restore the selected object as best as possible
-        feature_combobox.setSelectedItem(selected_object);
-        selected_object = null;
+        feature_combobox.setSelectedItem(selected_feature);
+
+        // Update the variable model, trying to maintain the same selected object
+        Object selected_variable = variable_combobox.getSelectedItem();
+        variable_model = buildVariableModel();
+        variable_combobox.setModel(new DefaultComboBoxModel(variable_model.toArray()));
+        variable_combobox.setSelectedItem(selected_variable);
         }   
     }