Changeset 6642

Timestamp:

2004-01-28T14:51:16+13:00 (20 years ago)

Author:

jmt12

Message:

Further tweaks, fixes and changes to the mirroring stuff, the highlight of which is the new log files. I've also removed the speech marks from around login and pass. While this means you can't have a login or pass with spaces in it, it does save me a lot of effort. Rather than tell people about the further options, they now click on a button to open the preferences window and show the further options. Also fixed a horrendeously subtle bug when trying to update the FileSystemModel - stupid race conditions

File:

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

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

@@ -51 +51 @@
 public class Preferences
     extends ModalDialog {
+
+    static final public String CONNECTION_PREFS = "connection";
+    static final public String GENERAL_PREFS = "general";
+
+
+    static final private Dimension LABEL_SIZE = new Dimension(240, 25);
+    static final private Dimension ROW_SIZE = new Dimension(640, 25);
+    static final private Dimension SIZE = new Dimension(640, 345);
+    static final private String TRUE = "true";
 
     private CheckList warning_preferences_check_list;
@@ -92 +101 @@
     private Preferences self;
 
-    static final Dimension LABEL_SIZE = new Dimension(240, 25);
-    static final Dimension ROW_SIZE = new Dimension(640, 25);
-    static final Dimension SIZE = new Dimension(640, 345);
-    static final String TRUE = "true";
-
     public Preferences() {
+    this(GENERAL_PREFS);
+    }
+
+    public Preferences(String initial_view) {
     // Initialize
     super(Gatherer.g_man, true);
@@ -112 +120 @@
     tab_pane.add("Preferences.Mode", createModePreferences());
     tab_pane.add("Preferences.Workflow", createWorkflowPreferences());
-    tab_pane.add("Preferences.Connection", createConnectionPreferences());
+    JPanel connection_preferences = createConnectionPreferences();
+    tab_pane.add("Preferences.Connection", connection_preferences);
     tab_pane.add("Preferences.Warnings", createWarningPreferences());
     Dictionary.register(tab_pane);
@@ -148 +157 @@
     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)) {
+        tab_pane.setSelectedComponent(connection_preferences);
+    }
+    else {
+        tab_pane.setSelectedComponent(general_preferences);
+    }
+
+    
     // Clean up
+    general_preferences = null;
+    connection_preferences = null;
     frame_location = null;
     frame_size = null;
@@ -156 +176 @@
     tab_pane = null;
     content_pane = null;
+
     setVisible(true);
     }