Changeset 6319 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2003-12-19T14:47:38+13:00 (20 years ago)

Author:

jmt12

Message:

A new configuration setting - recursion depth, after which gli suspects a cyclic loop. FileQueue makes use of this setting, along with a method of finding folder depth, to make this judgement

File:

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

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

@@ +1 @@
+/**
+ *#########################################################################
+ *
+ * A component of the Gatherer application, part of the Greenstone digital
+ * library suite from the New Zealand Digital Library Project at the
+ * University of Waikato, New Zealand.
+ *
+ * Author: John Thompson, Greenstone Digital Library, University of Waikato
+ *
+ * Copyright (C) 1999 New Zealand Digital Library Project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *########################################################################
+ */
 package org.greenstone.gatherer.gui;
 
@@ -14 +40 @@
 import org.greenstone.gatherer.checklist.Entry;
 import org.greenstone.gatherer.gui.EmailField;
+import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
@@ -47 +74 @@
     private JLabel proxy_host_label;
     private JLabel proxy_port_label;
+    private JLabel recursion_depth_label;
     private JLabel title_label;
     private JTabbedPane tab_pane;
@@ -52 +80 @@
     private JTextField proxy_host_field;
     private JSpinner proxy_port_field;
+    private JSpinner recursion_depth_spinner;
     private Preferences self;
 
@@ -78 +107 @@
 
     JPanel button_pane = new JPanel();
-    ok_button = new JButton();
+    ok_button = new GLIButton();
+    ok_button.setMnemonic(KeyEvent.VK_O);
     Dictionary.registerBoth(ok_button, "General.OK", "General.OK_Tooltip");
-    apply_button = new JButton();
+    apply_button = new GLIButton();
+    apply_button.setMnemonic(KeyEvent.VK_A);
     Dictionary.registerBoth(apply_button, "General.Apply", "General.Apply_Tooltip");
-    cancel_button = new JButton();
+    cancel_button = new GLIButton();
+    cancel_button.setMnemonic(KeyEvent.VK_C);
     Dictionary.registerBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
 
@@ -263 +295 @@
     Dictionary.registerTooltip(language_combobox, "Preferences.General.Interface_Language_Tooltip");
 
+    // 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());
@@ -275 +315 @@
     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);
@@ -456 +501 @@
 
         Gatherer.config.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
+
+        Gatherer.config.setInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC, ((Integer)recursion_depth_spinner.getValue()).intValue());
 
         // Warning preferences