Changeset 4437

Timestamp:

2003-05-30T14:55:24+12:00 (21 years ago)

Author:

jmt12

Message:

Removed some no longer necessary code used to load images from the resource directory (now they are loaded from the jar).

File:

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

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

@@ -591 +591 @@
     ImageIcon image = null;
     try {
-        image = new ImageIcon(ClassLoader.getSystemResource("images/" + Gatherer.dictionary.get("Version") + File.separator + filename));
-    }
-    catch(Exception error_one) {
-        try {
-        image = new ImageIcon(ClassLoader.getSystemResource("images/" + filename));
-        }
-        catch (Exception error_two) {
-        if(Gatherer.dictionary != null) {
-            File locale_image_file = new File(RES_DIR + Gatherer.dictionary.get("Version") + File.separator + filename);
-            if(locale_image_file.exists()) {
-            image = new ImageIcon(locale_image_file.toString());
-            }
-        }
-        if(image == null) {
-            File image_file = new File(RES_DIR + filename);
-            if(image_file.exists()) {
-            image = new ImageIcon(image_file.toString());
-            }
-        }
-        }
+        image = new ImageIcon(ClassLoader.getSystemResource("images/" + Gatherer.dictionary.get("Version") + "/" + filename));
+    }
+    catch(NullPointerException exception) {
+        image = new ImageIcon(ClassLoader.getSystemResource("images/" + filename));
     }
     if(image == null) {