Changeset 8258

Timestamp:

2004-10-08T16:18:18+13:00 (20 years ago)

Author:

mdewsnip

Message:

Made HelpFrame.setView static to remove another Gatherer class dependency.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/GUIManager.java (modified) (2 diffs)
• gui/SimpleMenuBar.java (modified) (2 diffs)
• help/HelpFrame.java (modified) (3 diffs)

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

@@ -87 +87 @@
 
     /** A reference to the currently instantiated help window, if any. */
-    public HelpFrame help = null;
+    private HelpFrame help = null;
     /** The menu bar. */
     public MenuBar menu_bar = null;
@@ -278 +278 @@
     }
     else if(esrc == menu_bar.help_build) {
-        help.setView("producingthecollection");
+        HelpFrame.setView("producingthecollection");
     }
     else if(esrc == menu_bar.help_collect) {
-        help.setView("collectingfiles");
+        HelpFrame.setView("collectingfiles");
     }
     else if(esrc == menu_bar.help_design) {
-        help.setView("designingacollection");
+        HelpFrame.setView("designingacollection");
     }
     else if(esrc == menu_bar.help_general) {
-        help.setView("introduction");
+        HelpFrame.setView("introduction");
     }
     else if(esrc == menu_bar.help_metaedit) {
-        help.setView("enrichingacollection");
+        HelpFrame.setView("enrichingacollection");
     }
     else if(esrc == menu_bar.help_mirror) {
-        help.setView("downloadingfiles");
+        HelpFrame.setView("downloadingfiles");
     }
     else if(esrc == menu_bar.help_preview) {
-        help.setView("previewingthecollection");
+        HelpFrame.setView("previewingthecollection");
     }
     }

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

@@ -5 +5 @@
 import javax.swing.*;
 import org.greenstone.gatherer.Dictionary;
-import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.help.HelpFrame;
 import org.greenstone.gatherer.util.Utility;
 
@@ -29 +29 @@
     add(help);
     }
-     
+
     public void actionPerformed(ActionEvent event) {
-    Gatherer.g_man.help.setView(page_name);
+    HelpFrame.setView(page_name);
     }
 }

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

@@ -63 +63 @@
     static private final Dimension SIZE = new Dimension(760, 560);
 
+    static private HelpFrame self = null;
+
     /** The HTML rendering pane */
     private JEditorPane view = null;
@@ -108 +110 @@
     // Pretty corner icon
     this.setIconImage(Utility.getImage("gatherer_small.gif").getImage());
-          
+
+    self = this;
     }
 
@@ -132 +135 @@
 
 
-    public void setView(String sectionName)
+    static public void setView(String section_name)
+    {
+    self.setViewInternal(section_name);
+    }
+
+
+    public void setViewInternal(String sectionName)
     {
     // Find the node in the tree with the specified sectionName