Changeset 20117

Show
Ignore:
Timestamp:
03.08.2009 13:34:50 (10 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/src/org/greenstone/gatherer/gui/CreatePane.java

    r19753 r20117  
    407407            sargument_configuration_panel = options_pane.buildImport(null); 
    408408            sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel); 
    409             // if(CollectionManager.canDoScheduling()) { 
    410             //  sargument_configuration_panel = options_pane.buildSchedule(sargument_configuration_panel);  
    411             // } 
    412409        } 
    413410        else { 
     
    497494        sargument_configuration_panel = options_pane.buildImport(null); 
    498495        sargument_configuration_panel = options_pane.buildBuild(sargument_configuration_panel); 
    499         //  if(CollectionManager.canDoScheduling()) { 
    500         //  sargument_configuration_panel = options_pane.buildSchedule(sargument_configuration_panel); 
    501         //} 
    502496        } 
    503497        else { 
     
    906900        importing = new OptionTreeNode(Dictionary.get("CreatePane.Import")); 
    907901        importing.setToolTipText(Dictionary.get("CreatePane.Import_Tooltip")); 
    908         scheduling = new OptionTreeNode(Dictionary.get("CreatePane.Schedule")); 
    909         scheduling.setToolTipText(Dictionary.get("CreatePane.Schedule_Tooltip"));  
    910  
     902        if (CollectionManager.canDoScheduling()) { 
     903          scheduling = new OptionTreeNode(Dictionary.get("CreatePane.Schedule")); 
     904          scheduling.setToolTipText(Dictionary.get("CreatePane.Schedule_Tooltip"));  
     905 
     906        } 
    911907        log = new OptionTreeNode(Dictionary.get("CreatePane.Log")); 
    912908        log.setToolTipText(Dictionary.get("CreatePane.Log_Tooltip")); 
     
    917913        model.insertNodeInto(importing, options, 0); 
    918914        model.insertNodeInto(building, options, 1); 
    919         model.insertNodeInto(scheduling, options, 2);  
    920         model.insertNodeInto(log, options, 3); 
     915        if (CollectionManager.canDoScheduling()) { 
     916          model.insertNodeInto(scheduling, options, 2);  
     917          model.insertNodeInto(log, options, 3); 
     918        } else { 
     919          model.insertNodeInto(log, options, 2); 
     920        } 
    921921        // Expand the root node 
    922922        expandPath(new TreePath(options)); 
     
    953953        } 
    954954        if(node != null && node.equals(building)) { 
    955     build_button.setActionCommand(Dictionary.get("CreatePane.Build_Collection"));        
     955          build_button.setActionCommand(Dictionary.get("CreatePane.Build_Collection"));      
    956956        build_button.setText(Dictionary.get("CreatePane.Build_Collection")); 
    957957  
     
    971971        //target_pane.add(previous_pane, BorderLayout.CENTER); 
    972972        } 
    973         else if(node != null && node.equals(scheduling) && CollectionManager.canDoScheduling()) {  
     973        else if(node != null && CollectionManager.canDoScheduling() && node.equals(scheduling)) {  
    974974        build_button.setActionCommand(Dictionary.get("CreatePane.Schedule_Build"));  
    975975        build_button.setText(Dictionary.get("CreatePane.Schedule_Build"));