Changeset 12798

Timestamp:

2006-09-21T11:16:14+12:00 (18 years ago)

Author:

mdewsnip

Message:

Started tidying up the CollectionConfiguration class so we can reliably tell when it needs to be saved.

Location:

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

Files:

• ArgumentContainer.java (modified) (1 diff)
• ClassifierManager.java (modified) (1 diff)
• CollectionConfiguration.java (modified) (1 diff)
• CollectionMeta.java (modified) (2 diffs)
• Format.java (modified) (2 diffs)
• Index.java (modified) (2 diffs)
• Language.java (modified) (2 diffs)
• Level.java (modified) (1 diff)
• PluginManager.java (modified) (3 diffs)
• Subcollection.java (modified) (1 diff)
• SubcollectionIndex.java (modified) (2 diffs)

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

@@ -106 +106 @@
             // The trick thing is that we have to create a new element in the DOM as well.
             Argument new_argument = base_argument.copy();
-            Element argument_element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.OPTION_ELEMENT);
+            Element argument_element = CollectionConfiguration.createElement(StaticStrings.OPTION_ELEMENT);
             argument_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, base_argument_name);
             argument_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);

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

@@ -420 +420 @@
 
         // Create a new element in the DOM
-        Element new_classifier_element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.CLASSIFY_ELEMENT);
+        Element new_classifier_element = CollectionConfiguration.createElement(StaticStrings.CLASSIFY_ELEMENT);
         new_classifier_element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, classifier.getName());
         Classifier new_classifier = new Classifier(new_classifier_element, classifier);

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

@@ -56 +56 @@
     static final public String ENCODING = "UTF-8";
 
-    static public Document document;
+    static private Document document;
+
+
+    static public Element createElement(String element_name)
+    {
+    return document.createElement(element_name);
+    }
+
 
     /** Find the best insertion position for the given DOM Element. This should try to match command tag, and if found should then try to group by name or type (eg CollectionMeta), or append to end is no such grouping exists (eg Plugins). Failing a command match it will check against the command order for the best insertion location.

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

@@ -58 +58 @@
     /** Constructor to create a new piece of metadata given its name. */
     public CollectionMeta(String name) {
-    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.COLLECTIONMETADATA_ELEMENT);
+    element = CollectionConfiguration.createElement(StaticStrings.COLLECTIONMETADATA_ELEMENT);
     element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
     element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, Configuration.getLanguage());
@@ -66 +66 @@
     /** Constructor to create a new piece of metadata given its name. */
     public CollectionMeta(String name, String language) {
-    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.COLLECTIONMETADATA_ELEMENT);
+    element = CollectionConfiguration.createElement(StaticStrings.COLLECTIONMETADATA_ELEMENT);
     element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
     element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, language);

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

@@ -127 +127 @@
     public Format(Object feature, String part, boolean state) {
 
-    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.FORMAT_ELEMENT);
+    element = CollectionConfiguration.createElement(StaticStrings.FORMAT_ELEMENT);
     setName(feature, part);
     setState(state);
@@ -140 +140 @@
     public Format(Object feature, String part, String value) {
 
-    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.FORMAT_ELEMENT);       
+    element = CollectionConfiguration.createElement(StaticStrings.FORMAT_ELEMENT);       
     setName(feature, part);
     setValue(value);

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

@@ -66 +66 @@
     this.sources = sources;
     // Create a new element
-    Document document = CollectionDesignManager.collect_config.document;
-    this.element = document.createElement(StaticStrings.INDEX_ELEMENT);
+    this.element = CollectionConfiguration.createElement(StaticStrings.INDEX_ELEMENT);
     // For each source add a content element
     int size = sources.size();
     for(int i = 0; i < size; i++) {
-        Element content_element = document.createElement(StaticStrings.CONTENT_ELEMENT);
+        Element content_element = CollectionConfiguration.createElement(StaticStrings.CONTENT_ELEMENT);
         Object source_object = sources.get(i);
         if (source_object instanceof MetadataElement) {
@@ -84 +83 @@
         content_element = null;
     }
-    document = null;
     }
 

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

@@ -56 +56 @@
     this.code = code;
     // Create the new element
-    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.LANGUAGE_ELEMENT);
+    element = CollectionConfiguration.createElement(StaticStrings.LANGUAGE_ELEMENT);
     element.setAttribute(StaticStrings.NAME_ATTRIBUTE, code);
     element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
@@ -74 +74 @@
     }
     this.code = code_str.toString();
-    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.LANGUAGE_ELEMENT);
+    element = CollectionConfiguration.createElement(StaticStrings.LANGUAGE_ELEMENT);
     element.setAttribute(StaticStrings.NAME_ATTRIBUTE, code);
     element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);

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

@@ -54 +54 @@
      */
     public Level(String level) {
-    this.element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.LEVEL_ELEMENT);
+    this.element = CollectionConfiguration.createElement(StaticStrings.LEVEL_ELEMENT);
     this.element.setAttribute(StaticStrings.NAME_ATTRIBUTE, level);
     }

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

@@ -342 +342 @@
         }
     }
-    Element element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.PLUGIN_ELEMENT);
+    Element element = CollectionConfiguration.createElement(StaticStrings.PLUGIN_ELEMENT);
     element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, StaticStrings.SEPARATOR_ATTRIBUTE);
     element.setAttribute(StaticStrings.SEPARATOR_ATTRIBUTE, StaticStrings.TRUE_STR);
@@ -588 +588 @@
 
         // Create a new element in the DOM
-        Element new_plugin_element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.PLUGIN_ELEMENT);
+        Element new_plugin_element = CollectionConfiguration.createElement(StaticStrings.PLUGIN_ELEMENT);
         new_plugin_element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, plugin.getName());
         Plugin new_plugin = new Plugin(new_plugin_element, plugin);
@@ -958 +958 @@
 
         // Create a new element in the DOM
-        Element new_plugin_element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.PLUGIN_ELEMENT);
+        Element new_plugin_element = CollectionConfiguration.createElement(StaticStrings.PLUGIN_ELEMENT);
         new_plugin_element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, plugin.getName());
         Plugin new_plugin = new Plugin(new_plugin_element, plugin);

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

@@ -83 +83 @@
     }
     // Create a new DOM Element with the appropriate attributes and text value
-    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.SUBCOLLECTION_ELEMENT);
+    element = CollectionConfiguration.createElement(StaticStrings.SUBCOLLECTION_ELEMENT);
     element.setAttribute(StaticStrings.CONTENT_ATTRIBUTE, source);
     element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);

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

@@ -57 +57 @@
     this.sources = new ArrayList();
     // Create a new element
-    Document document = CollectionDesignManager.collect_config.document;
-    element = document.createElement(StaticStrings.INDEX_ELEMENT);
+    element = CollectionConfiguration.createElement(StaticStrings.INDEX_ELEMENT);
     // For each source add a content element
     int size = raw_sources.length;
@@ -65 +64 @@
         String subcollection_name = subcollection.getName();
         sources.add(subcollection_name);
-        Element content_element = document.createElement(StaticStrings.CONTENT_ELEMENT);
+        Element content_element = CollectionConfiguration.createElement(StaticStrings.CONTENT_ELEMENT);
         content_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, subcollection_name);
         element.appendChild(content_element);
         content_element = null;
     }
-    document = null;
     }