Changeset 9981

Timestamp:

2005-05-30T10:48:28+12:00 (19 years ago)

Author:

mdewsnip

Message:

The getImage function no longer tries to load images language-specifically, as this was never used (and probably never should be).

File:

• trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (1 diff)

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

@@ -466 +466 @@
     }
 
-    static public ImageIcon getImage(String filename, boolean wait_until_complete) {
-    ImageIcon image = null;
-    try {
-        image = new ImageIcon(base.getResource("/images/" + Dictionary.get("Version") + "/" + filename));
-    }
-    catch(NullPointerException exception) {
-        image = new ImageIcon(base.getResource("/images/" + filename));
-    }
-    if(image == null) {
+    static public ImageIcon getImage(String filename, boolean wait_until_complete)
+    {
+    ImageIcon image = new ImageIcon(base.getResource("/images/" + filename));
+    if (image == null) {
         image = ERROR_ICON;
     }
 
-    if(wait_until_complete) {
+    if (wait_until_complete) {
         int load_status;
         do {
         load_status = image.getImageLoadStatus();
         }
-        while(load_status != MediaTracker.ABORTED && load_status != MediaTracker.ERRORED && load_status != MediaTracker.COMPLETE);
-    }
+        while (load_status != MediaTracker.ABORTED && load_status != MediaTracker.ERRORED && load_status != MediaTracker.COMPLETE);
+    }
+
     return image;
     }