Changeset 8506

Timestamp:

2004-11-10T14:33:45+13:00 (19 years ago)

Author:

mdewsnip

Message:

Re-enabled the Workflow Preferences tab, which was disabled for the UNESCO release.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java (modified) (13 diffs)

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

@@ -50 +50 @@
 
 public class Preferences
-    extends ModalDialog {
-
+    extends ModalDialog
+{
     static final public String CONNECTION_PREFS = "connection";
     static final public String GENERAL_PREFS = "general";
-
 
     static final private Dimension LABEL_SIZE = new Dimension(280, 25);
@@ -69 +68 @@
     private JCheckBox use_proxy_checkbox;
     private JCheckBox view_extracted_metadata_checkbox;
-    private JCheckBox workflow_create;
     private JCheckBox workflow_mirror;
     private JCheckBox workflow_gather;
     private JCheckBox workflow_enrich;
     private JCheckBox workflow_design;
-    private JCheckBox workflow_export;
+    private JCheckBox workflow_create;
     private JComboBox language_combobox;
     private JComboBox servlet_combobox; // GS3
@@ -100 +98 @@
 
     private String current_site_selection;
+
     public Preferences() {
     this(GENERAL_PREFS);
@@ -118 +117 @@
     tab_pane.add("Preferences.General", general_preferences);
     tab_pane.add("Preferences.Mode", createModePreferences());
-    // !! Temporarily disabled for the UNESCO CD-ROM !!
-    // tab_pane.add("Preferences.Workflow", createWorkflowPreferences());
+    tab_pane.add("Preferences.Workflow", createWorkflowPreferences());
     JPanel connection_preferences = createConnectionPreferences();
     tab_pane.add("Preferences.Connection", connection_preferences);
@@ -154 +152 @@
     Dimension frame_size = Gatherer.g_man.getSize();
     Point frame_location = Gatherer.g_man.getLocation();
-    //setLocation(frame_location.x + ((frame_size.width - SIZE.width) / 2), frame_location.y + ((frame_size.height - SIZE.height)));
     setLocation(((frame_size.width - SIZE.width) / 2), ((frame_size.height - SIZE.height)));
 
     // Bring the desired pane to the fore
-    if(initial_view.equals(CONNECTION_PREFS)) {
+    if (initial_view.equals(CONNECTION_PREFS)) {
         tab_pane.setSelectedComponent(connection_preferences);
     }
@@ -164 +161 @@
         tab_pane.setSelectedComponent(general_preferences);
     }
-
     
     // Clean up
@@ -342 +338 @@
     // Build the model of available languages
     ArrayList dictionary_model = new ArrayList();
-
-    // Old method for determining what languages should be available in the combobox
-    /*
-    dictionary_model.add(new DictionaryEntry(Locale.ENGLISH));
-    File classes_folder = new File(Utility.BASE_DIR + StaticStrings.CLASSES_FOLDER);
-    File[] possible_dictionaries = classes_folder.listFiles();
-    for(int i = 0; i < possible_dictionaries.length; i++) {
-        String filename = possible_dictionaries[i].getName();
-        if(filename.endsWith(StaticStrings.PROPERTIES_FILE_EXTENSION) && filename.indexOf(StaticStrings.UNDERSCORE_CHARACTER) != -1) {
-        StringTokenizer tokenizer = new StringTokenizer(filename.substring(filename.indexOf(StaticStrings.UNDERSCORE_CHARACTER) + 1, filename.indexOf(StaticStrings.STOP_CHARACTER)), StaticStrings.UNDERSCORE_CHARACTER);
-        Locale locale = null;
-        switch(tokenizer.countTokens()) {
-        case 1:
-            locale = new Locale(tokenizer.nextToken().toLowerCase());
-            break;
-        case 2:
-            locale = new Locale(tokenizer.nextToken().toLowerCase(), tokenizer.nextToken().toUpperCase());
-            break;
-        }
-        tokenizer = null;
-        // Open the file and read the first line
-        String description = null;
-        try {
-            BufferedReader br = new BufferedReader(new FileReader(possible_dictionaries[i]));
-            String first_line = br.readLine();
-            br.close();
-            description = first_line.substring(first_line.indexOf(StaticStrings.COLON_CHARACTER) + 1);
-        }
-        catch(Exception error) {
-        }
-        DictionaryEntry entry = new DictionaryEntry(description, locale);
-        description = null;
-        locale = null;
-        if(!dictionary_model.contains(entry)) {
-            dictionary_model.add(entry);
-        }
-        entry = null;
-        }
-        filename = null;
-    }
-    possible_dictionaries = null;
-    classes_folder = null;
-    */
 
     // The new method makes use of the successor to the languages.dat file, classes/xml/languages.xml
@@ -595 +548 @@
     Dictionary.registerText(workflow_design, "Preferences.Workflow.Design");
 
-    workflow_export = new JCheckBox();
-    workflow_export.setSelected(Configuration.get("workflow.export", false));
-    workflow_export.setPreferredSize(ROW_SIZE);
-    Dictionary.registerText(workflow_export, "Preferences.Workflow.Export");
-
     workflow_create = new JCheckBox();
     workflow_create.setSelected(Configuration.get("workflow.create", false));
@@ -627 +575 @@
     if (Configuration.get("workflow.design", true)) {
         checklist_pane.add(workflow_design);
-    }
-    if (Configuration.get("workflow.export", true)) {
-        checklist_pane.add(workflow_export);
     }
     if (Configuration.get("workflow.create", true)) {
@@ -749 +694 @@
 
         // Workflow preferences
-        // Configuration.set("workflow.mirror", false, workflow_mirror.isSelected());
-        // Configuration.set("workflow.gather", false, workflow_gather.isSelected());
-        // Configuration.set("workflow.enrich", false, workflow_enrich.isSelected());
-        // Configuration.set("workflow.design", false, workflow_design.isSelected());
-        // Configuration.set("workflow.export", false, workflow_export.isSelected());
-        // Configuration.set("workflow.create", false, workflow_create.isSelected());
-        // Gatherer.g_man.workflowUpdate("Mirror", workflow_mirror.isSelected());
-        // Gatherer.g_man.workflowUpdate("Gather", workflow_gather.isSelected());
-        // Gatherer.g_man.workflowUpdate("Enrich", workflow_enrich.isSelected());
-        // Gatherer.g_man.workflowUpdate("Design", (workflow_design.isSelected() && Configuration.getMode() > Configuration.ASSISTANT_MODE));
-        // Gatherer.g_man.workflowUpdate("Export", workflow_export.isSelected());
-        // Gatherer.g_man.workflowUpdate("Create", workflow_create.isSelected());
+        Configuration.set("workflow.mirror", false, workflow_mirror.isSelected());
+        Configuration.set("workflow.gather", false, workflow_gather.isSelected());
+        Configuration.set("workflow.enrich", false, workflow_enrich.isSelected());
+        Configuration.set("workflow.design", false, workflow_design.isSelected());
+        Configuration.set("workflow.create", false, workflow_create.isSelected());
+        Gatherer.g_man.workflowUpdate("Mirror", workflow_mirror.isSelected());
+        Gatherer.g_man.workflowUpdate("Gather", workflow_gather.isSelected());
+        Gatherer.g_man.workflowUpdate("Enrich", workflow_enrich.isSelected());
+        Gatherer.g_man.workflowUpdate("Design", (workflow_design.isSelected() && Configuration.getMode() > Configuration.ASSISTANT_MODE));
+        Gatherer.g_man.workflowUpdate("Create", workflow_create.isSelected());
 
         // Always save configuration changes immediately (in case the GLI crashes)
@@ -766 +709 @@
 
         // Hide dialog
-        if(close) {
+        if (close) {
         self.dispose();
         }
@@ -847 +790 @@
         }
         public void run() {
-        workflow_create.setSelected(element.getEnabled("create"));
         workflow_mirror.setSelected(element.getEnabled("mirror"));
         workflow_gather.setSelected(element.getEnabled("gather"));
         workflow_enrich.setSelected(element.getEnabled("enrich"));
         workflow_design.setSelected(element.getEnabled("design"));
-        workflow_export.setSelected(element.getEnabled("export"));
+        workflow_create.setSelected(element.getEnabled("create"));
         }
     }
@@ -862 +804 @@
         // Retrieve the entry
         DictionaryEntry entry = (DictionaryEntry) language_combobox.getSelectedItem();
-        if(entry != null) {
-        //Gatherer.dictionary.changeDictionary(entry.getLocale());
+        if (entry != null) {
         // Display message
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Preferences.General.Restart_Required"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);