Changeset 8084

Timestamp:

2004-08-27T13:29:00+12:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed the help file loading so it works with the stand-alone version of the GLI as well as with the applet version.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• help/HelpFrame.java (modified) (1 diff)
• util/Utility.java (modified) (2 diffs)

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

@@ -303 +303 @@
 
         if (name != null && !name.equals(NULL_STRING)) {
-        try {
-            url = Utility.base.getResource("/"+help_file);
-        }
-        catch (Exception error) {
-            // Most likely file name.
+        url = Utility.base.getResource("/" + help_file);
+        if (url == null) {
+            File file = new File(Utility.BASE_DIR + help_file);
             try {
-            File file = new File(Utility.BASE_DIR + help_file);
             url = file.toURL();
-
             }
-            catch (Exception e) {
-            Gatherer.printStackTrace(e);
+            catch (Exception ex) {
+            ex.printStackTrace();
             }
         }
         }
+
         return url;
     }

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

@@ -585 +585 @@
 
     String help_folder = "help/" + Gatherer.config.getLanguage() + "/";
-    URL help_folder_url = base.getResource("/"+help_folder);
-
-    // If that file can't be found, default to english
-    if(help_folder_url==null) {
-        help_folder = "help/" + StaticStrings.ENGLISH_LANGUAGE_STR  + "/";
-    }
-
-    return help_folder;
+
+    // Try in the JAR/classes directory first
+    URL help_folder_url = base.getResource("/" + help_folder);
+    if (help_folder_url != null) {
+        return help_folder;
+    }
+
+    // Look in the base directory next
+    File help_folder_file = new File(help_folder);
+    if (help_folder_file.exists()) {
+        return help_folder;
+    }
+
+    // Resort to English
+    return "help/" + StaticStrings.ENGLISH_LANGUAGE_STR  + "/";
     }
 
@@ -1278 +1285 @@
     }
 
+
     /** Parse in a xml document from a given filename. Note that this filename may need to be resolved by the class loader, especially for template files within a jar. */
-    static public Document parse(String filename, boolean use_classloader) {
-    File file = null;
-    if(use_classloader) {
-        try {
-        // **** 
-        // URL url = ClassLoader.getSystemResource(filename);
-        // URL url = base.getResource("/"+filename);
-        // System.err.println("*** looking for resource as stream: " + filename);
-        InputStream is = base.getResourceAsStream("/"+filename);
-
-        // file = new File(URLDecoder.decode(url.getFile(), ENCODING));
-        // url = null;
-
-        //FileInputStream fis   = new FileInputStream(file);        
-        return parse(is,true);
-        }
-        catch (Exception error) {
-        // Most likely file name.
-        /* String prefix = "";
-        if (!filename.startsWith("/")) {
-            prefix = "/research/code/gsdl/gli/";
-            }*/
-        file = new File("classes" + File.separator + filename);
-        //Gatherer.printStackTrace(error);
-        }
-    }
-    if(file == null) {
-        file = new File(filename);
-    }
-    return parse(file, true);
+    static public Document parse(String filename, boolean use_classloader)
+    {
+    // Try the class loader if desired (for the applet JAR file)
+    if (use_classloader) {
+        InputStream is = base.getResourceAsStream("/" + filename);
+        if (is != null) {
+        return parse(is, true);
+        }
+    }
+
+    // Try the file outside the classes directory
+    return parse(new File(filename), true);
     }