Changeset 10556 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2005-08-24T15:14:01+12:00 (19 years ago)

Author:

kjdon

Message:

fixes to make the config file save only if it has changed

Location:

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

Files:

• ClassifierManager.java (modified) (2 diffs)
• CollectionDesignManager.java (modified) (4 diffs)
• CollectionMeta.java (modified) (2 diffs)
• CollectionMetaManager.java (modified) (1 diff)
• GeneralManager.java (modified) (1 diff)
• PluginManager.java (modified) (2 diffs)
• SearchTypeManager.java (modified) (3 diffs)
• SuperCollectionManager.java (modified) (5 diffs)
• TranslationView.java (modified) (4 diffs)

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

@@ -809 +809 @@
             ac.destroy();
             ac = null;
+            // cos I can't be bothered checking every argument to see if it has changed or not, we'll asasume that the configuration has changed if someone has clicked configure
+            Gatherer.c_man.configurationChanged();
             }
         }
@@ -832 +834 @@
            ac.destroy();
            ac = null;
+           // cos I can't be bothered checking every argument to see if it has changed or not, we'll asasume that the configuration has changed if someone has clicked configure
+           Gatherer.c_man.configurationChanged();
         }
         }

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

@@ -90 +90 @@
     static final public int NOTHING = 0;
     static private int rebuildTypeRequired = NOTHING; //Rebuild type required if only design options have changed
-    static protected boolean update_collect_cfg_required = false;
+    static public boolean update_collect_cfg_required = false;
 
     /** Constructor. Loads a certain collection configuration file, which is parsed into a DOM. This model is then registered with the command information managers, each of whom knows how to, and provides controls to, alter certain commands.
@@ -214 +214 @@
 
 
+    public void save() {
+    save(false);
+    }
     /** Cause the current collection configuration to be written out to disk.
      */
-    public void save()
+    public void save(boolean force_save)
     {
+    
+    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");
+    
     // Release collection as necessary
     String collection_name = Gatherer.c_man.getCollection().getName();
     boolean collection_released = false;
 
-    if (update_collect_cfg_required && Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {
+    if (Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {
         // Release the collection
         LocalLibraryServer.releaseCollection(collection_name);
@@ -228 +240 @@
     }
 
-    general_manager.loseFocus();
     collect_config.save();
 
@@ -237 +248 @@
     }
 
-    if (update_collect_cfg_required) {
-        // Unset formats changed
-        update_collect_cfg_required = false;
-    }
+    // Unset formats changed
+    update_collect_cfg_required = false;
+    
     }
 

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

@@ -27 +27 @@
 package org.greenstone.gatherer.cdm;
 
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.util.Codec;
@@ -161 +162 @@
      */
     public void setValue(String raw_value) {
+    // we need to check if the value has changed
+    String current_value = XMLTools.getValue(element);
+    String new_value = Codec.transform(raw_value, Codec.TEXT_TO_DOM);
+    if (!current_value.equals(new_value)) {
     // Only raw html text can be given to setValue so we need to encode it
-    XMLTools.setValue(element, Codec.transform(raw_value, Codec.TEXT_TO_DOM));
-    text = null; // Reset text
-    // And determine if this makes the metadata assigned
-    setAssigned(raw_value != null && raw_value.length() > 0);
+        XMLTools.setValue(element, new_value);
+        text = null; // Reset text
+        // And determine if this makes the metadata assigned
+        setAssigned(raw_value != null && raw_value.length() > 0);
+        Gatherer.c_man.configurationChanged();
+    }
     }
 

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

@@ -56 +56 @@
     if(!contains(metadata)) {
         Element element = metadata.getElement();
-        // Locate where we should insert this new subcollection. 
+        // Locate where we should insert this new metadata. 
         Node target_node = CollectionConfiguration.findInsertionPoint(element);
         add(root, metadata, target_node);
-        Gatherer.c_man.configurationChanged();
-    }
-    Gatherer.c_man.configurationChanged();
+        if (!metadata.getValue(CollectionMeta.TEXT).equals("")) {
+        // if just adding an empty metadata, the configuration hasn't changed.
+        Gatherer.c_man.configurationChanged();
+        }
+    }
+    //Gatherer.c_man.configurationChanged();
     }
 

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

@@ -355 +355 @@
         collection_extra_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
         collection_name_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_COLLECTIONNAME_STR);
+        
         creator_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getCreator());
         icon_collection_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTION_STR);

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

@@ -972 +972 @@
                 ac.destroy();
                 ac = null;
+                // cos I can't be bothered checking every argument to see if it has changed or not, we'll asasume that the configuration has changed if someone has clicked configure
+                Gatherer.c_man.configurationChanged();
             }
             }
@@ -996 +998 @@
             ac.destroy();
             ac = null;
+            // cos I can't be bothered checking every argument to see if it has changed or not, we'll asasume that the configuration has changed if someone has clicked configure
+            Gatherer.c_man.configurationChanged();
             }
         }

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

@@ -222 +222 @@
         }
         } else {
-        build_type.setValue((String)build_type_combobox.getSelectedItem());
+        //build_type.setValue((String)build_type_combobox.getSelectedItem());
         build_type.setAssigned(isSearchTypeEnabled());
 
@@ -427 +427 @@
         Gatherer.g_man.wait(true);
         boolean advanced_search_enabled = enable_advanced_searches_checkbox.isSelected();
+        
         model.root.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (advanced_search_enabled ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
         CollectionDesignManager.index_manager.setMGPPEnabled(advanced_search_enabled);
         validateControls(advanced_search_enabled);
-        build_type.setAssigned(advanced_search_enabled);
+        if ((!build_type.isAssigned() && advanced_search_enabled) || 
+            (build_type.isAssigned() && !advanced_search_enabled)) {
+            
+            build_type.setAssigned(advanced_search_enabled);
+            Gatherer.c_man.configurationChanged();
+        }
+        if (build_type.isAssigned() && build_type.getValue(true).equals("")) {
+            build_type.setValue((String)build_type_combobox.getSelectedItem());
+        }
         Gatherer.g_man.wait(false);
         }
@@ -439 +448 @@
 
         public void actionPerformed(ActionEvent event) {
-        build_type.setValue((String)build_type_combobox.getSelectedItem());
-        }
-
+        if (!build_type.getValue(CollectionMeta.TEXT).equals((String)build_type_combobox.getSelectedItem())) {
+            build_type.setValue((String)build_type_combobox.getSelectedItem()); 
+        }
+        }
+        
     }
     /** Listenes for actions on the Remove button, and if detected removes the currently selected search types. */

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

@@ -75 +75 @@
     if(!contains(supercollection)) {
         add(getSize(), supercollection);
-    }
+        Gatherer.c_man.configurationChanged();
+    }
+    
     }
 
@@ -103 +105 @@
 
     private void removeSuperCollection(SuperCollection supercollection) {
-    remove(supercollection);
+    if(contains(supercollection)) {
+        remove(supercollection);
+        Gatherer.c_man.configurationChanged();
+    }
     }
 
@@ -162 +167 @@
         ArrayList supercollections = children();
         // Now iterate through the checklist, and for each checked box found ensure the Supercollection exists, and ensure its assigned. Remove any supercollections altered in this way from the temporary array list
+        // we ignore the current coll at the moment
         int size = collection_checklist_model.size();
         for(int i = 0; i < size; i++) {
@@ -167 +173 @@
         if(entry.isSelected()) {
             String collection_name = (String) entry.getProperty();
-            SuperCollection supercollection = getSuperCollection(collection_name);
-            // Create the supercollection element if necessary
-            if(supercollection == null) {
-            Element supercollection_element = root.getOwnerDocument().createElement(StaticStrings.COLLECTION_ELEMENT);
-            supercollection = new SuperCollection(supercollection_element);
-            supercollection.setName(collection_name);
-            addSuperCollection(supercollection);
+            if (!collection_name.equals(current_coll_name)) {
+            SuperCollection supercollection = getSuperCollection(collection_name);
+            // Create the supercollection element if necessary
+            if(supercollection == null) {
+                Element supercollection_element = root.getOwnerDocument().createElement(StaticStrings.COLLECTION_ELEMENT);
+                supercollection = new SuperCollection(supercollection_element);
+                supercollection.setName(collection_name);
+                addSuperCollection(supercollection);
+            }
+            else {
+                supercollections.remove(supercollection);
+            }
+            supercollection.setAssigned(true);
+            super_collections_count++;
             }
-            else {
-            supercollections.remove(supercollection);
-            }
-            supercollection.setAssigned(true);
-            super_collections_count++;
-        }
-        }
+        }
+        }
+        if (super_collections_count > 0) {
+        // we have some super colls, add in the current collection
+        SuperCollection supercollection = getSuperCollection(current_coll_name);
+        // Create the supercollection element if necessary
+        if(supercollection == null) {
+            Element supercollection_element = root.getOwnerDocument().createElement(StaticStrings.COLLECTION_ELEMENT);
+            supercollection = new SuperCollection(supercollection_element);
+            supercollection.setName(current_coll_name);
+            addSuperCollection(supercollection);
+        }
+        else {
+            supercollections.remove(supercollection);
+        }
+        model.root.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
+        } else {
+        // current collection is the only one - don't bother adding it, because assigned is false, and we don't want to update the config file for an unassigned item.
+        model.root.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
+        }
+        
         // Any collections left in the temporary list have been unselected, so delete them
         for(int j = supercollections.size(); j > 0; j--) {
@@ -187 +214 @@
         removeSuperCollection(supercollection);
         }
-        // Now we only assign supercollections if more than one is selected
-        model.root.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (super_collections_count > 1 ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
-    }
-
-
+    }
+
+    
     private void buildModel()
     {

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

@@ -36 +36 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.gui.GLIButton;
 
@@ -377 +378 @@
             translation_text = null;
             remove_button.setEnabled(true);
+            Gatherer.c_man.configurationChanged();
         }
         add_button.setEnabled(false);
@@ -396 +398 @@
             // If a remove occured then enable add
             add_button.setEnabled(true);
+            Gatherer.c_man.configurationChanged();
         }
         // Either way disable replace and remove
@@ -419 +422 @@
             metadata = null;
             remove_button.setEnabled(true);
+            Gatherer.c_man.configurationChanged();
         }
         // Either way disable replace