Changeset 10012

Timestamp:

2005-06-03T15:36:09+12:00 (19 years ago)

Author:

mdewsnip

Message:

Removed the last of the graphical functions from the Utility class -- meaning that it can now be used by server-side programs for the GLI applet.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gems/GEMS.java (modified) (1 diff)
• gui/MenuBar.java (modified) (6 diffs)
• gui/SimpleMenuBar.java (modified) (2 diffs)
• util/JarTools.java (modified) (1 diff)
• util/Utility.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -475 +475 @@
 
         // Help menu. Is not used! --Matthew
-        help = new JMenu();
-        help.setIcon(Utility.HELP_ICON);
-        Dictionary.setText(help, "Menu.Help");
+        // help = new JMenu();
+        // help.setIcon(JarTools.getImage("help.gif"));
+        // Dictionary.setText(help, "Menu.Help");
 
         help_help = new JMenuItem();

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

@@ -44 +44 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.Utility;
 
@@ -51 +52 @@
  */
 public class MenuBar
-    extends JMenuBar {
+    extends JMenuBar
+{
+    static public ImageIcon BLANK_ICON = JarTools.getImage("blank.gif");
+    static public ImageIcon HELP_ICON = JarTools.getImage("help.gif");
+
     /** The icon to be displayed alongside the context choosen help file. */
     private int current_tab          = -1;
@@ -180 +185 @@
     // Help menu
     help = new JMenu();
-    help.setIcon(Utility.HELP_ICON);
+    help.setIcon(HELP_ICON);
     Dictionary.setText(help, "Menu.Help");
 
@@ -187 +192 @@
     Dictionary.registerText(help_general, "Source.General");
 
-    help_download = new JMenuItem(Utility.BLANK_ICON);
+    help_download = new JMenuItem(BLANK_ICON);
     help_download.addActionListener(Gatherer.g_man);
     Dictionary.registerText(help_download, "GUI.Download");
 
-    help_gather = new JMenuItem(Utility.BLANK_ICON);
+    help_gather = new JMenuItem(BLANK_ICON);
     help_gather.addActionListener(Gatherer.g_man);
     Dictionary.registerText(help_gather, "GUI.Gather");
 
-    help_enrich = new JMenuItem(Utility.BLANK_ICON);
+    help_enrich = new JMenuItem(BLANK_ICON);
     help_enrich.addActionListener(Gatherer.g_man);
     Dictionary.registerText(help_enrich, "GUI.Enrich");
 
-    help_design = new JMenuItem(Utility.BLANK_ICON);
+    help_design = new JMenuItem(BLANK_ICON);
     help_design.addActionListener(Gatherer.g_man);
     Dictionary.registerText(help_design, "GUI.Design");
 
-    help_create = new JMenuItem(Utility.BLANK_ICON);
+    help_create = new JMenuItem(BLANK_ICON);
     help_create.addActionListener(Gatherer.g_man);
     Dictionary.registerText(help_create, "GUI.Create");
@@ -265 +270 @@
         selected = help.getItem(current_tab);
         if(selected != null) {
-        selected.setIcon(Utility.BLANK_ICON);
+        selected.setIcon(BLANK_ICON);
         }
     }
@@ -271 +276 @@
     selected = help.getItem(current_tab);
     if(selected != null) {
-        selected.setIcon(Utility.HELP_ICON);
+        selected.setIcon(HELP_ICON);
     }
     selected = null;

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

@@ -5 +5 @@
 import javax.swing.*;
 import org.greenstone.gatherer.Dictionary;
-import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.util.JarTools;
 
 public class SimpleMenuBar
@@ -16 +16 @@
     this.page_name = page_name;
     JMenu help = new JMenu();
-    help.setIcon(Utility.HELP_ICON);
+    help.setIcon(JarTools.getImage("help.gif"));
     Dictionary.setText(help, "Menu.Help");
 

trunk/gli/src/org/greenstone/gatherer/util/JarTools.java

@@ -35 +35 @@
 public class JarTools
 {
-    static public ImageIcon ERROR_ICON = null; 
+    static private ImageIcon ERROR_ICON = null; 
     // static public Class base = null;
+
+
+    static public void initialise()
+    {
+    ERROR_ICON = getImage("error.gif");
+    }
 
 

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -37 +37 @@
 package org.greenstone.gatherer.util;
 
-import java.awt.*;
+// Don't even think about adding import java.awt.* here!
+// The functions in this class should not use any graphical classes. Put your function somewhere else buster!
 import java.io.*;
 import java.net.*;
 import java.util.*;
 import java.util.zip.*;
-import javax.swing.*;
-import javax.swing.tree.*;
+// Don't even think about adding import javax.swing.* here!
+// The functions in this class should not use any graphical classes. Put your function somewhere else buster!
 import org.apache.xerces.parsers.*;
 import org.apache.xerces.dom.DocumentImpl;
@@ -55 +56 @@
 import org.w3c.dom.*;
 import org.xml.sax.*;
+
 
 /** To provide a library of common methods, in a static context, for use in the Gatherer.
@@ -122 +124 @@
     static protected File gli_user_folder = null;
 
-    // These are out of alphabetic order to avoid forward reference error.
     /** The default icon to produce a 'help-icon' sized blank space before a menu entry. */
     static public Class base = null;
-    static public ImageIcon BLANK_ICON = null;
-    /** The default error icon image. */
-    static public ImageIcon ERROR_ICON = null; 
-    static public ImageIcon HELP_ICON = null; 
     
 
@@ -853 +850 @@
     {
     base = base_object.getClass();
-
-    BLANK_ICON = new ImageIcon(base.getResource("/images/blank.gif"));
-    ERROR_ICON = new ImageIcon(base.getResource("/images/error.gif"));
-    HELP_ICON  = new ImageIcon(base.getResource("/images/help.gif"));
     }