Changeset 8015 for trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java

Timestamp:

2004-08-20T13:59:02+12:00 (20 years ago)

Author:

mdewsnip

Message:

Moved clear() and setValue() functions from MSMUtils into XMLTools. Moved NS_SEP string from MSMUtils into StaticStrings.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java (modified) (9 diffs)

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

@@ -8 +8 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.Argument;
-import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
 import org.xml.sax.InputSource;
@@ -102 +102 @@
         Element argument = (Element) argument_list.item(i);
         ArrayTools.add(arguments, argument.getAttribute(NAME));
-        String value = MSMUtils.getValue(argument);
+        String value = XMLTools.getValue(argument);
         if(value != null && value.length() > 0) {
         ArrayTools.add(arguments, value);
@@ -229 +229 @@
             String node_name = node.getNodeName();
             if(node_name.equals("Name")) {
-            argument.setName(MSMUtils.getValue(node));
+            argument.setName(XMLTools.getValue(node));
             }
             else if(node_name.equals("Desc")) {
-            argument.setDescription(MSMUtils.getValue(node));
+            argument.setDescription(XMLTools.getValue(node));
             }
             else if(node_name.equals("Type")) {
-            argument.setType(MSMUtils.getValue(node));
+            argument.setType(XMLTools.getValue(node));
             }
             else if(node_name.equals("Default")) {
-            argument.setDefaultValue(MSMUtils.getValue(node));
+            argument.setDefaultValue(XMLTools.getValue(node));
             }
             else if(node_name.equals("List")) {
@@ -249 +249 @@
                     node_name = subvalue.getNodeName();
                     if(node_name.equals("Name")) {
-                    key = MSMUtils.getValue(subvalue);
+                    key = XMLTools.getValue(subvalue);
                     }
                     else if(node_name.equals("Desc")) {
-                    desc = MSMUtils.getValue(subvalue);
+                    desc = XMLTools.getValue(subvalue);
                     }
                 }
@@ -262 +262 @@
             }
             else if(node_name.equals("Required")) {
-            String v = MSMUtils.getValue(node);
+            String v = XMLTools.getValue(node);
             if(v != null && v.equals("yes")) {
                 argument.setRequired(true);
@@ -268 +268 @@
             }
             else if(node_name.equals(StaticStrings.RANGE_ELEMENT)) {
-            String range_raw = MSMUtils.getValue(node);
+            String range_raw = XMLTools.getValue(node);
             int comma_index = -1;
             if((comma_index = range_raw.indexOf(StaticStrings.COMMA_CHARACTER)) != -1) {
@@ -298 +298 @@
             }
             else if(node_name.equals(StaticStrings.MODEGLI_ELEMENT)) {
-            String mode_level_str = MSMUtils.getValue(node);
+            String mode_level_str = XMLTools.getValue(node);
             try {
                 int mode_level = Integer.parseInt(mode_level_str);
@@ -331 +331 @@
             }
             else {
-            String argument_value = MSMUtils.getValue(argument_element);
+            String argument_value = XMLTools.getValue(argument_element);
             if(argument_value != null) {
                 result = argument_value;
@@ -359 +359 @@
             values.add("-" + argument_element.getAttribute(NAME));
             // Now retrieve the value.
-            String argument_value = Codec.transform(MSMUtils.getValue(argument_element), Codec.DOM_TO_TEXT);
+            String argument_value = Codec.transform(XMLTools.getValue(argument_element), Codec.DOM_TO_TEXT);
             // If there is a value, tokenize it by commas only.
             if(argument_value != null && argument_value.length() > 0) {