Changeset 5649 for trunk

Timestamp:

2003-10-16T11:20:11+13:00 (21 years ago)

Author:

jmt12

Message:

203B301: Changing view away from design now causes collection to release as necessary, configuration to be written, and collection to be readd if released

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• CollectionDesignManager.java (modified) (3 diffs)
• GeneralManager.java (modified) (2 diffs)

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

@@ -43 +43 @@
 import org.greenstone.gatherer.cdm.SubcollectionManager;
 import org.greenstone.gatherer.cdm.TranslationView;
+import org.greenstone.gatherer.util.GSDLSiteConfig;
 
 /** This manager provides access to submanagers, which in turn provide tools for the designing of Greenstone collections via the information stored in etc/collect.cfg. This class acts as a hub for the managers that handle specific parts of the configuration such as classifiers, format strings and language settings.
@@ -155 +156 @@
     general_manager.gainFocus();
     }
+   
     /** Retrieve the name of the collection configuration file which is being used as the source of the information in this object.
      * @return The files absolute path as a <strong>String</strong>.
@@ -173 +175 @@
      * @see org.greenstone.gatherer.util.EmailAddress
      */
-    public void save() {
-    general_manager.loseFocus();
-    collect_config.save();
-    }
+   public void save() {
+      // Release collection as necessary
+      ///ystem.err.println("Would have released collection if necessary.");
+      boolean collection_released = false;
+      if(format_manager.formatsChanged() && Gatherer.c_man.built() && Gatherer.config.exec_file != null) {
+     // Release the collection
+     Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + Gatherer.c_man.getCollection().getName());
+     collection_released = true;
+      }
+      
+      general_manager.loseFocus();
+      collect_config.save();
+      
+      // Readd collection
+      ///ystem.err.println("Would have added collection if it had been released.");
+      if(collection_released) {
+     // Then re-add it to force format commands to be processed
+     Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.ADD_COMMAND + Gatherer.c_man.getCollection().getName());
+     // Unset formats changed
+     format_manager.setFormatsChanged(false);
+      }
+    }
+   
     /** Method used during a global search and replace to highlight the appropriate record within the Collection Design Managers version of the Metadata Set Manager (view only).
      * @param element The name of the desired element as a <strong>String</strong>.

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

@@ -58 +58 @@
     private Control controls;
     /** The panel apon which is rendered the currently selected section screen. */
-    private Control view = null;
+   private Control view = null;
     /** A tree to serve as a 'table of contents' for this design tool. We decided on a tree rather than a list, as it allows us to break sections into subsections if they become to complicated. */
     private DesignTree tree;
@@ -113 +113 @@
 
     /** Saves the state of the controls in the current view. */
-    public void loseFocus() {
-    if (view != null) {
-        view.loseFocus();
-    }
+   public void loseFocus() {
+      if (view != null) {
+     view.loseFocus();
+      }
     }