- Timestamp:
- 2009-02-24T13:48:08+13:00 (15 years ago)
- Location:
- gli/trunk/src/org/greenstone/gatherer
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/Configuration.java
r17801 r18589 60 60 static final public int ASSISTANT_MODE = 1; 61 61 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; 64 63 65 64 /** The string identifying an argument's name attribute. */ … … 616 615 case ASSISTANT_MODE: 617 616 result = Dictionary.get("Preferences.Mode.Assistant"); 618 break;619 case SYSTEMS_MODE:620 result = Dictionary.get("Preferences.Mode.Systems");621 617 break; 622 618 case EXPERT_MODE: -
gli/trunk/src/org/greenstone/gatherer/gui/CreatePane.java
r18370 r18589 823 823 } 824 824 825 // have commented this out for now - scheduling currently not826 // available except in expert mode827 //only schedule in SYSTEM mode - also done in EXPERT mode, but that is handled elsewhere828 /* 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 scheduling839 Gatherer.c_man.getCollection().schedule_options.setValue("action",true,"delete");840 Gatherer.c_man.scheduleBuild(isIncremental());841 842 }843 }844 */845 825 //Re-setting the rebuildTypeRequired is handled by CollectionManager.processComplete(GShellEvent) 846 826 } -
gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java
r18372 r18589 84 84 private JRadioButton expert_mode_radio_button; 85 85 private JRadioButton librarian_mode_radio_button; 86 private JRadioButton systems_mode_radio_button;87 86 private JSpinner proxy_port_field; 88 87 private JTabbedPane tab_pane; … … 542 541 mode_button_group.add(librarian_mode_radio_button); 543 542 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);548 543 549 544 mode_description_textarea = new JTextArea(); … … 558 553 mode_description_textarea.setText(Dictionary.get("Preferences.Mode.Assistant_Description")); 559 554 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;564 555 case Configuration.EXPERT_MODE: 565 556 expert_mode_radio_button.setSelected(true); … … 575 566 expert_mode_radio_button.addActionListener(listener); 576 567 librarian_mode_radio_button.addActionListener(listener); 577 systems_mode_radio_button.addActionListener(listener);578 568 listener = null; 579 569 // Layout 580 570 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)); 582 572 button_panel.add(assistant_mode_radio_button); 583 573 button_panel.add(librarian_mode_radio_button); 584 button_panel.add(systems_mode_radio_button);585 574 button_panel.add(expert_mode_radio_button); 586 575 … … 855 844 if (assistant_mode_radio_button.isSelected()) { 856 845 new_mode = Configuration.ASSISTANT_MODE; 857 }858 else if (systems_mode_radio_button.isSelected()) {859 new_mode = Configuration.SYSTEMS_MODE;860 846 } 861 847 else if (expert_mode_radio_button.isSelected()) { … … 971 957 else if(source == expert_mode_radio_button) { 972 958 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"));976 959 } 977 960 else { -
gli/trunk/src/org/greenstone/gatherer/shell/GBuildProgressMonitor.java
r12294 r18589 122 122 private int expected_stages = 0; 123 123 124 private int threshold = Configuration. SYSTEMS_MODE;124 private int threshold = Configuration.LIBRARIAN_MODE; 125 125 /** The current state we are in. The state will change depending on the next flag recieved. */ 126 126 private int state = BASE; -
gli/trunk/src/org/greenstone/gatherer/shell/GImportProgressMonitor.java
r16855 r18589 67 67 private int num_docs; 68 68 69 private int threshold = Configuration. SYSTEMS_MODE;69 private int threshold = Configuration.LIBRARIAN_MODE; 70 70 /** The progress bar this monitor updates. */ 71 71 private GProgressBar progress_bar; -
gli/trunk/src/org/greenstone/gatherer/shell/GScheduleProgressMonitor.java
r16127 r18589 79 79 private int expected_stages = 0; 80 80 81 private int threshold = Configuration. SYSTEMS_MODE;81 private int threshold = Configuration.LIBRARIAN_MODE; 82 82 /** The current state we are in. The state will change depending on the next flag recieved. */ 83 83 private int state = BASE; -
gli/trunk/src/org/greenstone/gatherer/shell/GShell.java
r18396 r18589 557 557 558 558 // 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) { 560 560 GShellEvent current_event = new GShellEvent(this, 0, type, Dictionary.get("GShell.Build.BuildCancelled"), status); 561 561 Object[] concerned = listeners.getListenerList();
Note:
See TracChangeset
for help on using the changeset viewer.