Changeset 5302

Timestamp:

2003-08-27T15:14:13+12:00 (21 years ago)

Author:

jmt12

Message:

Fixed 203B112 - similar open collection dialog

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• GUIManager.java (modified) (4 diffs)
• OpenCollectionDialog.java (modified) (1 diff)

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

@@ -68 +68 @@
 import org.greenstone.gatherer.gui.Preferences;
 import org.greenstone.gatherer.gui.PreviewPane;
+import org.greenstone.gatherer.gui.SimpleOpenCollectionDialog;
 import org.greenstone.gatherer.gui.messages.MessagePane;
 import org.greenstone.gatherer.gui.metaaudit.MetaAuditFrame;
@@ -417 +418 @@
 
         if(Gatherer.config.get("workflow.mirror", true)) {
-        mirror_pane = new MirrorPane(workspace_tree_sync);
-        mirror_pane.display();
+        mirror_pane = new MirrorPane();
         tab_pane.addTab(get("Mirroring"), Utility.getImage("mirroring.gif"), mirror_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Gatherer.config.get("workflow.mirror", false));
@@ -590 +590 @@
     public boolean showLoadCollectionBox() {
     boolean result = false;
-    //LoadCollectionBox load_collection_box = new LoadCollectionBox();
-    File file;
-    if(Gatherer.config.gsdl_path != null) {
-        file = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
-    }
-    else {
-        file = new File(Utility.BASE_DIR);
-    }
-    OpenCollectionDialog chooser = new OpenCollectionDialog(file);
-    String filename = chooser.getFileName();
+    // We first try the simple open collection dialog
+    SimpleOpenCollectionDialog dialog = new SimpleOpenCollectionDialog();
+    int user_choice = dialog.display();
+    String filename = null;
+    // The user may choose to go to the advanced 'browse' dialog
+    if(user_choice == SimpleOpenCollectionDialog.OK_OPTION) {
+        filename = dialog.getFileName();
+    }
+    else if(user_choice == SimpleOpenCollectionDialog.BROWSE_OPTION) {
+        File file;
+        if(Gatherer.config.gsdl_path != null) {
+        file = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
+        }
+        else {
+        file = new File(Utility.BASE_DIR);
+        }
+        OpenCollectionDialog chooser = new OpenCollectionDialog(file);
+        file = null;
+        filename = chooser.getFileName();
+        chooser.destroy();
+        chooser = null;
+    }
+    dialog.destroy();
+    dialog = null;
     // User can cancel action.
     if(filename != null) {
@@ -619 +633 @@
         }
         result = Gatherer.c_man.loadCollection(filename);
+        filename = null;
     }
     return result;

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

@@ -82 +82 @@
     }
 
+    public void destroy() { 
+    }
+
     public String getFileName() {
     // Continually loop until the use chooses an appropriate file or cancels.