Changeset 20455

Timestamp:

2009-08-31T15:47:50+12:00 (15 years ago)

Author:

kjdon

Message:

removed metadatum type arg - I don't think it is ever used. and what was it anyway??

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• cdm/Argument.java (modified) (5 diffs)
• cdm/ArgumentControl.java (modified) (2 diffs)
• util/StaticStrings.java (modified) (1 diff)

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

@@ -62 +62 @@
   /** An element of the argument type enumeration specifying a language combobox control. */
   static final public byte LANGUAGE = 4;
-  /** An element of the argument type enumeration specifying a list control. */
+  /** An element of the argument type enumeration specifying a metadata combobox control. */
   static final public byte METADATA = 5;
-  /** An element of the argument type enumeration specifying a metadata combobox control. */
-  static final public byte METADATUM = 6;
   /** An element of the argument type enumeration specifying a text field. */
-  static final public byte STRING = 7;
+  static final public byte STRING = 6;
   /** An element of the argument type enumeration specifying a regular expression text field. */
-  static final public byte REGEXP = 8;
+  static final public byte REGEXP = 7;
   /** An element of the argument type enumeration specifying a metadata set combobox control. */
-  static final public byte METADATA_SET_NAMESPACE = 9;
+  static final public byte METADATA_SET_NAMESPACE = 8;
   /** An element of the argument type enumeration specifying a text field. */
-  static final public byte URL = 10;
+  static final public byte URL = 9;
   /** An editable combo box */
-  static final public byte ENUM_STRING = 11;
+  static final public byte ENUM_STRING = 10;
 
   /////////////////////////////////////////////////////////////////
@@ -418 +416 @@
    * @see org.greenstone.gatherer.util.StaticStrings#LANGUAGE_STR
    * @see org.greenstone.gatherer.util.StaticStrings#METADATA_TYPE_STR
-   * @see org.greenstone.gatherer.util.StaticStrings#METADATUM_TYPE_STR
    * @see org.greenstone.gatherer.util.StaticStrings#REGEXP_STR
    */
@@ -444 +441 @@
     else if(new_type.equalsIgnoreCase(StaticStrings.METADATA_TYPE_STR)) {
       this.type = METADATA;
-    }
-    else if(new_type.equalsIgnoreCase(StaticStrings.METADATUM_TYPE_STR)) {
-      this.type = METADATUM;
     }
     else if(new_type.equalsIgnoreCase(StaticStrings.REGEXP_STR)) {
@@ -515 +509 @@
     text.append(name);
 
-    String value = getValue(); //XMLTools.getValue(element);
+    // getValue returns display name for metadata args
+    String value = getValue(); 
     if (value.length() == 0) {
       return text.toString();
@@ -522 +517 @@
     text.append(StaticStrings.SPACE_CHARACTER);
 
-    //      // Handle metadata elements specially
-    //      if (type == METADATA || type == METADATUM) {
-    //      // Tokenize the string
-    //      StringTokenizer tokenizer = new StringTokenizer(value, ",");
-    //      while (tokenizer.hasMoreTokens()) {
-    //      String token = tokenizer.nextToken();
-
-    //      MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName(token);
-    //      if (metadata_element != null) {
-    //      text.append(metadata_element.getFullName());
-    //      }
-    //      else {
-    //      text.append(token);
-    //      }
-
-    //      if (tokenizer.hasMoreTokens()) {
-    //      text.append(StaticStrings.COMMA_CHARACTER);
-    //      }
-    //      }
-    //      return text.toString();
-    //      }
-
     // If the value contains a space, add speech marks
     //   (Except for metadata elements, which won't have spaces when written out to collect.cfg)
-    if (value.indexOf(StaticStrings.SPACE_CHARACTER) != -1 && !(type == METADATUM || type == METADATA)) {
+    if (value.indexOf(StaticStrings.SPACE_CHARACTER) != -1 && type != METADATA) {
       value = StaticStrings.SPEECH_CHARACTER + value + StaticStrings.SPEECH_CHARACTER;
     }

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

@@ -155 +155 @@
       break;
 
-    case Argument.METADATUM:
     case Argument.METADATA:
       value_control = new GComboBox(MetadataSetManager.getEveryMetadataSetElement(), false);
@@ -410 +409 @@
     argument.setAssigned(true);
     return true;
-      case Argument.METADATUM:
       case Argument.METADATA:
       String meta_value = (((JComboBox)value_control).getSelectedItem()).toString();

gli/trunk/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -192 +192 @@
     static final public String METADATA_XML = "metadata.xml";
     static final public String METADATAXMLPLUG_STR = "MetadataXMLPlugin";
-    static final public String METADATUM_TYPE_STR = "metadatum";
     static final public String MGPP_ATTRIBUTE = "mgpp_enabled";
     static final public String MINUS_CHARACTER = "-";