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

Timestamp:

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

Author:

mdewsnip

Message:

Moved Utility.getImage into JarTools, as part of tidying up the Utility class.

Location:

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

Files:

• AboutDialog.java (modified) (3 diffs)
• GUIManager.java (modified) (7 diffs)
• GatherPane.java (modified) (2 diffs)
• HelpFrame.java (modified) (2 diffs)
• LockFileDialog.java (modified) (2 diffs)
• MetadataValueTablePane.java (modified) (2 diffs)
• OpenCollectionDialog.java (modified) (2 diffs)
• WarningDialog.java (modified) (2 diffs)
• metaaudit/HeaderRenderer.java (modified) (2 diffs)

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

@@ -35 +35 @@
 import javax.swing.*;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.Utility;
 
@@ -59 +60 @@
      * @see org.greenstone.gatherer.gui.AboutDialog.CloseButtonListener
      * @see org.greenstone.gatherer.gui.GLIButton
-     * @see org.greenstone.gatherer.util.Utility#getImage
      * @see org.greenstone.gatherer.util.Utility#PROGRAM_NAME
      * @see org.greenstone.gatherer.util.Utility#PROGRAM_VERSION
@@ -70 +70 @@
     JPanel content_pane = (JPanel) getContentPane();
     JPanel upper_pane = new JPanel();
-    ImageIcon icon = Utility.getImage("gatherer_medium.gif");
+    ImageIcon icon = JarTools.getImage("gatherer_medium.gif");
     ImageIcon scaled_icon = new ImageIcon(icon.getImage().getScaledInstance(ICON_SIZE, ICON_SIZE, Image.SCALE_DEFAULT));
     JLabel icon_label = new JLabel(scaled_icon);

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

@@ -58 +58 @@
 import org.greenstone.gatherer.gui.metaaudit.MetaAuditFrame;
 import org.greenstone.gatherer.gui.tree.DragTree;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.TreeSynchronizer;
@@ -324 +325 @@
 
         // Pretty corner icon
-        this.setIconImage(Utility.getImage("gatherer_small.gif").getImage());
+        this.setIconImage(JarTools.getImage("gatherer_small.gif").getImage());
         // BorderLayout for the main screen. I'll try my best to avoid these in subcomponents as they're space greedy.
         content_pane.setLayout(new BorderLayout());
@@ -344 +345 @@
         download_pane = new DownloadPane();
         // "GUI.Download_Tooltip" is used automatically
-        tab_pane.addTab("GUI.Download", Utility.getImage("download.gif"), download_pane);
+        tab_pane.addTab("GUI.Download", JarTools.getImage("download.gif"), download_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(download_pane), Configuration.get("workflow.download", false));
         }
@@ -352 +353 @@
         if(Configuration.get("workflow.gather", true)) {
         // "GUI.Gather_Tooltip" is used automatically
-        tab_pane.addTab("GUI.Gather", Utility.getImage("gather.gif"), gather_pane);
+        tab_pane.addTab("GUI.Gather", JarTools.getImage("gather.gif"), gather_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(gather_pane), Configuration.get("workflow.gather", false));
         }
@@ -360 +361 @@
         if(Configuration.get("workflow.enrich", true)) {
         // "GUI.Enrich_Tooltip" is used automatically
-        tab_pane.addTab("GUI.Enrich", Utility.getImage("enrich.gif"), enrich_pane);
+        tab_pane.addTab("GUI.Enrich", JarTools.getImage("enrich.gif"), enrich_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(enrich_pane), false);
         }
@@ -368 +369 @@
         if(Configuration.get("workflow.design", true)) {
         // "GUI.Design_Tooltip" is used automatically
-        tab_pane.addTab("GUI.Design", Utility.getImage("design.gif"), design_pane);
+        tab_pane.addTab("GUI.Design", JarTools.getImage("design.gif"), design_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(design_pane), false);
         }
@@ -376 +377 @@
         if(Configuration.get("workflow.create", true)) {
         // "GUI.Create_Tooltip" is used automatically
-        tab_pane.addTab("GUI.Create", Utility.getImage("create.gif"), create_pane);
+        tab_pane.addTab("GUI.Create", JarTools.getImage("create.gif"), create_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(create_pane), false);
         }

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

@@ -61 +61 @@
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.DragGroup;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.TreeSynchronizer;
 import org.greenstone.gatherer.util.Utility;
@@ -142 +143 @@
     Dictionary.registerBoth(stop_action, "Collection.Stop", "Collection.Stop_Tooltip");
     
-    new_folder = new GLIButton(Utility.getImage("folder.gif"));
+    new_folder = new GLIButton(JarTools.getImage("folder.gif"));
     new_folder.addActionListener(this);
     new_folder.setEnabled(false);

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

@@ -47 +47 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -109 +110 @@
 
     // Pretty corner icon
-    this.setIconImage(Utility.getImage("gatherer_small.gif").getImage());
+    this.setIconImage(JarTools.getImage("gatherer_small.gif").getImage());
 
     self = this;

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

@@ -43 +43 @@
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
-import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -76 +76 @@
     JPanel content_pane = (JPanel) getContentPane();
     JPanel upper_pane = new JPanel();
-    ImageIcon icon = Utility.getImage("lcolicn.gif");
+    ImageIcon icon = JarTools.getImage("lcolicn.gif");
     ImageIcon scaled_icon = new ImageIcon(icon.getImage().getScaledInstance(ICON_SIZE, ICON_SIZE, Image.SCALE_DEFAULT));
     JLabel icon_label = new JLabel(scaled_icon);

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

@@ -44 +44 @@
 import org.greenstone.gatherer.metadata.MetadataValueTableModel;
 import org.greenstone.gatherer.metadata.MetadataXMLFileManager;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.Utility;
 
@@ -322 +323 @@
         // First column: inherited metadata icon
         if (column == 0 && value != null) {
-            component = new JLabel(Utility.getImage("upfolder.gif"));
+            component = new JLabel(JarTools.getImage("upfolder.gif"));
         }
 

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

@@ -49 +49 @@
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.collection.CollectionManager;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -54 +55 @@
 public class OpenCollectionDialog
     extends JFileChooser {
-    static final private ImageIcon LOCKED_COLLECTION_ICON = Utility.getImage("lcolicn.gif");
-    static final private ImageIcon NORMAL_COLLECTION_ICON = Utility.getImage("ncolicn.gif");
+    static final private ImageIcon LOCKED_COLLECTION_ICON = JarTools.getImage("lcolicn.gif");
+    static final private ImageIcon NORMAL_COLLECTION_ICON = JarTools.getImage("ncolicn.gif");
     /** The name of the mouse listener that initiates editing on a double click. */
     static final private String SINGLE_CLICK_LISTENER = "SingleClickListener";

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

@@ -33 +33 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.util.JarTools;
 
 
@@ -74 +74 @@
     JPanel content_pane = (JPanel) getContentPane();
     JPanel text_pane = new JPanel();
-    JLabel icon_label = new JLabel(Utility.getImage("gatherer_medium.gif"));
+    JLabel icon_label = new JLabel(JarTools.getImage("gatherer_medium.gif"));
 
     JTextArea text_area = new JTextArea();

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

@@ -41 +41 @@
 import javax.swing.table.TableCellRenderer;
 import org.greenstone.gatherer.Dictionary;
-import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.util.JarTools;
 
 /** This custom button renderer replaces the boring old column headers with clickable versions which are based on JToggleButtons.
@@ -52 +52 @@
 
     /** The constructor sets up a margin around the button, and adds the filter icons.
-     * @see org.greenstone.gatherer.util.Utility
      */
     public HeaderRenderer() {
     setMargin(new Insets(0,0,0,0));
-    setIcon(Utility.getImage("filter.gif"));
-    setSelectedIcon(Utility.getImage("filter-on.gif")); 
+    setIcon(JarTools.getImage("filter.gif"));
+    setSelectedIcon(JarTools.getImage("filter-on.gif")); 
     }