Changeset 8345

Timestamp:

2004-10-15T14:52:55+13:00 (20 years ago)

Author:

kjdon

Message:

addd some checks for null viewCombo

Location:

trunk

Files:

• greenstone3-extensions/vishnu/src/vishnu/testvis/visual/Vishnu.java (modified) (2 diffs)
• gsdl3/extensions/vishnu/src/vishnu/testvis/visual/Vishnu.java (modified) (2 diffs)
• gsdl3/packages/vishnu/src/vishnu/testvis/visual/Vishnu.java (modified) (2 diffs)

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis/visual/Vishnu.java

@@ -142 +142 @@
     System.out.println("Requesting collection " + current_collection.name);
     collCombo.setSelectedItem(current_collection);
-    if (current_view != null) {
+    if (viewCombo != null && current_view != null) {
         viewCombo.setSelectedItem(current_view);
         
@@ -325 +325 @@
     
     String view1 = null;
-    if (viewCombo.isEnabled()) {
+    if (viewCombo != null && viewCombo.isEnabled()) {
         view1 = (String)viewCombo.getSelectedItem();        
     }

trunk/gsdl3/extensions/vishnu/src/vishnu/testvis/visual/Vishnu.java

@@ -142 +142 @@
     System.out.println("Requesting collection " + current_collection.name);
     collCombo.setSelectedItem(current_collection);
-    if (current_view != null) {
+    if (viewCombo != null && current_view != null) {
         viewCombo.setSelectedItem(current_view);
         
@@ -325 +325 @@
     
     String view1 = null;
-    if (viewCombo.isEnabled()) {
+    if (viewCombo != null && viewCombo.isEnabled()) {
         view1 = (String)viewCombo.getSelectedItem();        
     }

trunk/gsdl3/packages/vishnu/src/vishnu/testvis/visual/Vishnu.java

@@ -142 +142 @@
     System.out.println("Requesting collection " + current_collection.name);
     collCombo.setSelectedItem(current_collection);
-    if (current_view != null) {
+    if (viewCombo != null && current_view != null) {
         viewCombo.setSelectedItem(current_view);
         
@@ -325 +325 @@
     
     String view1 = null;
-    if (viewCombo.isEnabled()) {
+    if (viewCombo != null && viewCombo.isEnabled()) {
         view1 = (String)viewCombo.getSelectedItem();        
     }