Changeset 8348

Timestamp:

2004-10-18T09:42:24+13:00 (20 years ago)

Author:

kjdon

Message:

minor fix for view stuff when there are no views

Location:

trunk

Files:

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

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

@@ -324 +324 @@
     query = text.trim();
     
-    String view1 = null;
-    if (viewCombo != null && viewCombo.isEnabled()) {
-        view1 = (String)viewCombo.getSelectedItem();        
-    }
-    if (!view1.equals(this.view)) {
-        this.view = view1;
-        dataManager.currentView = view1;
-        dataManager.requestCollection(); // resets previous data
+    if (viewCombo != null) {
+        String view1 = null;
+        if (viewCombo.isEnabled()) {
+        view1 = (String)viewCombo.getSelectedItem();        
+        }
+        if (!view1.equals(this.view)) {
+        this.view = view1;
+        dataManager.currentView = view1;
+        dataManager.requestCollection(); // resets previous data
+        }
     }
         setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));

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

@@ -324 +324 @@
     query = text.trim();
     
-    String view1 = null;
-    if (viewCombo != null && viewCombo.isEnabled()) {
-        view1 = (String)viewCombo.getSelectedItem();        
-    }
-    if (!view1.equals(this.view)) {
-        this.view = view1;
-        dataManager.currentView = view1;
-        dataManager.requestCollection(); // resets previous data
+    if (viewCombo != null) {
+        String view1 = null;
+        if (viewCombo.isEnabled()) {
+        view1 = (String)viewCombo.getSelectedItem();        
+        }
+        if (!view1.equals(this.view)) {
+        this.view = view1;
+        dataManager.currentView = view1;
+        dataManager.requestCollection(); // resets previous data
+        }
     }
         setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));

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

@@ -324 +324 @@
     query = text.trim();
     
-    String view1 = null;
-    if (viewCombo != null && viewCombo.isEnabled()) {
-        view1 = (String)viewCombo.getSelectedItem();        
-    }
-    if (!view1.equals(this.view)) {
-        this.view = view1;
-        dataManager.currentView = view1;
-        dataManager.requestCollection(); // resets previous data
+    if (viewCombo != null) {
+        String view1 = null;
+        if (viewCombo.isEnabled()) {
+        view1 = (String)viewCombo.getSelectedItem();        
+        }
+        if (!view1.equals(this.view)) {
+        this.view = view1;
+        dataManager.currentView = view1;
+        dataManager.requestCollection(); // resets previous data
+        }
     }
         setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));