Changeset 9101

Timestamp:

2005-02-18T14:19:24+13:00 (19 years ago)

Author:

kjdon

Message:

made the strings come from the dictionary, changed replace to merge

File:

• trunk/gli/src/org/greenstone/gatherer/gui/MetadataImportMappingPrompt.java (modified) (9 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/MetadataImportMappingPrompt.java

@@ -19 +19 @@
 {
     final static public int ADD_BUTTON_PRESSED = 0;
-    final static public int REPLACE_BUTTON_PRESSED = 1;
+    final static public int MERGE_BUTTON_PRESSED = 1;
     final static public int IGNORE_BUTTON_PRESSED = 2;
     final static private Dimension DIALOG_SIZE = new Dimension(640, 180);
@@ -28 +28 @@
     private GComboBox metadata_elements_combobox = null;
     private JButton add_button = null;
-    private JButton replace_button = null;
+    private JButton merge_button = null;
     private JButton ignore_button = null;
     private JDialog on_screen = null;
@@ -42 +42 @@
     dialog.setSize(DIALOG_SIZE);
     dialog.setJMenuBar(new SimpleMenuBar("importingpreviouslyassignedmetadata"));
-    Dictionary.setText(dialog, "MSMPrompt.Merge_MDS");
+    Dictionary.setText(dialog, "MIMP.Title");
 
     // All the loaded metadata sets except the extracted metadata set are applicable
@@ -55 +55 @@
     add_button.addActionListener(this);
     add_button.setMnemonic(KeyEvent.VK_A);
-    add_button.setText("Add");
-    // Dictionary.registerBoth(add_button, "MSMPrompt.Add", "MSMPrompt.Add_Tooltip");
+    Dictionary.registerBoth(add_button, "MIMP.Add", "MIMP.Add_Tooltip");
 
-    replace_button = new GLIButton();
-    replace_button.addActionListener(this);
-    replace_button.setEnabled(true);
-    replace_button.setMnemonic(KeyEvent.VK_M);
-    replace_button.setText("Replace");
-    // Dictionary.registerBoth(merge, "MSMPrompt.Merge", "MSMPrompt.Merge_Tooltip");
+    merge_button = new GLIButton();
+    merge_button.addActionListener(this);
+    merge_button.setEnabled(true);
+    merge_button.setMnemonic(KeyEvent.VK_M);
+    Dictionary.registerBoth(merge_button, "MIMP.Merge", "MIMP.Merge_Tooltip");
 
     ignore_button = new GLIButton();
@@ -69 +67 @@
     ignore_button.setEnabled(true);
     ignore_button.setMnemonic(KeyEvent.VK_S);
-    ignore_button.setText("Ignore");
-    // Dictionary.registerBoth(ignore_button, "MSMPrompt.Ignore", "MSMPrompt.Ignore_Tooltip");
+    Dictionary.registerBoth(ignore_button, "MIMP.Ignore", "MIMP.Ignore_Tooltip");
 
+    // add instructions!!!
+    // "MIMP.Instructions", args: source elem
     metadata_elements_combobox = new GComboBox();
 
@@ -81 +80 @@
     JPanel left_pane = new JPanel();
     left_pane.setLayout(new GridLayout(3,1));
-    left_pane.add(new JLabel("Source metadata element:"));
-    left_pane.add(new JLabel("Target metadata set:"));
-    left_pane.add(new JLabel("Target metadata element:"));
+    left_pane.add(new JLabel(Dictionary.get("MIMP.Source_Element")));
+    left_pane.add(new JLabel(Dictionary.get("MIMP.Target_Set")));
+    left_pane.add(new JLabel(Dictionary.get("MIMP.Target_Element")));
 
     JPanel right_pane = new JPanel();
@@ -95 +94 @@
     button_pane.setLayout(new GridLayout(1,3));
     button_pane.add(add_button);
-    button_pane.add(replace_button);
+    button_pane.add(merge_button);
     button_pane.add(ignore_button);
 
@@ -101 +100 @@
     content_pane.setLayout(new BorderLayout());
     content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    content_pane.add(left_pane, BorderLayout.CENTER);
-    content_pane.add(right_pane, BorderLayout.EAST);
+    content_pane.add(left_pane, BorderLayout.WEST);
+    content_pane.add(right_pane, BorderLayout.CENTER);
     content_pane.add(button_pane, BorderLayout.SOUTH);
 
@@ -125 +124 @@
         result = ADD_BUTTON_PRESSED;
     }
-    if (esrc == replace_button) {
-        result = REPLACE_BUTTON_PRESSED;
+    if (esrc == merge_button) {
+        result = MERGE_BUTTON_PRESSED;
     }
     if (esrc == ignore_button) {