Changeset 10013

Timestamp:

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

Author:

mdewsnip

Message:

Now all JAR-file related, base.getResource* stuff is in the JarTools class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• gems/GEMS.java (modified) (2 diffs)
• gui/HelpFrame.java (modified) (2 diffs)
• util/JarTools.java (modified) (5 diffs)
• util/Utility.java (modified) (2 diffs)
• util/XMLTools.java (modified) (1 diff)

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

@@ -47 +47 @@
 import org.greenstone.gatherer.gui.URLField;
 import org.greenstone.gatherer.gui.WarningDialog;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -114 +115 @@
     this.self = this;
 
-    Utility.initImages(this); 
+    JarTools.initialise(this); 
     }
 

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

@@ -65 +65 @@
 import org.greenstone.gatherer.gui.NonWhitespaceField;
 import org.greenstone.gatherer.util.Codec;
+import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
@@ -175 +176 @@
     //Load configuration file
     this.self = this;
-    Utility.initImages(this);
+    JarTools.initialise(this);
     config = new Configuration(gsdl_path, null, null);
 

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

@@ -131 +131 @@
 
     // Try in the JAR/classes directory first
-    URL help_folder_url = Utility.base.getResource("/" + help_folder);  // !!
+    URL help_folder_url = JarTools.getResource("/" + help_folder);
     if (help_folder_url != null) {
         return help_folder;
@@ -320 +320 @@
 
         if (name != null && !name.equals(NULL_STRING)) {
-        url = Utility.base.getResource("/" + help_file);
+        url = JarTools.getResource("/" + help_file);
         if (url == null) {
             File file = new File(Utility.BASE_DIR + help_file);

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

@@ -30 +30 @@
 import java.awt.*;
 import java.io.*;
+import java.net.*;
 import javax.swing.*;
 
@@ -35 +36 @@
 public class JarTools
 {
+    static private Class root_class = null;
     static private ImageIcon ERROR_ICON = null; 
-    // static public Class base = null;
 
 
-    static public void initialise()
+    static public void initialise(Object root_object)
     {
+    root_class = root_object.getClass();
     ERROR_ICON = getImage("error.gif");
     }
@@ -49 +51 @@
     try {
         // setup input stream for slurping out file
-        InputStream fis = Utility.base.getResourceAsStream("/"+filename);
+        InputStream fis = root_class.getResourceAsStream("/"+filename);
         BufferedInputStream fbis = new BufferedInputStream(fis); 
         DataInputStream fdbis = new DataInputStream(fbis);
@@ -86 +88 @@
     static public ImageIcon getImage(String filename, boolean wait_until_complete)
     {
-    ImageIcon image = new ImageIcon(Utility.base.getResource("/images/" + filename));
+    ImageIcon image = new ImageIcon(root_class.getResource("/images/" + filename));
     if (image == null) {
         image = ERROR_ICON;
@@ -103 +105 @@
 
 
+    static public URL getResource(String resource_name)
+    {
+    return root_class.getResource(resource_name);
+    }
+
+
+    static public InputStream getResourceAsStream(String resource_name)
+    {
+    return root_class.getResourceAsStream(resource_name);
+    }
+
+
     static public boolean isInJar(String filename) 
     {
     try {
-        InputStream fis = Utility.base.getResourceAsStream("/" + filename);         
+        InputStream fis = root_class.getResourceAsStream("/" + filename);           
         fis.close();
     }

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

@@ -123 +123 @@
 
     static protected File gli_user_folder = null;
-
-    /** The default icon to produce a 'help-icon' sized blank space before a menu entry. */
-    static public Class base = null;
     
 
@@ -847 +844 @@
 
 
-    static public void initImages(Object base_object)
-    {
-    base = base_object.getClass();
-    }
-
-
     /** Method to determine if the host system is MacOS based.
      * @return a boolean which is true if the platform is MacOS, false otherwise

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

@@ -103 +103 @@
     {
     if (use_class_loader == true) {
-        InputStream is = Utility.base.getResourceAsStream("/" + xml_file_path);  // !!
+        InputStream is = JarTools.getResourceAsStream("/" + xml_file_path);
         if (is != null) {
         return parseXML(is);