Changeset 7013

Timestamp:

2004-03-11T10:33:05+13:00 (20 years ago)

Author:

mdewsnip

Message:

Added a check to prevent NPEs when the section title is blank.

File:

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

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

@@ -37 +37 @@
 package org.greenstone.gatherer.help;
 
-//import calpa.html.*; 
 import java.awt.*;
 import java.io.*;
@@ -81 +80 @@
     Dictionary.registerText(this, "Help.Title");
 
-    view = new JEditorPane(); //new CalHTMLPane(new CalHTMLPreferences(), new Observer(), "Help Pages");
+    view = new JEditorPane();
     view.setEditable(false);
     view.addHyperlinkListener(new ViewHyperlinkListener());
-
 
     HelpItem rootNode = new HelpItem(Dictionary.get("Help.Contents"), NULL_STRING);
@@ -195 +193 @@
 
         // Determine the section title
-        String sectionTitle = StaticStrings.EMPTY_STR;
+        String sectionTitle = "";
         NodeList children = node.getChildNodes();
         for (int i = 0; i < children.getLength(); i++) {
         Node child = children.item(i);
         if (child.getNodeName().equals(StaticStrings.TITLE_ELEMENT)) {
-            sectionTitle = pos + StaticStrings.COLON_CHARACTER + StaticStrings.SPACE_CHARACTER + child.getFirstChild().getNodeValue();
+            sectionTitle = pos + ": ";
+            if (child.getFirstChild() != null) {
+            sectionTitle = sectionTitle + child.getFirstChild().getNodeValue();
+            }
         }
         }