Changeset 8015 for trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.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/cdm/ClassifierManager.java (modified) (9 diffs)

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

@@ -27 +27 @@
 package org.greenstone.gatherer.cdm;
 
-/**************************************************************************************
- * Written:      01/05/02
- * Revised:      16/08/02 Optimized and Commented.
- *               11/07/03 DOM support
- **************************************************************************************/
 import java.awt.*;
 import java.awt.event.*;
@@ -53 +48 @@
 import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.GLIButton;
-import org.greenstone.gatherer.msm.MSMUtils;
 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.*;
@@ -462 +457 @@
         String node_name = node.getNodeName();
         if (node_name.equalsIgnoreCase("ClassifyName")) {
-        String name = MSMUtils.getValue(node);
+        String name = XMLTools.getValue(node);
         class_list[i] = name;
         i++;        
@@ -499 +494 @@
         node_name = node.getNodeName();
         if(node_name.equals("Name")) {
-        String name = MSMUtils.getValue(node);
+        String name = XMLTools.getValue(node);
         // We can save ourselves some processing time if a classifier with this name already exists in our manager. If so retrieve it and return it.
         Classifier existing = getBaseClassifier(name);
@@ -508 +503 @@
         }
         else if(node_name.equals("Desc")) {
-        classifier.setDescription(MSMUtils.getValue(node));
+        classifier.setDescription(XMLTools.getValue(node));
         }
         else if(node_name.equals(CollectionConfiguration.ABSTRACT_ELEMENT)) {
-        classifier.setIsAbstract(MSMUtils.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR));
+        classifier.setIsAbstract(XMLTools.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR));
         }
         // Parse the multitude of arguments.
@@ -524 +519 @@
                 node_name = det.getNodeName();
                 if(node_name.equals("Name")) {
-                argument.setName(MSMUtils.getValue(det));
+                argument.setName(XMLTools.getValue(det));
                 }
                 else if(node_name.equals("Desc")) {
-                argument.setDescription(MSMUtils.getValue(det));
+                argument.setDescription(XMLTools.getValue(det));
                 }
                 else if(node_name.equals("Type")) {
-                argument.setType(MSMUtils.getValue(det));
+                argument.setType(XMLTools.getValue(det));
                 }
                 else if(node_name.equals("Default")) {
-                argument.setDefaultValue(MSMUtils.getValue(det));
+                argument.setDefaultValue(XMLTools.getValue(det));
                 }
                 else if(node_name.equals("List")) {
@@ -544 +539 @@
                         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);
                         }
                     }
@@ -557 +552 @@
                 }
                 else if(node_name.equals("Required")) {
-                String v = MSMUtils.getValue(det);
+                String v = XMLTools.getValue(det);
                 ///ystem.err.println("Required = " + v);
                 if(v.equalsIgnoreCase("yes")) {
@@ -565 +560 @@
                 }
                 else if(node_name.equals(StaticStrings.RANGE_ELEMENT)) {
-                String range_raw = MSMUtils.getValue(det);
+                String range_raw = XMLTools.getValue(det);
                 int index = -1;
                 if((index = range_raw.indexOf(StaticStrings.COMMA_CHARACTER)) != -1) {