Changeset 12708

Timestamp:

2006-09-08T09:41:27+12:00 (18 years ago)

Author:

kjdon

Message:

changed the variable list slightly - moved the label to be the first element in the list

File:

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

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

@@ -240 +240 @@
     {
     ArrayList variable_model = new ArrayList();
-        variable_model.add(""); 
+        variable_model.add(Dictionary.get("CDM.FormatManager.Insert_Variable")); 
     variable_model.add("[Text]");
     ArrayList every_metadata_set_element = MetadataSetManager.getEveryMetadataSetElement();
@@ -344 +344 @@
         
         JPanel variable_pane = new JPanel();
-        JLabel variable_label = new JLabel(Dictionary.get("CDM.FormatManager.Variable"));
-        
+                
         variable_combobox = new JComboBox(variable_model.toArray());
         variable_combobox.setToolTipText(Dictionary.get("CDM.FormatManager.Variable_Tooltip"));
@@ -427 +426 @@
         variable_pane.setBorder(BorderFactory.createEmptyBorder(2,0,2,0));
         variable_pane.setLayout(new GridLayout(1,3));
-        variable_pane.add(variable_label);
+        variable_pane.add(new JPanel());
         variable_pane.add(variable_combobox);
         variable_pane.add(rupanel);
@@ -483 +482 @@
         feature_combobox.setSelectedItem(selected_feature);
 
-        // Update the variable model, trying to maintain the same selected object
-        Object selected_variable = variable_combobox.getSelectedItem();
+        // Update the variable model,
         variable_model = buildVariableModel();
         variable_combobox.setModel(new DefaultComboBoxModel(variable_model.toArray()));
-        variable_combobox.setSelectedItem(selected_variable);
-        }   
+        }   
     }
 
@@ -835 +832 @@
         implements ActionListener {
         public void actionPerformed(ActionEvent event) {
+        int selected_index = variable_combobox.getSelectedIndex();
+        if (selected_index == 0) return;
                 String selected_value = (String)variable_combobox.getSelectedItem();
-              
-        if (!selected_value.equals("")){
-            editor_textarea.insert(selected_value, editor_textarea.getCaretPosition());   
-            undo_button.setEnabled(true);
-
-        }
-        }
-        
+        editor_textarea.insert(selected_value, editor_textarea.getCaretPosition());   
+        undo_button.setEnabled(true);
+        variable_combobox.setSelectedIndex(0);
+        }
+                
     }