Changeset 6662

Timestamp:

2004-01-29T17:34:35+13:00 (20 years ago)

Author:

jmt12

Message:

Worked around stupid collection title clash warning dialog crashes spooty program on exit

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/CollectionDesignManager.java (modified) (1 diff)
• cdm/GeneralManager.java (modified) (5 diffs)
• collection/CollectionManager.java (modified) (1 diff)
• gui/GConfigPane.java (modified) (1 diff)
• gui/GUIManager.java (modified) (4 diffs)
• gui/ModalDialog.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -192 +192 @@
     }
 
+    /** Ensure that saving will actually work. This can return false if there is a collection filename clash for instance. */
+    public boolean canSave() {
+    return general_manager.canSave();
+    }
+
     /** Cause the current collection configuration to be written out to disk.
      * @see org.greenstone.gatherer.cdm.ClassifierManager

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -98 +98 @@
     }
 
+    public boolean canSave() {
+    return ((GeneralControl)controls).canSave();
+    }
+
     /** Destructor. */
     public void destroy() {
@@ -146 +150 @@
     extends JPanel
     implements Control {
+
+    private boolean has_been_warned = false;
     private boolean ready = false;
     private CollectionMeta beta_collectionmeta;
@@ -365 +371 @@
         ready = true;
     }
+
+    public boolean canSave() {
+        boolean title_clash_warning = true;
+        // Oh, and if the collection title is already in use warn them about it
+        String title = name_textfield.getText();
+        // I just happen to have a handy method in the new details prompt to detect this very thing
+        if(NewCollectionDetailsPrompt.titleClashes(title, CollectionDesignManager.collect_config.getFile())) {
+        // Determine if the user wants to be warned about this
+        WarningDialog dialog = new WarningDialog("warning.TitleClashes", true);
+        if(dialog.display() == JOptionPane.OK_OPTION) {
+            // If they have said yes, then carry on with the assignement
+            collection_name_collectionmeta.setValue(title);
+            has_been_warned = true;
+        }
+        // Otherwise we don't assign anything. In fact we have to restore the frame title back to its original value
+        else {
+            title_clash_warning = false;
+            String collection_title = collection_name_collectionmeta.getValue(CollectionMeta.TEXT);
+            String collection_name = Gatherer.c_man.getCollection().getName();
+            Gatherer.g_man.setTitle(collection_title, collection_name);
+            collection_name = null;
+            collection_title = null;
+        }
+        dialog.dispose();
+        dialog = null;
+        }
+        // No clash, no worries.
+        else {
+        collection_name_collectionmeta.setValue(title);
+        }
+        return title_clash_warning;
+    }
+
     /** Called to store the current value of the components. */
     public void loseFocus() {
+        
         // String values. Have to test if this component has actually ever recieved focus anyway.
         if(ready) {
@@ -386 +426 @@
         String title = name_textfield.getText();
         // I just happen to have a handy method in the new details prompt to detect this very thing
-        if(NewCollectionDetailsPrompt.titleClashes(title, CollectionDesignManager.collect_config.getFile())) {
+        if(!has_been_warned && NewCollectionDetailsPrompt.titleClashes(title, CollectionDesignManager.collect_config.getFile())) {
             // Determine if the user wants to be warned about this
             WarningDialog dialog = new WarningDialog("warning.TitleClashes", true);
@@ -411 +451 @@
 
         ready = false;
+        has_been_warned = false;
         }  
     }

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1233 +1233 @@
     }
 
+    public void setClosingThread(boolean set) {
+    if(set) {
+        closing_thread = Thread.currentThread();
+    }
+    else {
+        closing_thread = null;
+    }
+    }
+
     /** Updates the given workspace tree model to reference the private cache of the currently loaded collection. */
     /* private void updatePrivateWorkspace(DefaultTreeModel model) {

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

@@ -99 +99 @@
    }
 
+    public boolean canSave() {
+    return cdm.canSave();
+    }
+
    public void loseFocus() {
       if(cdm != null) {

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

@@ -209 +209 @@
     }
     else if(esrc == menu_bar.file_exit) {
-        menu_bar.exit();
+        //menu_bar.exit();
         exit();
     }
@@ -539 +539 @@
      */
     public void exit() {
-    // First of all an exit can only happen if no modal dialog is currently being displayed. Something is creating a modal dialog but not disposing of it.
-    if(Gatherer.current_modal != null) {
-        System.err.println("There is a modal dialog open.");
-        Gatherer.current_modal.makeVisible();
-        Gatherer.current_modal.toFront();
-        return;
-    }
-
-    boolean cont = true;
-    if(Gatherer.c_man.ready() && !Gatherer.c_man.saved()) {
-        cont = showSaveCollectionBox(false, true);
-    }
-    else {
-        // Deal to help
-        if(help != null) {
-            help.destroy();
-            help = null;
-        }
-        Gatherer.self.exit();
+    // Tell everyone who cares that they are losing focus
+    if(config_pane.canSave()) {
+        boolean cont = true;
+        if(Gatherer.c_man.ready() && !Gatherer.c_man.saved()) {
+        cont = showSaveCollectionBox(false, true);
+        }
+        else {
+        // Deal to help
+        if(help != null) {
+            help.destroy();
+            help = null;
+        }
+        Gatherer.self.exit();
+        }
     }
     }
@@ -852 +847 @@
     //switch(result) {
     //case SaveCollectionBox.SAVE_YES:
+    Gatherer.c_man.setClosingThread(true);
     Gatherer.c_man.saveCollection(close_after, exit_after);
     // Wait until it is closed.
     try {
-        synchronized(this) {
+        synchronized(this) {
             while(Gatherer.c_man.reallyReady()) {
-            wait(10);
+            wait(10);
             }
-        }
+        }
     }
     catch(Exception error) {
@@ -865 +861 @@
         Gatherer.printStackTrace(error);
     }
-
+    
+    Gatherer.c_man.setClosingThread(false);
+    
     //content_pane.paintImmediately(bounds);
     return true;

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

@@ -151 +151 @@
             Object src = event.getSource ();
             if (event instanceof ActiveEvent) {
-                ///ystem.err.println("ActiveEvent:");
+                System.err.println("ActiveEvent:");
                 ((ActiveEvent) event).dispatch ();
             } else if (src instanceof Component) {
-                ///ystem.err.println("Source is component");
+                System.err.println("Source is component");
                 ((Component) src).dispatchEvent (event);
             }
             else {
-                ///ystem.err.println("Event blocked");
+                System.err.println("Event blocked");
             }
             }