Changeset 12805

Timestamp:

2006-09-21T14:42:34+12:00 (18 years ago)

Author:

mdewsnip

Message:

All instances of saving the collection now go through CollectionManager.saveCollection().

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/CollectionDesignManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (2 diffs)
• gui/BaseConfigPane.java (modified) (2 diffs)
• gui/GUIManager.java (modified) (1 diff)
• gui/PreviewButton.java (modified) (1 diff)

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

@@ -190 +190 @@
     }
 
-    public void save() {
-    save(false);
-    }
 
     /** Cause the current collection configuration to be written out to disk.
      */
-    public void save(boolean force_save)
+    public void saveIfNecessary()
     {
-    general_manager.loseFocus();
-    if (!update_collect_cfg_required && !force_save) {
-        DebugStream.println("Asked to save the config file, but don't need to");
-        return;
-    }
-
-    DebugStream.println("Saving the collection config file");
-
     collect_config.save();
-
-    // Unset formats changed
-    update_collect_cfg_required = false;
     }
 

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

@@ -496 +496 @@
         }
 
-        collection.cdm.save(true);
+        saveCollection();
 
         // Create a lock file
@@ -1259 +1259 @@
 
     // Write out the collection configuration file
-    collection.cdm.save();
+    collection.cdm.saveIfNecessary();
 
     // Change cursor back to normal

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

@@ -101 +101 @@
     }
 
-    public void gainFocus() {
+
+    public void gainFocus()
+    {
     if (cdm == null && Gatherer.c_man.ready()) {
         // Retrieve the new config manager.
@@ -109 +111 @@
         view.gainFocus();
     }
-
-    }
-
-    public void loseFocus() {
-    if (cdm != null) {
-        cdm.save();
-    }
+    }
+
+
+    public void loseFocus()
+    {
     if (view != null) {
         view.loseFocus();
     }
-
-    }
+    if (cdm != null) {
+        Gatherer.c_man.saveCollection();
+    }
+    }
+
 
     public void destroy() {
     tree = null;
     view = null;
-
     }
 

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

@@ -136 +136 @@
     }
 
-  
-
-    public void windowGainedFocus(WindowEvent e) {
-    //System.out.println("JPanel windowGainedFocus.");
-    }
-
-    public void windowLostFocus(WindowEvent e) {
-        //System.out.println("JPanel windowLostFocus.");
-
+
+    public void windowGainedFocus(WindowEvent e)
+    {
+    }
+
+
+    public void windowLostFocus(WindowEvent e)
+    {
+    // Save the loaded collection
     if (Gatherer.c_man != null && Gatherer.c_man.ready() && Gatherer.c_man.getCollection().cdm != null) {
-        Gatherer.c_man.getCollection().cdm.save();
-    }
-    //Gatherer.g_man.design_pane.saveConfiguration();
-    
-    }
-  
+        Gatherer.c_man.saveCollection();
+    }
+    }
+
 
     private class GLIGUIFocusListener

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

@@ -120 +120 @@
 
     public void actionPerformed(ActionEvent event) {
-        Gatherer.c_man.getCollection().cdm.save(); // save the config file just in case
+        Gatherer.c_man.saveCollection();
         
         configureHomeURL();