Changeset 10016

Timestamp:

2005-06-07T11:21:55+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a bug where the GLI would attempt to enable/disable non-existant tabs.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (7 diffs)

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

@@ -342 +342 @@
         tab_pane.setFont(Configuration.getFont("general.font", false));
 
-        if(Configuration.get("workflow.download", true)) {
+        if (Configuration.get("workflow.download", true)) {
         download_pane = new DownloadPane();
         // "GUI.Download_Tooltip" is used automatically
@@ -351 +351 @@
         gather_pane = new GatherPane(collection_tree_sync);
         gather_pane.display();
-        if(Configuration.get("workflow.gather", true)) {
+        if (Configuration.get("workflow.gather", true)) {
         // "GUI.Gather_Tooltip" is used automatically
         tab_pane.addTab("GUI.Gather", JarTools.getImage("gather.gif"), gather_pane);
@@ -359 +359 @@
         enrich_pane = new EnrichPane(collection_tree_sync);
         enrich_pane.display();
-        if(Configuration.get("workflow.enrich", true)) {
+        if (Configuration.get("workflow.enrich", true)) {
         // "GUI.Enrich_Tooltip" is used automatically
         tab_pane.addTab("GUI.Enrich", JarTools.getImage("enrich.gif"), enrich_pane);
@@ -367 +367 @@
         design_pane = new DesignPane();
         design_pane.display();
-        if(Configuration.get("workflow.design", true)) {
+        if (Configuration.get("workflow.design", true)) {
         // "GUI.Design_Tooltip" is used automatically
         tab_pane.addTab("GUI.Design", JarTools.getImage("design.gif"), design_pane);
@@ -375 +375 @@
         create_pane = new CreatePane();
         create_pane.display();
-        if(Configuration.get("workflow.create", true)) {
+        if (Configuration.get("workflow.create", true)) {
         // "GUI.Create_Tooltip" is used automatically
         tab_pane.addTab("GUI.Create", JarTools.getImage("create.gif"), create_pane);
@@ -382 +382 @@
 
         // Select the collect pane if it is available
-        if(Configuration.get("workflow.gather", false)) {
+        if (tab_pane.indexOfComponent(gather_pane) != -1) {
         tab_pane.setSelectedComponent(gather_pane);
         }
         // Otherwise find the first tab that is enabled and select that.
         else {
-        boolean found = false;
-        for(int i = 0; !found && i < tab_pane.getTabCount(); i++) {
-            if(tab_pane.isEnabledAt(i)) {
+        for (int i = 0; i < tab_pane.getTabCount(); i++) {
+            if (tab_pane.isEnabledAt(i)) {
             tab_pane.setSelectedIndex(i);
-            found = true;
+            break;
             }
         }
@@ -452 +451 @@
     /** This method is called when the collection is being built, and is used to disable all controls in all pane which could change the state of the collection.
      */
-    public void lockCollection(boolean import_stage, boolean lock) {
+    public void lockCollection(boolean import_stage, boolean lock)
+    {
     locked = lock;
+
     if (import_stage) {
         int gather_pos = tab_pane.indexOfComponent(gather_pane);
+        if (gather_pos != -1) {
+        tab_pane.setEnabledAt(gather_pos, !lock);
+        }
         int enrich_pos = tab_pane.indexOfComponent(enrich_pane);
-        int design_pos = tab_pane.indexOfComponent(design_pane);
-        tab_pane.setEnabledAt(gather_pos, !lock);
-        tab_pane.setEnabledAt(enrich_pos, !lock);
+        if (enrich_pos != -1) {
+        tab_pane.setEnabledAt(enrich_pos, !lock);
+        }
+    }
+
+    int design_pos = tab_pane.indexOfComponent(design_pane);
+    if (design_pos != -1) {
         tab_pane.setEnabledAt(design_pos, !lock);
     }
-    else {
-        int design_pos = tab_pane.indexOfComponent(design_pane);
-        tab_pane.setEnabledAt(design_pos, !lock);
-    }
-    }
+    }
+
 
     public void modeChanged(int mode) {