Changeset 5593 for trunk/gli/src/org/greenstone/gatherer/Dictionary.java

Timestamp:

2003-10-07T15:35:23+13:00 (21 years ago)

Author:

mdewsnip

Message:

Changed calls to the Dictionary.

File:

• trunk/gli/src/org/greenstone/gatherer/Dictionary.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/Dictionary.java

@@ -229 +229 @@
 
 
-    static public String newget(String key)
-    {
-    return self.get(key);
-    }
-
-
-    static public String newget(String key, String arg)
+    static public String get(String key)
+    {
+    return self.oldget(key);
+    }
+
+
+    static public String get(String key, String arg)
     {
     String[] args = new String[1];
     args[0] = arg;
-    return self.get(key, args);
-    }
-
-
-    static public String newget(String key, String[] args)
-    {
-    return self.get(key, args);
+    return self.oldget(key, args);
+    }
+
+
+    static public String get(String key, String[] args)
+    {
+    return self.oldget(key, args);
     }
 
@@ -255 +255 @@
      * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
      */
-    public String get(String key) {
-    return get(key, (String[])null);
-    }
+    public String oldget(String key) {
+    return oldget(key, (String[])null);
+    }
+
     /**
      * @deprecated
      * Convienence method with transforms the second string argument into a string array. */
-    public String get(String key, String arg) {
+    public String oldget(String key, String arg) {
     String[] args = new String[1];
     args[0] = arg;
-    return get(key, args);
+    return oldget(key, args);
     }
 
@@ -273 +274 @@
      * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
      */
-    public String get(String key, String args[]) {
+    public String oldget(String key, String args[]) {
     if(key_list != null) {
         synchronized(this) {
@@ -310 +311 @@
             f_subargs[0] = "Arial";
             }
-            complete = complete + get("Farg" + arg_num, f_subargs);
+            complete = complete + oldget("Farg" + arg_num, f_subargs);
         }
         }
@@ -452 +453 @@
 
         if (details.has_text) {
-        text = self.get(details.text_key, details.text_args);
+        text = self.oldget(details.text_key, details.text_args);
         }
         if (details.has_tooltip) {
-        tooltip = self.get(details.tooltip_key, (String[]) null);
+        tooltip = self.oldget(details.tooltip_key, (String[]) null);
         }
     }
@@ -496 +497 @@
 
     /**
-     * @deprecated
-     * Register a tab pane component. */
+     * Register a tab pane component. This will be deprecated eventually. */
     static public void register(JTabbedPane component)
     {
-    if(component != null) {
+    if (component != null) {
         String[] args = new String[component.getTabCount()];
 
         // Iterate through the tabbed panes tabs, updating values and recording the original key of each item in args.
-        for(int i = 0; i < args.length; i++) {
+        for (int i = 0; i < args.length; i++) {
         if (args[i] == null) {
             args[i] = component.getTitleAt(i);
         }
-        String value = self.get(args[i], (String[])null);
-        String tooltip = self.get(args[i] + "_Tooltip", (String[])null);
-        JTabbedPaneChangeTask task = new JTabbedPaneChangeTask(component, args[i], i, value, tooltip);
+        String value = self.oldget(args[i], (String[]) null);
+        String tooltip = self.oldget(args[i] + "_Tooltip", (String[]) null);
+        JTabbedPaneChangeTask task = new JTabbedPaneChangeTask(component, i, value, tooltip);
         SwingUtilities.invokeLater(task);
         }
@@ -520 +520 @@
     static private class JTabbedPaneChangeTask
     implements Runnable {
-    protected String key;
-    protected String value;
+
+    private JTabbedPane component;
     private int index;
-    private JTabbedPane component;
+    private String value;
     private String tooltip;
 
-    public JTabbedPaneChangeTask(JTabbedPane component, String key, int index, String value, String tooltip) {
-        this.key = key;
-        this.value = value;
+    public JTabbedPaneChangeTask(JTabbedPane component, int index, String value, String tooltip) {
         this.component = component;
         this.index = index;
+        this.value = value;
         this.tooltip = tooltip;
     }
+
     public void run() {
         component.setTitleAt(index, value);
-        if(!tooltip.equals(key+"_Tooltip")) {
-        component.setToolTipTextAt(index, tooltip);
-        }
-        else {
-        component.setToolTipTextAt(index, null);
-        }
+        component.setToolTipTextAt(index, tooltip);
     }
     }