Changeset 20117

Timestamp:

2009-08-03T13:34:50+12:00 (15 years ago)

Author:

kjdon

Message:

removed a few commented out bits of code. Only display the schedule options tab if CollectionManager.canDoScheduling(). this effectively removes it for gs3 - need to update schedule.pl to work in gs3 context before it will work.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/CreatePane.java (modified) (6 diffs)

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

@@ -407 +407 @@
             sargument_configuration_panel = options_pane.buildImport(null);
             sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel);
-            // if(CollectionManager.canDoScheduling()) {
-            //  sargument_configuration_panel = options_pane.buildSchedule(sargument_configuration_panel); 
-            // }
         }
         else {
@@ -497 +494 @@
         sargument_configuration_panel = options_pane.buildImport(null);
         sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel);
-        //  if(CollectionManager.canDoScheduling()) {
-        //  sargument_configuration_panel = options_pane.buildSchedule(sargument_configuration_panel);
-        //}
         }
         else {
@@ -906 +900 @@
         importing = new OptionTreeNode(Dictionary.get("CreatePane.Import"));
         importing.setToolTipText(Dictionary.get("CreatePane.Import_Tooltip"));
-        scheduling = new OptionTreeNode(Dictionary.get("CreatePane.Schedule"));
-        scheduling.setToolTipText(Dictionary.get("CreatePane.Schedule_Tooltip")); 
-
+        if (CollectionManager.canDoScheduling()) {
+          scheduling = new OptionTreeNode(Dictionary.get("CreatePane.Schedule"));
+          scheduling.setToolTipText(Dictionary.get("CreatePane.Schedule_Tooltip")); 
+
+        }
         log = new OptionTreeNode(Dictionary.get("CreatePane.Log"));
         log.setToolTipText(Dictionary.get("CreatePane.Log_Tooltip"));
@@ -917 +913 @@
         model.insertNodeInto(importing, options, 0);
         model.insertNodeInto(building, options, 1);
-        model.insertNodeInto(scheduling, options, 2); 
-        model.insertNodeInto(log, options, 3);
+        if (CollectionManager.canDoScheduling()) {
+          model.insertNodeInto(scheduling, options, 2); 
+          model.insertNodeInto(log, options, 3);
+        } else {
+          model.insertNodeInto(log, options, 2);
+        }
         // Expand the root node
         expandPath(new TreePath(options));
@@ -953 +953 @@
         }
         if(node != null && node.equals(building)) {
-    build_button.setActionCommand(Dictionary.get("CreatePane.Build_Collection"));       
+          build_button.setActionCommand(Dictionary.get("CreatePane.Build_Collection"));     
         build_button.setText(Dictionary.get("CreatePane.Build_Collection"));
  
@@ -971 +971 @@
         //target_pane.add(previous_pane, BorderLayout.CENTER);
         }
-        else if(node != null && node.equals(scheduling) && CollectionManager.canDoScheduling()) { 
+        else if(node != null && CollectionManager.canDoScheduling() && node.equals(scheduling)) { 
         build_button.setActionCommand(Dictionary.get("CreatePane.Schedule_Build")); 
         build_button.setText(Dictionary.get("CreatePane.Schedule_Build"));