Changeset 8812

Timestamp:

2004-12-15T13:15:46+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a couple of null pointer exceptions thrown when attempting to change modes without a collection open.

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• CreatePane.java (modified) (1 diff)
• DesignPane.java (modified) (1 diff)

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

@@ -766 +766 @@
         }
         else {
-        previous_pane = options_pane.buildLog();
-        right.add(previous_pane, BorderLayout.CENTER);
-        right.updateUI(); // we need to repaint the log pane, cos it hasn't changed since last time
-        ///ystem.err.println("I've added the log back to the right pane again.");
-        //target_pane.add(previous_pane, BorderLayout.CENTER);
+        if (options_pane != null) {
+            previous_pane = options_pane.buildLog();
+            right.add(previous_pane, BorderLayout.CENTER);
+            right.updateUI(); // we need to repaint the log pane, cos it hasn't changed since last time
+            ///ystem.err.println("I've added the log back to the right pane again.");
+            //target_pane.add(previous_pane, BorderLayout.CENTER);
+        }
         }
                 //scroll_pane.setViewportView(previous_pane);

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

@@ -95 +95 @@
      */
     public void modeChanged(int mode) {
-    cdm.modeChanged(mode);
+    if (cdm != null) {
+        cdm.modeChanged(mode);
+    }
     }