Changeset 8266

Timestamp:

2004-10-11T10:02:59+13:00 (20 years ago)

Author:

mdewsnip

Message:

Moved the init_images function from Gatherer into Utility (it is used by the GEMS).

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

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

@@ -135 +135 @@
     this.self = this;
 
-    init_images();
-    }
-
-    protected void init_images()
-    {
-    Class base = this.getClass();
-    Utility.BLANK_ICON = new ImageIcon(base.getResource("/images/blank.gif"));
-    Utility.ERROR_ICON = new ImageIcon(base.getResource("/images/error.gif"));
-    Utility.HELP_ICON  = new ImageIcon(base.getResource("/images/help.gif"));
-    Utility.ON_ICON    = new ImageIcon(base.getResource("/images/check.gif"));
-    Utility.OFF_ICON   = new ImageIcon(base.getResource("/images/cross.gif"));
-
-    Utility.base = base;
+    Utility.initImages(this);
     }
 

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

@@ -957 +957 @@
         "linux" + File.separator + "wget";
     }
-    
+
+
+    static public void initImages(Object base_object)
+    {
+    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"));
+    ON_ICON    = new ImageIcon(base.getResource("/images/check.gif"));
+    OFF_ICON   = new ImageIcon(base.getResource("/images/cross.gif"));
+    }
+
+
     /** A string is a valid hierarchy index if it matches '[0-9](\.[0-9])*' */
     static public boolean isIndex(String raw) {