Changeset 8591

Timestamp:

2004-11-18T10:10:57+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed some dead code.

File:

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

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

@@ -240 +240 @@
     if (component != null) {
         // Update the component using the AWTEvent queue
-        ComponentDetails details = new ComponentDetails(true, text_key, args, false, null);
-        ComponentUpdateTask task = new ComponentUpdateTask(component, details);
-        SwingUtilities.invokeLater(task);
+        SwingUtilities.invokeLater(new ComponentUpdateTask(component, get(text_key, args), null));
     }
     }
@@ -251 +249 @@
     if (component != null) {
         // Update the component using the AWTEvent queue
-        ComponentDetails details = new ComponentDetails(false, null, null, true, tooltip_key);
-        ComponentUpdateTask task = new ComponentUpdateTask(component, details);
-        SwingUtilities.invokeLater(task);
+        SwingUtilities.invokeLater(new ComponentUpdateTask(component, null, get(tooltip_key)));
     }
     }
@@ -261 +257 @@
     {
     if (component != null) {
-        ComponentUpdateTask task = new ComponentUpdateTask(component, null, tooltip);
-        SwingUtilities.invokeLater(task);
-    }
-    }
-
-
-    static private class ComponentDetails
-    {
-    public boolean has_text;
-    public String text_key;
-    public String[] text_args;
-    public boolean has_tooltip;
-    public String tooltip_key;
-
-    public ComponentDetails(boolean has_text, String text_key, String[] text_args,
-                boolean has_tooltip, String tooltip_key)
-    {
-        this.has_text = has_text;
-        this.text_key = text_key;
-        this.text_args = text_args;
-        this.has_tooltip = has_tooltip;
-        this.tooltip_key = tooltip_key;
+        // Update the component using the AWTEvent queue
+        SwingUtilities.invokeLater(new ComponentUpdateTask(component, null, tooltip));
     }
     }
@@ -290 +266 @@
     implements Runnable {
 
-    private Component component;
+    private Component component = null;
     private String text = null;
     private String tooltip = null;
-
-
-    public ComponentUpdateTask(Component component, ComponentDetails details)
-    {
-        this.component = component;
-
-        if (details.has_text) {
-        text = get(details.text_key, details.text_args);
-        }
-        if (details.has_tooltip) {
-        tooltip = get(details.tooltip_key, (String[]) null);
-        }
-    }