Changeset 12641

Timestamp:

2006-09-01T11:38:53+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed all access to the static strings through CollectionConfiguration to directly use StaticStrings.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ArgumentContainer.java (modified) (2 diffs)
• cdm/ClassifierManager.java (modified) (3 diffs)
• cdm/CollectionMeta.java (modified) (2 diffs)
• cdm/DOMProxyListModel.java (modified) (2 diffs)
• cdm/Format.java (modified) (16 diffs)
• cdm/FormatManager.java (modified) (1 diff)
• cdm/GeneralManager.java (modified) (4 diffs)
• cdm/Index.java (modified) (10 diffs)
• cdm/IndexManager.java (modified) (21 diffs)
• cdm/Language.java (modified) (6 diffs)
• cdm/LanguageManager.java (modified) (8 diffs)
• cdm/Level.java (modified) (5 diffs)
• cdm/LevelManager.java (modified) (12 diffs)
• cdm/PluginManager.java (modified) (5 diffs)
• cdm/SearchMetadataManager.java (modified) (2 diffs)
• cdm/Subcollection.java (modified) (2 diffs)
• cdm/SubcollectionIndex.java (modified) (6 diffs)
• cdm/SubcollectionIndexManager.java (modified) (6 diffs)
• cdm/SuperCollection.java (modified) (4 diffs)
• cdm/TranslationView.java (modified) (3 diffs)
• download/Download.java (modified) (1 diff)

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

@@ -37 +37 @@
 import org.w3c.dom.*;
 
-/**************************************************************************************
- * Written:      20/05/02
- * Revised:      03/07/03
- **************************************************************************************/
-import java.util.ArrayList;
 
 /** This class provides an interface to any class that contains a list of Arguments.
@@ -228 +223 @@
 
     public boolean isAssigned() {
-    return (element != null && !element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.FALSE_STR));
+    return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
     }
 
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }

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

@@ -72 +72 @@
      */
     public ClassifierManager() {
-    super(CollectionDesignManager.collect_config.getDocumentElement(), CollectionConfiguration.CLASSIFY_ELEMENT, new Classifier());
+    super(CollectionDesignManager.collect_config.getDocumentElement(), StaticStrings.CLASSIFY_ELEMENT, new Classifier());
     this.model = this;
     DebugStream.println("ClassifierManager: " + getSize() + " classifiers parsed.");
@@ -232 +232 @@
         }
         else if (node_name.equals("Abstract")) {
-        classifier.setIsAbstract(XMLTools.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR));
+        classifier.setIsAbstract(XMLTools.getValue(node).equalsIgnoreCase(StaticStrings.YES_STR));
         }
         // Parse the classifier arguments
@@ -598 +598 @@
 
         // Create a new element in the DOM
-        Element new_classifier_element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CLASSIFY_ELEMENT);
-        new_classifier_element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, classifier.getName());
+        Element new_classifier_element = CollectionDesignManager.collect_config.document.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/CollectionMeta.java

@@ -133 +133 @@
 
     public boolean isAssigned() {
-    return (element != null && !element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.FALSE_STR));
+    return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
     }
 
@@ -149 +149 @@
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }

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

@@ -30 +30 @@
 import javax.swing.*;
 import org.greenstone.gatherer.DebugStream;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.w3c.dom.*;
 
@@ -273 +274 @@
     public synchronized void setAssigned(boolean assigned) {
     if (assigned) {
-        root.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
-    }
-    else {
-        root.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
+        root.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
+    }
+    else {
+        root.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
     }
     }
 
     public boolean isAssigned() {
-    return (root.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals("") || root.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR));
+    return (root.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals("") || root.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.TRUE_STR));
     }
 }

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

@@ -29 +29 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.util.Codec;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -126 +127 @@
     public Format(Object feature, String part, boolean state) {
 
-    element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.FORMAT_ELEMENT);
+    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.FORMAT_ELEMENT);
     setName(feature, part);
     setState(state);
@@ -139 +140 @@
     public Format(Object feature, String part, String value) {
 
-    element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.FORMAT_ELEMENT);       
+    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.FORMAT_ELEMENT);       
     setName(feature, part);
     setValue(value);
@@ -156 +157 @@
     }
     if(object instanceof Format && element != null) {
-        return element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE).compareTo(((Format)object).getName());
+        return element.getAttribute(StaticStrings.NAME_ATTRIBUTE).compareTo(((Format)object).getName());
     }
     return toString().compareTo(object.toString());
@@ -203 +204 @@
     public String getFeatureName() {
     if (feature_name == null) {
-        String name  = element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        String name  = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
         // Remove part
         String part = getPart();
@@ -221 +222 @@
     public String getName() {
     if(element != null) {
-        String name  = element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
-           return element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        String name  = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+           return element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
     }
     return "Error";
@@ -233 +234 @@
     if(part == null && element != null) {
         // To determine a part, we retrieve the Format name, then look for one of our recognized parts
-        String name = element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        String name = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
         // DEFAULT_PARTS[0] is an empty string to correctly enable comboboxes.
         name = name.toLowerCase();
@@ -252 +253 @@
      */
     public boolean getState() {
-    return (element != null && element.getAttribute(CollectionConfiguration.VALUE_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR));
+    return (element != null && element.getAttribute(StaticStrings.VALUE_ATTRIBUTE).equals(StaticStrings.TRUE_STR));
     }
 
@@ -269 +270 @@
 
     public boolean isAssigned() {
-    return (element != null && !element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.FALSE_STR));
+    return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
     }
 
     public boolean isParamType() {
-    return (element != null && element.getAttribute(CollectionConfiguration.VALUE_ATTRIBUTE).length() > 0);
+    return (element != null && element.getAttribute(StaticStrings.VALUE_ATTRIBUTE).length() > 0);
     }
 
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }
@@ -298 +299 @@
         classifier = (Classifier) feature;
         feature_name = classifier.getPositionString(); 
-        element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, classifier.getPositionString() + part);
+        element.setAttribute(StaticStrings.NAME_ATTRIBUTE, classifier.getPositionString() + part);
         }
         else {
@@ -307 +308 @@
             feature_name = feature.toString();
         }
-        element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, feature_name + part);
+        element.setAttribute(StaticStrings.NAME_ATTRIBUTE, feature_name + part);
         }
         text = null;
@@ -318 +319 @@
     public void setState(boolean state) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.VALUE_ATTRIBUTE, (state ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.VALUE_ATTRIBUTE, (state ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
         text = null;
     }
@@ -329 +330 @@
     if(element != null) {
         // Strip off any enclosing speech marks
-        if(value.startsWith(CollectionConfiguration.SPEECH_CHARACTER) && value.startsWith(CollectionConfiguration.SPEECH_CHARACTER)) {
+        if(value.startsWith(StaticStrings.SPEECH_CHARACTER) && value.startsWith(StaticStrings.SPEECH_CHARACTER)) {
         value = value.substring(1, value.length() - 1);
         }
@@ -346 +347 @@
     if(text == null && element != null) {
         StringBuffer temp = new StringBuffer(" ");
-        temp.append(element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE));
+        temp.append(element.getAttribute(StaticStrings.NAME_ATTRIBUTE));
         temp.append(" ");
-        String value = element.getAttribute(CollectionConfiguration.VALUE_ATTRIBUTE);
+        String value = element.getAttribute(StaticStrings.VALUE_ATTRIBUTE);
         if(value.length() > 0) {
         temp.append(value);
@@ -354 +355 @@
         else {
         value = XMLTools.getValue(element);
-        if(value.equalsIgnoreCase(CollectionConfiguration.TRUE_STR) || value.equalsIgnoreCase(CollectionConfiguration.FALSE_STR)) {
+        if(value.equalsIgnoreCase(StaticStrings.TRUE_STR) || value.equalsIgnoreCase(StaticStrings.FALSE_STR)) {
             temp.append(value);
         }
@@ -373 +374 @@
     public void update() {
     if(classifier != null) {
-        element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, classifier.getPositionString() + getPart());
+        element.setAttribute(StaticStrings.NAME_ATTRIBUTE, classifier.getPositionString() + getPart());
         feature_name = classifier.getPositionString(); 
         text = null;

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

@@ -85 +85 @@
     /** Constructor. */
     public FormatManager() {
-    super(CollectionDesignManager.collect_config.getDocumentElement(), CollectionConfiguration.FORMAT_ELEMENT, new Format());
+    super(CollectionDesignManager.collect_config.getDocumentElement(), StaticStrings.FORMAT_ELEMENT, new Format());
     this.model = this;
 

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

@@ -169 +169 @@
         // public
         JPanel box_panel = new JPanel();
-        public_checkbox = new JCheckBox(Dictionary.get("CDM.General.Access"), public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        public_checkbox = new JCheckBox(Dictionary.get("CDM.General.Access"), public_collectionmeta.getValue(CollectionMeta.TEXT).equals(StaticStrings.TRUE_STR));
         
         JPanel description_panel = new JPanel();
@@ -273 +273 @@
     public void gainFocus() {
         // Retrieve all of the elements that are dependant on default language.
-        collection_extra_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
-        collection_name_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_COLLECTIONNAME_STR);
+        collection_extra_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONEXTRA_STR);
+        collection_name_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_COLLECTIONNAME_STR);
         
         creator_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getCreator());
-        icon_collection_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTION_STR);
-        icon_collection_small_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
+        icon_collection_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTION_STR);
+        icon_collection_small_collectionmeta = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
         maintainer_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getMaintainer());
         // Make sure the components are up to date
@@ -293 +293 @@
         small_icon_textfield.setText(icon_collection_small_collectionmeta.getValue(CollectionMeta.TEXT));
         small_icon_textfield.setCaretPosition(0);
-        public_checkbox.setSelected(public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        public_checkbox.setSelected(public_collectionmeta.getValue(CollectionMeta.TEXT).equals(StaticStrings.TRUE_STR));
         ready = true;
     }
@@ -302 +302 @@
         if(ready) {
         // Boolean values
-        public_collectionmeta.setValue((public_checkbox.isSelected() ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        public_collectionmeta.setValue((public_checkbox.isSelected() ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
         String creator_email_str = creator_emailfield.getText();
         creator_collectionmeta.setValue(creator_email_str);

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

@@ -43 +43 @@
     implements Comparable, DOMProxyListEntry {
     /** An values of items in the index level enumeration. */
-    static protected final String LEVEL[] = {CollectionConfiguration.DOCUMENT_STR,  CollectionConfiguration.SECTION_STR, CollectionConfiguration.PARAGRAPH_STR};
+    static protected final String LEVEL[] = {StaticStrings.DOCUMENT_STR,  StaticStrings.SECTION_STR, StaticStrings.PARAGRAPH_STR};
 
     private ArrayList sources = null;
@@ -67 +67 @@
     // Create a new element
     Document document = CollectionDesignManager.collect_config.document;
-    this.element = document.createElement(CollectionConfiguration.INDEX_ELEMENT);
+    this.element = document.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(CollectionConfiguration.CONTENT_ELEMENT);
+        Element content_element = document.createElement(StaticStrings.CONTENT_ELEMENT);
         Object source_object = sources.get(i);
         if (source_object instanceof MetadataElement) {
         // System.err.println("Constructing new Index with MetadataElement source...");
-        content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, ((MetadataElement) source_object).getFullName());
+        content_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, ((MetadataElement) source_object).getFullName());
         }
         else {
         // System.err.println("Constructing new Index with String source...");
-        content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, source_object.toString());
+        content_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, source_object.toString());
         }
         element.appendChild(content_element);
@@ -91 +91 @@
     this(sources);
     this.level = level;
-    element.setAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE, LEVEL[level]);
+    element.setAttribute(StaticStrings.LEVEL_ATTRIBUTE, LEVEL[level]);
     }
 
@@ -101 +101 @@
         }
     }
-    element.setAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE, LEVEL[this.level]);
+    element.setAttribute(StaticStrings.LEVEL_ATTRIBUTE, LEVEL[this.level]);
     }
 
@@ -138 +138 @@
     public int getLevel() {
     if(level == -1 && element != null) {
-        String level_str = element.getAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE);
+        String level_str = element.getAttribute(StaticStrings.LEVEL_ATTRIBUTE);
         for(int i = 0; level == -1 && i < LEVEL.length; i++) {
         if(level_str.equals(LEVEL[i])) {
@@ -197 +197 @@
     if(sources == null) {
         sources = new ArrayList();
-        NodeList content_elements = element.getElementsByTagName(CollectionConfiguration.CONTENT_ELEMENT);
+        NodeList content_elements = element.getElementsByTagName(StaticStrings.CONTENT_ELEMENT);
         int content_elements_length = content_elements.getLength();
         for(int i = 0; i < content_elements_length; i++) {
         Element content_element = (Element) content_elements.item(i);
-        String metadata_element_name_full = (String) content_element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        String metadata_element_name_full = (String) content_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
         MetadataElement metadata_element = MetadataTools.getMetadataElementWithName(metadata_element_name_full);
         if (metadata_element != null) {
@@ -216 +216 @@
 
     public boolean isAssigned() {
-    return (element != null && !element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.FALSE_STR));
+    return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
     }
 
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }
@@ -237 +237 @@
     public void setLevel(int new_level) {
     // System.err.println("SetLevel(" + new_level + ")");
-    if(element != null && element.getNodeName().equals(CollectionConfiguration.INDEX_DEFAULT_ELEMENT)) {
+    if(element != null && element.getNodeName().equals(StaticStrings.INDEX_DEFAULT_ELEMENT)) {
         if (0 <= new_level && new_level < 3) {
-        element.setAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE, LEVEL[new_level]);
+        element.setAttribute(StaticStrings.LEVEL_ATTRIBUTE, LEVEL[new_level]);
         } else {
-        element.setAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE, "");
+        element.setAttribute(StaticStrings.LEVEL_ATTRIBUTE, "");
         }
         this.id = null; // Regenerate ID.
@@ -255 +255 @@
      */
     public void setSources(ArrayList sources) {
-    if(element != null && element.getNodeName().equals(CollectionConfiguration.INDEX_DEFAULT_ELEMENT)) {
+    if(element != null && element.getNodeName().equals(StaticStrings.INDEX_DEFAULT_ELEMENT)) {
         // Erase old sources
         XMLTools.clear(element);
@@ -261 +261 @@
         int size = sources.size();
         for(int i = 0; i < size; i++) {
-        Element content_element = element.getOwnerDocument().createElement(CollectionConfiguration.CONTENT_ELEMENT);
+        Element content_element = element.getOwnerDocument().createElement(StaticStrings.CONTENT_ELEMENT);
         Object source_object = sources.get(i);
         if (source_object instanceof MetadataElement) {
             String name = ((MetadataElement) source_object).getFullName();
-            content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, name);
+            content_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
             name = null;
         }
         else {
             //DebugStream.println("Found String as source: " + source_object.toString());
-            content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, source_object.toString());
+            content_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, source_object.toString());
         }
         source_object = null;

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

@@ -69 +69 @@
     public IndexManager(Element indexes, String current_build_type) {
 
-    super(indexes, CollectionConfiguration.INDEX_ELEMENT, new Index());
+    super(indexes, StaticStrings.INDEX_ELEMENT, new Index());
     DebugStream.println("IndexManager: " + getSize() + " indexes parsed.");
     index_model = this;
@@ -75 +75 @@
        
     // Parse and retrieve the default index
-    NodeList default_index_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(CollectionConfiguration.INDEX_DEFAULT_ELEMENT);
+    NodeList default_index_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(StaticStrings.INDEX_DEFAULT_ELEMENT);
     if(default_index_elements.getLength() > 0) {
                  
@@ -139 +139 @@
     // Retrieve and assign MG element and default index element
     Element mg_element = CollectionDesignManager.collect_config.getMGIndexes();
-    mg_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
-    NodeList indexes = mg_element.getElementsByTagName(CollectionConfiguration.INDEX_ELEMENT);
+    mg_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
+    NodeList indexes = mg_element.getElementsByTagName(StaticStrings.INDEX_ELEMENT);
     if(indexes.getLength() != 0) {
         //just reinstate what we had previously
@@ -146 +146 @@
     } else {
         // If mg element has no indexes, and the current mgpp index includes a text one, then generate text indexes for each of the registered levels.
-        Index index = getIndex(CollectionConfiguration.TEXT_STR);
+        Index index = getIndex(StaticStrings.TEXT_STR);
         if(index != null) {
         // Replace mgpp element with mg element
@@ -157 +157 @@
             // Try to retrieve existing metadatum
             String source_str = new_index.getID();
-            CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.STOP_CHARACTER + source_str, false);
+            CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.STOP_CHARACTER + source_str, false);
             // If no metadata was found, add new pseudo metadata using the id
             if(metadatum == null) {
-            metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + source_str);
+            metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + source_str);
             metadatum.setAssigned(true);
             metadatum.setValue(source_str);
@@ -177 +177 @@
     
     // Unassign mgpp element 
-    mgpp_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
+    mgpp_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
     mgpp_element = null;
     
@@ -186 +186 @@
     // Retrieve and assign the MGPP indexes element.
     Element mgpp_element = CollectionDesignManager.collect_config.getMGPPIndexes();
-    mgpp_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
-    NodeList indexes = mgpp_element.getElementsByTagName(CollectionConfiguration.INDEX_ELEMENT);
+    mgpp_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
+    NodeList indexes = mgpp_element.getElementsByTagName(StaticStrings.INDEX_ELEMENT);
     if(indexes.getLength() != 0) {
         // we just reinstate the indexes we had before the change
@@ -228 +228 @@
         // Try to retrieve existing metadatum
         source_str = new_index.getID();
-        CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.STOP_CHARACTER + source_str, false);
+        CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(StaticStrings.STOP_CHARACTER + source_str, false);
         // If no metadata was found, add new pseudo metadata using the id
         if(metadatum == null) {
-            metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + source_str);
+            metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + source_str);
             metadatum.setAssigned(true);
             metadatum.setValue(source_str);
@@ -250 +250 @@
 
     // Unassign MG element
-    mg_element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.FALSE_STR);
+    mg_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
     mg_element = null;
     
@@ -346 +346 @@
     if(index != null) {
         // Remove any current metadata from this index
-        CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + index.getID());
+        CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + index.getID());
         // Remove the index
         remove(index);
@@ -378 +378 @@
     }
     // Remove the old index coll meta
-    CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + old_index.getID());
+    CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + old_index.getID());
     // Add the new coll meta
     CollectionDesignManager.collectionmeta_manager.addMetadatum(coll_meta);
@@ -403 +403 @@
         if(default_index == null) {
         // Create the default index element, and place immediately after indexes element.
-        Element default_index_element = root.getOwnerDocument().createElement(CollectionConfiguration.INDEX_DEFAULT_ELEMENT);               
+        Element default_index_element = root.getOwnerDocument().createElement(StaticStrings.INDEX_DEFAULT_ELEMENT);               
         default_index = new Index(default_index_element);
         Node target_node = CollectionConfiguration.findInsertionPoint(default_index_element);
@@ -777 +777 @@
             // Note the order of these must be the same as the
             // level order in Index
-            level_combobox.addItem(CollectionConfiguration.DOCUMENT_STR);//Dictionary.get("CDM.IndexManager.Document"));
-            level_combobox.addItem(CollectionConfiguration.SECTION_STR);//Dictionary.get("CDM.IndexManager.Section"));
-            level_combobox.addItem(CollectionConfiguration.PARAGRAPH_STR);//Dictionary.get("CDM.IndexManager.Paragraph"));
+            level_combobox.addItem(StaticStrings.DOCUMENT_STR);//Dictionary.get("CDM.IndexManager.Document"));
+            level_combobox.addItem(StaticStrings.SECTION_STR);//Dictionary.get("CDM.IndexManager.Section"));
+            level_combobox.addItem(StaticStrings.PARAGRAPH_STR);//Dictionary.get("CDM.IndexManager.Paragraph"));
             level_combobox.setEditable(false);
             level_combobox.setToolTipText(Dictionary.get("CDM.IndexManager.Level_Tooltip"));
@@ -803 +803 @@
             source_list.setTickedObjects(sources.toArray());
             source_list.setEnabled(true);
-            if (sources.contains(CollectionConfiguration.TEXT_STR)) {
+            if (sources.contains(StaticStrings.TEXT_STR)) {
                 text_checkbox.setSelected(true);
             }
@@ -850 +850 @@
             sources = source_list.getTicked();
             if (text_checkbox.isSelected()) {
-            sources.add(0, CollectionConfiguration.TEXT_STR);
+            sources.add(0, StaticStrings.TEXT_STR);
             }           
             if (mgpp_enabled) {
@@ -887 +887 @@
             ArrayList sources = source_list.getTicked();
             if (text_checkbox.isSelected()) {
-                sources.add(0, CollectionConfiguration.TEXT_STR);
+                sources.add(0, StaticStrings.TEXT_STR);
             }
             if(mgpp_enabled) {
@@ -899 +899 @@
          
             // Before we add the index to the model, we have to add a default collection metadata for this
-            CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + index.getID());
+            CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
             metadatum.setValue(index.getID());
         
@@ -915 +915 @@
         public void actionPerformed(ActionEvent event) {
             ArrayList all_sources = source_list.getAll();
-            all_sources.add(0, CollectionConfiguration.TEXT_STR);
+            all_sources.add(0, StaticStrings.TEXT_STR);
             ArrayList new_sources = new ArrayList();
             for(int i = 0; i < all_sources.size(); i++) {
@@ -931 +931 @@
                 }
                 // Create new metadatum
-                CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + index.getID());
+                CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
                 metadatum.setValue(name);
                 name = null;
@@ -982 +982 @@
             sources = source_list.getTicked();
             if (text_checkbox.isSelected()) {
-                sources.add(0, CollectionConfiguration.TEXT_STR);
+                sources.add(0, StaticStrings.TEXT_STR);
             }
             if (mgpp_enabled) {
@@ -992 +992 @@
             if (index != null) {
             // Create the new collection meta
-            CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + index.getID());
+            CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
             metadatum.setValue(index.getID());
             

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

@@ -28 +28 @@
 
 import java.util.ArrayList;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.w3c.dom.*;
+
 
 /** A pretty unexciting extension of a two character string, in that it has a field which details if its the default language.
@@ -54 +56 @@
     this.code = code;
     // Create the new element
-    element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.LANGUAGE_ELEMENT);
-    element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, code);
-    element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
+    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.LANGUAGE_ELEMENT);
+    element.setAttribute(StaticStrings.NAME_ATTRIBUTE, code);
+    element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
     }
 
@@ -72 +74 @@
     }
     this.code = code_str.toString();
-    element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.LANGUAGE_ELEMENT);
-    element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, code);
-    element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
+    element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.LANGUAGE_ELEMENT);
+    element.setAttribute(StaticStrings.NAME_ATTRIBUTE, code);
+    element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
     
     }
@@ -109 +111 @@
     public String getCode() {
     if(code == null && element != null) {
-        code = element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        code = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
     }
     return code;
@@ -138 +140 @@
 
     public boolean isAssigned() {
-    return (element != null && element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR));
+    return (element != null && element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.TRUE_STR));
     }
 
     public void setAssigned(boolean value) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (value ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (value ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }
@@ -151 +153 @@
     // Set element
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, new_code);
+        element.setAttribute(StaticStrings.NAME_ATTRIBUTE, new_code);
     }
     // Reset name

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

@@ -45 +45 @@
 import org.greenstone.gatherer.util.CheckListEntry;
 import org.greenstone.gatherer.util.JarTools;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -72 +73 @@
    /** Constructor. */
     public LanguageManager(Element languages_element) {
-    super(languages_element, CollectionConfiguration.LANGUAGE_ELEMENT, new Language());
+    super(languages_element, StaticStrings.LANGUAGE_ELEMENT, new Language());
     
     DebugStream.println("LanguageManager: " + getSize() + " languages parsed.");
@@ -78 +79 @@
     this.model = this;
     // Retrieve the default language
-    NodeList default_language_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(CollectionConfiguration.LANGUAGE_DEFAULT_ELEMENT);
+    NodeList default_language_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(StaticStrings.LANGUAGE_DEFAULT_ELEMENT);
     if(default_language_elements.getLength() > 0) {
         default_language = new Language((Element)default_language_elements.item(0));
@@ -87 +88 @@
     // Load a series of code->language mappings into known_languages, by reading from the 'languages.xml' file, which is essentially a subset of the ISO 639 Standard.
     known_languages = new LinkedHashMap();
-    NodeList language_elements = LANGUAGES_DOCUMENT.getDocumentElement().getElementsByTagName(CollectionConfiguration.LANGUAGE_ELEMENT);
+    NodeList language_elements = LANGUAGES_DOCUMENT.getDocumentElement().getElementsByTagName(StaticStrings.LANGUAGE_ELEMENT);
     for(int i = 0; i < language_elements.getLength(); i++) {
         Element language_element = (Element) language_elements.item(i);
-        String code = language_element.getAttribute(CollectionConfiguration.CODE_ATTRIBUTE);
-        String name = language_element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        String code = language_element.getAttribute(StaticStrings.CODE_ATTRIBUTE);
+        String name = language_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
         known_languages.put(code.toLowerCase(), name);
         name = null;
@@ -107 +108 @@
     if(!contains(language)) {
         // need to add a pseudo metadata
-        CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + language.getCode());
+        CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + language.getCode());
         metadatum.setValue(language.getName());
         CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
@@ -216 +217 @@
     remove(language);
     // Remove any collection metadata for this language
-    CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + language.getCode());
+    CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + language.getCode());
     if(default_language != null && default_language.equals(language)) {
         setDefault(null);
@@ -225 +226 @@
     private void replaceLanguage(Language old_language, Language new_language) {
     // Remove old lang collection meta
-    CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + old_language.getCode());
+    CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + old_language.getCode());
     // Add new one
-    CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + new_language.getCode());
+    CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + new_language.getCode());
     metadatum.setValue(new_language.getName());
     CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
@@ -252 +253 @@
         if(default_language == null) {
         // Create the default index element, and place immediately after indexes element.
-        Element default_language_element = root.getOwnerDocument().createElement(CollectionConfiguration.LANGUAGE_DEFAULT_ELEMENT);
+        Element default_language_element = root.getOwnerDocument().createElement(StaticStrings.LANGUAGE_DEFAULT_ELEMENT);
         default_language = new Language(default_language_element);
         Node target_node = CollectionConfiguration.findInsertionPoint(default_language_element);

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

@@ -27 +27 @@
 package org.greenstone.gatherer.cdm;
 
-/**************************************************************************************
- * Written:      16/07/03
- * Revised:      
- **************************************************************************************/
+import org.greenstone.gatherer.util.StaticStrings;
 import org.w3c.dom.*;
+
 
 /** This class represents a level (for mgpp and lucene collecitons) .
@@ -56 +54 @@
      */
     public Level(String level) {
-    this.element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.LEVEL_ELEMENT);
-    this.element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, level);
+    this.element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.LEVEL_ELEMENT);
+    this.element.setAttribute(StaticStrings.NAME_ATTRIBUTE, level);
     }
 
@@ -100 +98 @@
      */
     public String getLevel() {
-    return element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+    return element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
     }
     
    /** Determine is this command has been assigned, either because it already existed in the collection configuration, or because it has been explicitly set by the user. Non-assigned entries imply they have been added by the GLI to ensure consistancy (and avoid NPE's!)
      * @return true if this command has been assigned, false otherwise
-     * @see org.greenstone.gatherer.cdm.CollectionConfiguration
      */
     public boolean isAssigned() {
-    return (element != null && !element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.FALSE_STR));
+    return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
     }
     
     /** Set the assigned state.
      * @param  assigned the desired state of assigned as a boolean
-     * @see org.greenstone.gatherer.cdm.CollectionConfiguration
      */
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }
@@ -130 +126 @@
     /** Set the name of this level.
      * @param  name the new name for this level, as a String
-     * @see org.greenstone.gatherer.cdm.CollectionConfiguration
      */
     public void setLevel(String level) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, level);
+        element.setAttribute(StaticStrings.NAME_ATTRIBUTE, level);
     }
     }
@@ -140 +135 @@
     /** Produce a text representation of this level.
      * @return a String showing this level
-     * @see org.greenstone.gatherer.cdm.CollectionConfiguration
      */
     public String toString() {

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

@@ -11 +11 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.JarTools;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.w3c.dom.*;
+
+
 public class LevelManager 
     extends DOMProxyListModel 
@@ -24 +27 @@
     
     public LevelManager(Element levels, String current_build_type) {
-    super(levels, CollectionConfiguration.LEVEL_ELEMENT, new Level());
+    super(levels, StaticStrings.LEVEL_ELEMENT, new Level());
     DebugStream.println("LevelManager: " + getSize() + " levels parsed.");
     
@@ -33 +36 @@
     }
     // Parse and retrieve the default level
-    NodeList default_level_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(CollectionConfiguration.LEVEL_DEFAULT_ELEMENT);
+    NodeList default_level_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(StaticStrings.LEVEL_DEFAULT_ELEMENT);
     if(default_level_elements.getLength() > 0) {
         default_level = new Level((Element)default_level_elements.item(0));
@@ -46 +49 @@
         int position = 0;
         
-        if (level.equals(CollectionConfiguration.SECTION_STR) && getSize()==1) {
+        if (level.equals(StaticStrings.SECTION_STR) && getSize()==1) {
         position = 1;
         }
         add(position, new Level(level));
         // add in a default collection meta
-        CollectionMeta meta = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + level);
+        CollectionMeta meta = new CollectionMeta(StaticStrings.STOP_CHARACTER + level);
         meta.setAssigned(true);
         meta.setValue(level);
@@ -102 +105 @@
     private void removeLevel(String level_name) {
     // Remove any current metadata from this level
-    CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + level_name);
+    CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + level_name);
     // Remove the level
     Level level_elem = null;
@@ -120 +123 @@
         if(default_level == null) {
         // Create the default level element, and place immediately after leveles element.
-        Element default_level_element = root.getOwnerDocument().createElement(CollectionConfiguration.LEVEL_DEFAULT_ELEMENT);
+        Element default_level_element = root.getOwnerDocument().createElement(StaticStrings.LEVEL_DEFAULT_ELEMENT);
         default_level = new Level(default_level_element);
         Node target_node = CollectionConfiguration.findInsertionPoint(default_level_element);
@@ -162 +165 @@
         document_default_radio.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         document_default_radio.setOpaque(false);
-        document_default_radio.setActionCommand(CollectionConfiguration.DOCUMENT_STR);
+        document_default_radio.setActionCommand(StaticStrings.DOCUMENT_STR);
         document_default_radio.setIcon(JarTools.getImage("radio_unselected.gif"));
         document_default_radio.setSelectedIcon(JarTools.getImage("radio_selected.gif"));
@@ -175 +178 @@
         section_default_radio.setSelectedIcon(JarTools.getImage("radio_selected.gif"));
 
-        section_default_radio.setActionCommand(CollectionConfiguration.SECTION_STR);
+        section_default_radio.setActionCommand(StaticStrings.SECTION_STR);
         ButtonGroup default_group = new ButtonGroup();
         default_group.add(document_default_radio);
@@ -185 +188 @@
         // no levels yet, set document
         document_checkbox.setSelected(true);
-        addLevel(CollectionConfiguration.DOCUMENT_STR);
+        addLevel(StaticStrings.DOCUMENT_STR);
         } else {
-        if (getLevel(CollectionConfiguration.DOCUMENT_STR)!= null) {
+        if (getLevel(StaticStrings.DOCUMENT_STR)!= null) {
             document_checkbox.setSelected(true);
         }
-        if (getLevel(CollectionConfiguration.SECTION_STR) != null) {
+        if (getLevel(StaticStrings.SECTION_STR) != null) {
             section_checkbox.setSelected(true);
         }
@@ -197 +200 @@
         if (default_level != null && default_level.isAssigned()) {
         // set the default based on specified default
-        if (default_level.getLevel().equals(CollectionConfiguration.DOCUMENT_STR) && document_checkbox.isSelected()) {
+        if (default_level.getLevel().equals(StaticStrings.DOCUMENT_STR) && document_checkbox.isSelected()) {
             document_default_radio.setSelected(true);
-        } else if (default_level.getLevel().equals(CollectionConfiguration.SECTION_STR) && section_checkbox.isSelected()) {
+        } else if (default_level.getLevel().equals(StaticStrings.SECTION_STR) && section_checkbox.isSelected()) {
             section_default_radio.setSelected(true);
         } else {
@@ -208 +211 @@
         // if have no valid specified default
         if (default_level == null || !default_level.isAssigned()) {
-        String default_l = CollectionConfiguration.DOCUMENT_STR;
+        String default_l = StaticStrings.DOCUMENT_STR;
         if (document_checkbox.isSelected()) {
             document_default_radio.setSelected(true);
-            default_l = CollectionConfiguration.DOCUMENT_STR;
+            default_l = StaticStrings.DOCUMENT_STR;
         } else if (section_checkbox.isSelected()) {
             section_default_radio.setSelected(true);
-            default_l = CollectionConfiguration.SECTION_STR;
+            default_l = StaticStrings.SECTION_STR;
         }
         setDefault(default_l);
@@ -311 +314 @@
         if (!document_enabled && document_default_radio.isSelected()) {
         section_default_radio.setSelected(true);
-        setDefault(CollectionConfiguration.SECTION_STR);
+        setDefault(StaticStrings.SECTION_STR);
                
         } else if (!section_enabled && section_default_radio.isSelected()) {
         document_default_radio.setSelected(true);
-        setDefault(CollectionConfiguration.DOCUMENT_STR);
+        setDefault(StaticStrings.DOCUMENT_STR);
         }
 

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

@@ -75 +75 @@
      */
     public PluginManager() {
-    super(CollectionDesignManager.collect_config.getDocumentElement(), CollectionConfiguration.PLUGIN_ELEMENT, new Plugin());
+    super(CollectionDesignManager.collect_config.getDocumentElement(), StaticStrings.PLUGIN_ELEMENT, new Plugin());
     DebugStream.println("PluginManager: " + super.getSize() + " plugins parsed.");
     model = this;
@@ -275 +275 @@
         }
         else if (node_name.equals("Abstract")) {
-        plugin.setIsAbstract(XMLTools.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR));
+        plugin.setIsAbstract(XMLTools.getValue(node).equalsIgnoreCase(StaticStrings.YES_STR));
         }
         else if (node_name.equalsIgnoreCase("Explodes")) {
@@ -524 +524 @@
         }
     }
-    Element element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.PLUGIN_ELEMENT);
-    element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, CollectionConfiguration.SEPARATOR_ATTRIBUTE);
-    element.setAttribute(CollectionConfiguration.SEPARATOR_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
+    Element element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.PLUGIN_ELEMENT);
+    element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, StaticStrings.SEPARATOR_ATTRIBUTE);
+    element.setAttribute(StaticStrings.SEPARATOR_ATTRIBUTE, StaticStrings.TRUE_STR);
     separator_plugin = new Plugin(element, null);
     ///atherer.println("Adding plugin separator at: " + separator_index);
@@ -770 +770 @@
 
         // Create a new element in the DOM
-        Element new_plugin_element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.PLUGIN_ELEMENT);
-        new_plugin_element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, plugin.getName());
+        Element new_plugin_element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.PLUGIN_ELEMENT);
+        new_plugin_element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, plugin.getName());
         Plugin new_plugin = new Plugin(new_plugin_element, plugin);
 
@@ -1137 +1137 @@
 
         // Create a new element in the DOM
-        Element new_plugin_element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.PLUGIN_ELEMENT);
-        new_plugin_element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, plugin.getName());
+        Element new_plugin_element = CollectionDesignManager.collect_config.document.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/SearchMetadataManager.java

@@ -34 +34 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.gui.DesignPaneHeader;
+import org.greenstone.gatherer.util.StaticStrings;
+
 
 public class SearchMetadataManager
@@ -180 +182 @@
     
     public String getMetaID() {
-        return CollectionConfiguration.STOP_CHARACTER+id;
+        return StaticStrings.STOP_CHARACTER+id;
     }
     public String getValue() {

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

@@ -170 +170 @@
 
     public boolean isAssigned() {
-    return (element != null && !element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.FALSE_STR));
+    return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
     }
 
@@ -186 +186 @@
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }

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

@@ -28 +28 @@
 
 import java.util.*;
-import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.XMLTools;
@@ -59 +58 @@
     // Create a new element
     Document document = CollectionDesignManager.collect_config.document;
-    element = document.createElement(CollectionConfiguration.INDEX_ELEMENT);
+    element = document.createElement(StaticStrings.INDEX_ELEMENT);
     // For each source add a content element
     int size = raw_sources.length;
@@ -66 +65 @@
         String subcollection_name = subcollection.getName();
         sources.add(subcollection_name);
-        Element content_element = document.createElement(CollectionConfiguration.CONTENT_ELEMENT);
-        content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, subcollection_name);
+        Element content_element = document.createElement(StaticStrings.CONTENT_ELEMENT);
+        content_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, subcollection_name);
         element.appendChild(content_element);
         content_element = null;
@@ -121 +120 @@
     if(sources == null) {
         sources = new ArrayList();
-        NodeList content_elements = element.getElementsByTagName(CollectionConfiguration.CONTENT_ELEMENT);
+        NodeList content_elements = element.getElementsByTagName(StaticStrings.CONTENT_ELEMENT);
         int content_elements_length = content_elements.getLength();
         for(int i = 0; i < content_elements_length; i++) {
         Element content_element = (Element) content_elements.item(i);
-        sources.add(content_element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE));
+        sources.add(content_element.getAttribute(StaticStrings.NAME_ATTRIBUTE));
         }
         content_elements = null;
@@ -134 +133 @@
 
     public boolean isAssigned() {
-    return (element != null && !element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.FALSE_STR));
+    return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
     }
 
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }
@@ -159 +158 @@
         int size = sources.size();
         for(int i = 0; i < size; i++) {
-        Element content_element = element.getOwnerDocument().createElement(CollectionConfiguration.CONTENT_ELEMENT);
-        content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, (String) sources.get(i));
+        Element content_element = element.getOwnerDocument().createElement(StaticStrings.CONTENT_ELEMENT);
+        content_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, (String) sources.get(i));
         element.appendChild(content_element);
         content_element = null;

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

@@ -38 +38 @@
 import org.greenstone.gatherer.util.CheckList;
 import org.greenstone.gatherer.util.JarTools;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.w3c.dom.*;
 
@@ -58 +59 @@
     public SubcollectionIndexManager(Element subindexes)
     {
-    super(subindexes, CollectionConfiguration.INDEX_ELEMENT, new SubcollectionIndex());
+    super(subindexes, StaticStrings.INDEX_ELEMENT, new SubcollectionIndex());
     DebugStream.println("SubcollectionIndexManager: " + getSize() + " subcollection indexes parsed.");
     this.model = this;
 
     // Parse and retrieve the default index
-    NodeList default_index_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(CollectionConfiguration.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT);
+    NodeList default_index_elements = CollectionDesignManager.collect_config.getDocumentElement().getElementsByTagName(StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT);
     if (default_index_elements.getLength() > 0) {
         default_index = new SubcollectionIndex((Element) default_index_elements.item(0));
@@ -79 +80 @@
     if (!contains(subcollection_index)) {
         // add a pseudo metadata
-        CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + subcollection_index.getID());
+        CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + subcollection_index.getID());
         metadatum.setValue(subcollection_index.getID());
         CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
@@ -164 +165 @@
     if (subcollection_index != null) {
         // Remove any current metadata from this index
-        CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + subcollection_index.getID());
+        CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + subcollection_index.getID());
 
         // Check if the index removed happens to be the default index
@@ -197 +198 @@
     private void replaceSubcollectionIndex(SubcollectionIndex old_subcollection, SubcollectionIndex new_subcollection) {
     // Remove old collection meta
-    CollectionDesignManager.collectionmeta_manager.removeMetadata(CollectionConfiguration.STOP_CHARACTER + old_subcollection.getID());
+    CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + old_subcollection.getID());
     // Add new one
-    CollectionMeta metadatum = new CollectionMeta(CollectionConfiguration.STOP_CHARACTER + new_subcollection.getID());
+    CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + new_subcollection.getID());
     metadatum.setValue(new_subcollection.getID());
     CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
@@ -227 +228 @@
         if (default_index == null) {
         // Create the default index element, and place immediately after indexes element.
-        Element default_index_element = root.getOwnerDocument().createElement(CollectionConfiguration.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT);
+        Element default_index_element = root.getOwnerDocument().createElement(StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT);
         default_index = new SubcollectionIndex(default_index_element);
         Node target_node = CollectionConfiguration.findInsertionPoint(default_index_element);

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

@@ -27 +27 @@
 package org.greenstone.gatherer.cdm;
 
-/**************************************************************************************
- * Written:     02/07/03
- * Revised:     
- **************************************************************************************/
+import org.greenstone.gatherer.util.StaticStrings;
 import org.w3c.dom.Element;
+
 
 public class SuperCollection
@@ -67 +65 @@
     public String getName() {
     if(name == null && element != null) {
-        name = element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        name = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
     }
     return name;
@@ -73 +71 @@
 
     public boolean isAssigned() {
-    return (element != null && element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.TRUE_STR));
+    return (element != null && element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.TRUE_STR));
     }
 
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }
@@ -90 +88 @@
     this.name = name;
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, name);
+        element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
     }
     }

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

@@ -39 +39 @@
 import org.greenstone.gatherer.gui.DesignPaneHeader;
 import org.greenstone.gatherer.gui.GLIButton;
+import org.greenstone.gatherer.util.StaticStrings;
+
 
 /** This class provides a graphical interface to allow a user to quickly and conviently (ie all in one place) translate the text fragments associated with general metadata and indexes into each of the assigned languages in the collection. It should provide clear controls for the editing of these text fragments, plus clear indicate what languages still need further translation, which it will do through a combination of coloring and other visual indicators.
@@ -147 +149 @@
     public String getName() {
         if(content instanceof Index) {
-        return CollectionConfiguration.STOP_CHARACTER + ((Index)content).getID();
+        return StaticStrings.STOP_CHARACTER + ((Index)content).getID();
         }
         else if (content instanceof SubcollectionIndex) {
-            return CollectionConfiguration.STOP_CHARACTER + ((SubcollectionIndex)content).getID();
+            return StaticStrings.STOP_CHARACTER + ((SubcollectionIndex)content).getID();
         }
         else {
@@ -160 +162 @@
         if(text == null) {
         String temp = content.toString();
-        if(temp.indexOf(CollectionConfiguration.SPACE_CHARACTER) != -1) {
-            temp = temp.substring(0, temp.indexOf(CollectionConfiguration.SPACE_CHARACTER));
+        if(temp.indexOf(StaticStrings.SPACE_CHARACTER) != -1) {
+            temp = temp.substring(0, temp.indexOf(StaticStrings.SPACE_CHARACTER));
         }
         if(content instanceof Index) {

trunk/gli/src/org/greenstone/gatherer/download/Download.java

@@ -202 +202 @@
 
     public boolean isAssigned() {   
-    return (element != null && !element.getAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE).equals(CollectionConfiguration.FALSE_STR));
+    return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
     }
 
     public void setAssigned(boolean assigned) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (assigned ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
     }
     }