Changeset 7505

Timestamp:

2004-05-31T14:47:49+12:00 (20 years ago)

Author:

mdewsnip

Message:

Preferences are now saved to file as soon as the OK button is pressed (in case the GLI crashes).

File:

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

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

@@ -74 +74 @@
     private JCheckBox use_proxy_checkbox;
     private JCheckBox view_extracted_metadata_checkbox;
-    private JCheckBox workflow_browse;
     private JCheckBox workflow_create;
     private JCheckBox workflow_mirror;
@@ -81 +80 @@
     private JCheckBox workflow_design;
     private JCheckBox workflow_export;
-    private JCheckBox workflow_preview;
     private JComboBox language_combobox;
     private JComboBox servlet_combobox; // GS3
@@ -92 +90 @@
     private JLabel proxy_host_label;
     private JLabel proxy_port_label;
-    //private JLabel recursion_depth_label;
     private JLabel title_label;
     private JPanel servlet_pane;
@@ -100 +97 @@
     private JRadioButton systems_mode_radio_button;
     private JSpinner proxy_port_field;
-    //private JSpinner recursion_depth_spinner;
     private JTabbedPane tab_pane;
     private JTextArea mode_description_textarea;
@@ -461 +457 @@
     }
 
-    // Recursion
-    /*
-    JPanel recursion_depth_pane = new JPanel();
-    recursion_depth_label = new JLabel();
-    recursion_depth_label.setPreferredSize(LABEL_SIZE);
-    Dictionary.registerText(recursion_depth_label, "Preferences.General.Recursion_Depth");
-    recursion_depth_spinner = new JSpinner(new SpinnerNumberModel(Gatherer.config.getInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC), 0, Integer.MAX_VALUE, 1));
-    Dictionary.registerTooltip(recursion_depth_spinner, "Preferences.General.Recursion_Depth_Tooltip");
-    */
-
     // Connect
     language_combobox.addActionListener(new LanguageComboboxListener());
@@ -483 +469 @@
     language_pane.add(language_combobox, BorderLayout.CENTER);
 
-    //recursion_depth_pane.setLayout(new BorderLayout());
-    //recursion_depth_pane.add(recursion_depth_label, BorderLayout.WEST);
-    //recursion_depth_pane.add(recursion_depth_spinner, BorderLayout.CENTER);
-
     general_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     general_pane.setLayout(new GridLayout(5,1,0,5));
     general_pane.add(email_pane);
     general_pane.add(language_pane);
-    //general_pane.add(recursion_depth_pane);
     general_pane.add(view_extracted_metadata_checkbox);
     general_pane.add(show_file_size_checkbox);
@@ -605 +586 @@
     Dictionary.registerText(title_label, "Preferences.Workflow.Title");
 
-    workflow_browse = new JCheckBox();
-    workflow_browse.setSelected(Gatherer.config.get("workflow.browse", false));
-    workflow_browse.setPreferredSize(ROW_SIZE);
-    Dictionary.registerText(workflow_browse, "Preferences.Workflow.Browse");
-
     workflow_mirror = new JCheckBox();
     workflow_mirror.setSelected(Gatherer.config.get("workflow.mirror", false));
@@ -640 +616 @@
     Dictionary.registerText(workflow_create, "Preferences.Workflow.Create");
 
-    workflow_preview = new JCheckBox();
-    workflow_preview.setSelected(Gatherer.config.get("workflow.preview", false));
-    workflow_preview.setPreferredSize(ROW_SIZE);
-    Dictionary.registerText(workflow_preview, "Preferences.Workflow.Preview");
-
     JPanel predefined_pane = new JPanel();
     predefined_label = new JLabel();
@@ -656 +627 @@
     checklist_pane.setLayout(new BoxLayout(checklist_pane, BoxLayout.Y_AXIS));
     checklist_pane.add(title_label);
-    if (Gatherer.config.get("workflow.browse", true)) {
-        checklist_pane.add(workflow_browse);
-    }
     if (Gatherer.config.get("workflow.mirror", true)) {
         checklist_pane.add(workflow_mirror);
@@ -677 +645 @@
         checklist_pane.add(workflow_create);
     }
-    if (Gatherer.config.get("workflow.preview", true)) {
-        checklist_pane.add(workflow_preview);
-    }
+
     predefined_pane.setLayout(new BorderLayout(5,0));
     predefined_pane.add(predefined_label, BorderLayout.WEST);
@@ -754 +720 @@
         ClassifierManager.clearClassifierCache();
         }
-        //Gatherer.config.setInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC, ((Integer)recursion_depth_spinner.getValue()).intValue());
 
         // Mode preferences
@@ -793 +758 @@
 
         // Workflow preferences
-        // Gatherer.config.set("workflow.browse", false, workflow_browse.isSelected());
         // Gatherer.config.set("workflow.mirror", false, workflow_mirror.isSelected());
         // Gatherer.config.set("workflow.gather", false, workflow_gather.isSelected());
@@ -800 +764 @@
         // Gatherer.config.set("workflow.export", false, workflow_export.isSelected());
         // Gatherer.config.set("workflow.create", false, workflow_create.isSelected());
-        // Gatherer.config.set("workflow.preview", false, workflow_preview.isSelected());
-        // Gatherer.g_man.workflowUpdate("Hunt", workflow_browse.isSelected());
         // Gatherer.g_man.workflowUpdate("Mirror", workflow_mirror.isSelected());
         // Gatherer.g_man.workflowUpdate("Gather", workflow_gather.isSelected());
@@ -808 +770 @@
         // Gatherer.g_man.workflowUpdate("Export", workflow_export.isSelected());
         // Gatherer.g_man.workflowUpdate("Create", workflow_create.isSelected());
-        // Gatherer.g_man.workflowUpdate("Preview", workflow_preview.isSelected());
+
+        // Always save configuration changes immediately (in case the GLI crashes)
+        Gatherer.config.save();
+
         // Hide dialog
         if(close) {
@@ -899 +864 @@
         }
         public void run() {
-        workflow_browse.setSelected(element.getEnabled("browse"));
         workflow_create.setSelected(element.getEnabled("create"));
         workflow_mirror.setSelected(element.getEnabled("mirror"));
@@ -906 +870 @@
         workflow_design.setSelected(element.getEnabled("design"));
         workflow_export.setSelected(element.getEnabled("export"));
-        workflow_preview.setSelected(element.getEnabled("preview"));
         }
     }