Changeset 10602

Timestamp:

2005-09-08T16:59:55+12:00 (18 years ago)

Author:

mdewsnip

Message:

Broke the help while messing around with paths for the remote building stuff. Will have to check this again to make sure it still works when isGsdlRemote is true.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/HelpFrame.java (modified) (1 diff)

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

@@ -317 +317 @@
         URL url = null;
 
-        String help_file = getHelpFolder() + name + StaticStrings.HTM_FILE_EXTENSION;
-
-        if (name != null && !name.equals(NULL_STRING)) {
-        url = JarTools.getResource("/" + help_file);
-        if (url == null) {
-            File file = new File(Gatherer.getGLIUserDirectoryPath() + help_file);
-            try {
-            url = file.toURL();
-            }
-            catch (Exception ex) {
-            ex.printStackTrace();
-            }
+        if (name != null && !name.equals("") && !name.equals(NULL_STRING)) {
+        String help_file_path = getHelpFolder() + name + StaticStrings.HTM_FILE_EXTENSION;
+        File help_file = new File(Gatherer.getGLIDirectoryPath() + help_file_path);
+        if (Gatherer.isGsdlRemote) {
+            help_file = new File(Gatherer.getGLIUserDirectoryPath() + help_file_path);
+        }
+        try {
+            url = help_file.toURL();
+        }
+        catch (Exception exception) {
+            DebugStream.printStackTrace(exception);
         }
         }