Changeset 6580

Timestamp:

2004-01-22T13:49:23+13:00 (20 years ago)

Author:

jmt12

Message:

Now looks for help files in the right place. Also replaced CalPane with JEditorPane.

File:

• trunk/gli/src/org/greenstone/gatherer/help/HelpFrame.java (modified) (10 diffs)

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

@@ -37 +37 @@
 package org.greenstone.gatherer.help;
 
-import calpa.html.*; 
+//import calpa.html.*; 
 import java.awt.*;
 import java.io.*;
@@ -47 +47 @@
 import org.apache.xerces.parsers.DOMParser;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -64 +65 @@
 
     /** The HTML rendering pane */
-    private CalHTMLPane view = null;
+    private JEditorPane view = null;
     /** The contents tree model */
     private ContentsModel model = null;
@@ -80 +81 @@
     Dictionary.registerText(this, "Help.Title");
 
-    view = new CalHTMLPane(new CalHTMLPreferences(), new Observer(), "Help Pages");
+    view = new JEditorPane(); //new CalHTMLPane(new CalHTMLPreferences(), new Observer(), "Help Pages");
 
     HelpItem rootNode = new HelpItem(Dictionary.get("Help.Contents"), NULL_STRING);
@@ -126 +127 @@
     URL url = node.getURL();
     if (url != null) {
-        view.showHTMLDocument(url);
+        //view.showHTMLDocument(url);
+        try {
+        view.setPage(url);
+        }
+        catch (Exception exception) {
+        Gatherer.printStackTrace(exception);
+        }
     }
 
@@ -144 +151 @@
         try {
         DOMParser parser = new DOMParser();
-        parser.parse(Utility.getHelpIndex());
+        parser.parse(Utility.getHelpFolder() + StaticStrings.HELP_INDEX_FILENAME);
         Document document = parser.getDocument();
 
@@ -229 +236 @@
         URL url = node.getURL();
         if (url != null) {
-        view.showHTMLDocument(url);
+        //view.showHTMLDocument(url);
+        try {
+            view.setPage(url);
+        }
+        catch (Exception exception) {
+            Gatherer.printStackTrace(exception);
+        }
         }
     }
@@ -265 +278 @@
         if (name != null && !name.equals(NULL_STRING)) {
         try {
-            File file = new File(Utility.HELP_DIR + name + StaticStrings.HTM_FILE_EXTENSION);
+            File file = new File(Utility.getHelpFolder() + name + StaticStrings.HTM_FILE_EXTENSION);
             return file.toURL();
         }
@@ -286 +299 @@
      * @author John Thompson
      */
+    /*
     private class Observer
     extends DefaultCalHTMLObserver {
@@ -320 +334 @@
     }
     }
+    */
 }
+
+
+
+
+
+