Changeset 18589 for gli

Show
Ignore:
Timestamp:
24.02.2009 13:48:08 (11 years ago)
Author:
kjdon
Message:

GLI three modes change: systems mode is no more.

Location:
gli/trunk/src/org/greenstone/gatherer
Files:
7 modified

Legend:

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

    r17801 r18589  
    6060    static final public int ASSISTANT_MODE = 1; 
    6161    static final public int LIBRARIAN_MODE = 2; 
    62     static final public int SYSTEMS_MODE   = 3; 
    63     static final public int EXPERT_MODE    = 4;  
     62    static final public int EXPERT_MODE    = 3;  
    6463 
    6564    /** The string identifying an argument's name attribute. */ 
     
    616615    case ASSISTANT_MODE: 
    617616        result = Dictionary.get("Preferences.Mode.Assistant"); 
    618         break; 
    619     case SYSTEMS_MODE: 
    620         result = Dictionary.get("Preferences.Mode.Systems"); 
    621617        break; 
    622618    case EXPERT_MODE: 
  • gli/trunk/src/org/greenstone/gatherer/gui/CreatePane.java

    r18370 r18589  
    823823        } 
    824824         
    825         // have commented this out for now - scheduling currently not 
    826         // available except in expert mode 
    827         //only schedule in SYSTEM mode - also done in EXPERT mode, but that is handled elsewhere 
    828         /*      if(Configuration.getMode() ==  Configuration.SYSTEMS_MODE) { 
    829            if(Gatherer.c_man.getCollection().schedule_options.getValueEnabled("schedule")) { 
    830             Gatherer.c_man.getCollection().schedule_options.setValue("action",true,"add");  
    831             Gatherer.c_man.getCollection().schedule_options.setValue("email",false, null);  
    832             Gatherer.c_man.getCollection().schedule_options.setValue("smtp",false, null); 
    833             Gatherer.c_man.getCollection().schedule_options.setValue("toaddr",false, null);   
    834             Gatherer.c_man.getCollection().schedule_options.setValue("fromaddr",false, null);    
    835             Gatherer.c_man.getCollection().schedule_options.setValue("frequency",false, null);   
    836             Gatherer.c_man.scheduleBuild(isIncremental());  
    837         } else { 
    838             //need to turn off existing scheduling 
    839             Gatherer.c_man.getCollection().schedule_options.setValue("action",true,"delete");  
    840             Gatherer.c_man.scheduleBuild(isIncremental());  
    841              
    842         } 
    843         } 
    844         */ 
    845825        //Re-setting the rebuildTypeRequired is handled by CollectionManager.processComplete(GShellEvent) 
    846826    } 
  • gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java

    r18372 r18589  
    8484    private JRadioButton expert_mode_radio_button; 
    8585    private JRadioButton librarian_mode_radio_button; 
    86     private JRadioButton systems_mode_radio_button; 
    8786    private JSpinner proxy_port_field; 
    8887    private JTabbedPane tab_pane; 
     
    542541    mode_button_group.add(librarian_mode_radio_button); 
    543542     
    544         systems_mode_radio_button = new JRadioButton(Dictionary.get("Preferences.Mode.Systems")); 
    545     systems_mode_radio_button.setOpaque(false); 
    546         systems_mode_radio_button.setComponentOrientation(Dictionary.getOrientation()); 
    547     mode_button_group.add(systems_mode_radio_button); 
    548543     
    549544        mode_description_textarea = new JTextArea(); 
     
    558553        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Assistant_Description")); 
    559554        break; 
    560     case Configuration.SYSTEMS_MODE: 
    561         systems_mode_radio_button.setSelected(true); 
    562         mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Systems_Description")); 
    563         break; 
    564555    case Configuration.EXPERT_MODE: 
    565556        expert_mode_radio_button.setSelected(true); 
     
    575566    expert_mode_radio_button.addActionListener(listener); 
    576567    librarian_mode_radio_button.addActionListener(listener); 
    577     systems_mode_radio_button.addActionListener(listener); 
    578568    listener = null; 
    579569    // Layout 
    580570    button_panel.setBorder(BorderFactory.createEmptyBorder(0,0,5,0)); 
    581     button_panel.setLayout(new GridLayout(4,1,2,2)); 
     571    button_panel.setLayout(new GridLayout(3,1,2,2)); 
    582572    button_panel.add(assistant_mode_radio_button); 
    583573    button_panel.add(librarian_mode_radio_button); 
    584     button_panel.add(systems_mode_radio_button); 
    585574    button_panel.add(expert_mode_radio_button); 
    586575 
     
    855844        if (assistant_mode_radio_button.isSelected()) { 
    856845        new_mode = Configuration.ASSISTANT_MODE; 
    857         } 
    858         else if (systems_mode_radio_button.isSelected()) { 
    859         new_mode = Configuration.SYSTEMS_MODE; 
    860846        } 
    861847        else if (expert_mode_radio_button.isSelected()) { 
     
    971957        else if(source == expert_mode_radio_button) { 
    972958        mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Expert_Description")); 
    973         } 
    974         else if(source == systems_mode_radio_button) { 
    975         mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Systems_Description")); 
    976959        } 
    977960        else { 
  • gli/trunk/src/org/greenstone/gatherer/shell/GBuildProgressMonitor.java

    r12294 r18589  
    122122    private int expected_stages = 0; 
    123123 
    124     private int threshold = Configuration.SYSTEMS_MODE; 
     124    private int threshold = Configuration.LIBRARIAN_MODE; 
    125125    /** The current state we are in. The state will change depending on the next flag recieved. */ 
    126126    private int state = BASE; 
  • gli/trunk/src/org/greenstone/gatherer/shell/GImportProgressMonitor.java

    r16855 r18589  
    6767    private int num_docs; 
    6868 
    69     private int threshold = Configuration.SYSTEMS_MODE; 
     69    private int threshold = Configuration.LIBRARIAN_MODE; 
    7070    /** The progress bar this monitor updates. */ 
    7171    private GProgressBar progress_bar; 
  • gli/trunk/src/org/greenstone/gatherer/shell/GScheduleProgressMonitor.java

    r16127 r18589  
    7979    private int expected_stages = 0; 
    8080 
    81     private int threshold = Configuration.SYSTEMS_MODE; 
     81    private int threshold = Configuration.LIBRARIAN_MODE; 
    8282    /** The current state we are in. The state will change depending on the next flag recieved. */ 
    8383    private int state = BASE; 
  • gli/trunk/src/org/greenstone/gatherer/shell/GShell.java

    r18396 r18589  
    557557     
    558558    // If we were cancelled, and we are lower details modes, fire off one last message. 
    559     if(status == CANCELLED && Configuration.getMode() <= Configuration.SYSTEMS_MODE) { 
     559    if(status == CANCELLED && Configuration.getMode() <= Configuration.LIBRARIAN_MODE) { 
    560560        GShellEvent current_event = new GShellEvent(this, 0, type, Dictionary.get("GShell.Build.BuildCancelled"), status); 
    561561        Object[] concerned = listeners.getListenerList();