Changeset 12115 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2006-07-10T14:42:54+12:00 (18 years ago)

Author:

kjdon

Message:

Changed text handling to use Dictionary.get rather than Dictionary.setText or Dictionary.registerBoth etc

Location:

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit

Files:

• AutofilterDialog.java (modified) (5 diffs)
• MetaAuditFrame.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java

@@ -111 +111 @@
     setJMenuBar(new SimpleMenuBar("reviewingmetadata")); 
     setSize(SIZE);
-    Dictionary.setText(this, "Autofilter.Title");
-
+    setTitle(Dictionary.get("Autofilter.Title"));
+    
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
     JPanel name_pane = new JPanel();
-    JLabel name_label = new JLabel();
-    Dictionary.setText(name_label, "Autofilter.Name");
+    JLabel name_label = new JLabel(Dictionary.get("Autofilter.Name"));
     JTextField name_template = new JTextField();
     name = new JLabel();
@@ -124 +123 @@
     JPanel value_pane = new JPanel();
     JPanel inner_value_pane = new JPanel();
-    JLabel value_label = new JLabel();
-    Dictionary.setText(value_label, "Autofilter.eqeq"); 
+    JLabel value_label = new JLabel(Dictionary.get("Autofilter.eqeq"));
     value = new JComboBox();
     value.setEditable(false);
@@ -136 +134 @@
     first_value.addItem("");
     first_value.setSelectedItem("");
-    first_case = new JCheckBox();
-    Dictionary.setText(first_case, "Autofilter.Case_Sensitive");
+    first_case = new JCheckBox(Dictionary.get("Autofilter.Case_Sensitive"));
     JPanel operator_pane = new JPanel();
-    JLabel operator_label = new JLabel();
-    Dictionary.setText(operator_label, "Autofilter.Operator");
+    JLabel operator_label = new JLabel(Dictionary.get("Autofilter.Operator"));
     ButtonGroup operator_group = new ButtonGroup();
-    and_radiobutton = new JRadioButton();
+    and_radiobutton = new JRadioButton(Dictionary.get("Autofilter.AND"));
     and_radiobutton.setOpaque(false);
-    Dictionary.setText(and_radiobutton, "Autofilter.AND");
-    none_radiobutton = new JRadioButton();
+    none_radiobutton = new JRadioButton(Dictionary.get("Autofilter.None"));
     none_radiobutton.setOpaque(false);
     none_radiobutton.setSelected(true);
-    Dictionary.setText(none_radiobutton, "Autofilter.None");
-    or_radiobutton = new JRadioButton();
+    or_radiobutton = new JRadioButton(Dictionary.get("Autofilter.OR"));
     or_radiobutton.setOpaque(false);
-    Dictionary.setText(or_radiobutton, "Autofilter.OR");
     operator_group.add(none_radiobutton);
     operator_group.add(and_radiobutton);
@@ -164 +157 @@
     second_value.addItem("");
     second_value.setSelectedItem("");
-    second_case = new JCheckBox();
-    Dictionary.setText(second_case, "Autofilter.Case_Sensitive"); 
+    second_case = new JCheckBox(Dictionary.get("Autofilter.Case_Sensitive"));
     JPanel lower_pane = new JPanel();
     JPanel order_pane = new JPanel();
-    Dictionary.setTooltip(order_pane, "Autofilter.Order_Tooltip");
-    JLabel order_label = new JLabel();
-    Dictionary.setText(order_label, "Autofilter.Order");
-
+    order_pane.setToolTipText(Dictionary.get("Autofilter.Order_Tooltip"));
+    JLabel order_label = new JLabel(Dictionary.get("Autofilter.Order"));
+    
     ButtonGroup order_group = new ButtonGroup();
-    ascending_radiobutton = new JRadioButton();
+    ascending_radiobutton = new JRadioButton(Dictionary.get("Autofilter.Ascending"));
     ascending_radiobutton.setOpaque(false);
     ascending_radiobutton.setSelected(true);
-    Dictionary.setText(ascending_radiobutton, "Autofilter.Ascending");
-    descending_radiobutton = new JRadioButton();
+    descending_radiobutton = new JRadioButton(Dictionary.get("Autofilter.Descending"));
     descending_radiobutton.setOpaque(false);
-    Dictionary.setText(descending_radiobutton, "Autofilter.Descending");
     order_group.add(ascending_radiobutton);
     order_group.add(descending_radiobutton);
@@ -189 +178 @@
     }
     JPanel button_pane = new JPanel();
-    cancel_button = new GLIButton();
-    cancel_button.setMnemonic(KeyEvent.VK_C);
-    Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
-    remove_button = new GLIButton();
-    remove_button.setMnemonic(KeyEvent.VK_R);
-    Dictionary.setBoth(remove_button, "Autofilter.Remove", "Autofilter.Remove_Tooltip");
-    set_button = new GLIButton();
-    set_button.setMnemonic(KeyEvent.VK_S);
-    Dictionary.setBoth(set_button, "Autofilter.Set", "Autofilter.Set_Tooltip");
-
+    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
+    remove_button = new GLIButton(Dictionary.get("Autofilter.Remove"), Dictionary.get("Autofilter.Remove_Tooltip"));
+    set_button = new GLIButton(Dictionary.get("Autofilter.Set"), Dictionary.get("Autofilter.Set_Tooltip"));
+    
     // Connection
     and_radiobutton.addActionListener(new CheckListener(true));

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditFrame.java

@@ -111 +111 @@
     setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
     setSize(SIZE);
+    setTitle(Dictionary.get("MetaAudit.Title"));
     setJMenuBar(new SimpleMenuBar("reviewingmetadata")); 
-    Dictionary.registerText(this, "MetaAudit.Title");
+    
     JPanel content_pane = (JPanel) getContentPane();
     JPanel button_pane = new JPanel();
 
-    JButton close_button = new GLIButton();
-    close_button.setMnemonic(KeyEvent.VK_C);
-    Dictionary.registerBoth(close_button, "MetaAudit.Close", "MetaAudit.Close_Tooltip");
-
+    JButton close_button = new GLIButton(Dictionary.get("MetaAudit.Close"), Dictionary.get("MetaAudit.Close_Tooltip"));
+    
     // Connection
     close_button.addActionListener(new CloseListener());