Changeset 10009

Timestamp:

2005-06-03T14:49:55+12:00 (19 years ago)

Author:

mdewsnip

Message:

Moved Utility.getHelpFolder into HelpFrame, as part of tidying up the Utility class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/HelpFrame.java (modified) (4 diffs)
• util/Utility.java (modified) (1 diff)

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

@@ -44 +44 @@
 import javax.swing.event.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
@@ -121 +122 @@
 
 
+    /** Retrieve the full file path to the help index xml file.
+     * @return the full path as a String
+     */
+    private String getHelpFolder()
+    {
+    String help_folder = "help/" + Configuration.getLanguage() + "/";
+
+    // Try in the JAR/classes directory first
+    URL help_folder_url = Utility.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  + "/";
+    }
+
+
     static public void setView(String section_name)
     {
@@ -162 +187 @@
         // Load the XML help file and build the contents structure from it
         try {
-        String help_index = Utility.getHelpFolder() + StaticStrings.HELP_INDEX_FILENAME;
+        String help_index = getHelpFolder() + StaticStrings.HELP_INDEX_FILENAME;
         Document document = XMLTools.parseXMLFile(help_index, true);
 
@@ -291 +316 @@
         URL url = null;
 
-        String help_file = Utility.getHelpFolder() + name + StaticStrings.HTM_FILE_EXTENSION;
+        String help_file = getHelpFolder() + name + StaticStrings.HTM_FILE_EXTENSION;
 
         if (name != null && !name.equals(NULL_STRING)) {

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

@@ -412 +412 @@
 
 
-    /** Retrieve the full file path to the help index xml file.
-     * @return the full path as a String
-     */
-    static public String getHelpFolder() {
-
-    String help_folder = "help/" + Configuration.getLanguage() + "/";
-
-    // 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  + "/";
-    }
-
     /** Method to retrieve an image icon with the given filename found in classpath or the resouces directory.
      *  @return The specified <strong>ImageIcon</strong>, or an error image replacement if no such images exists.