Changeset 8156

Timestamp:

2004-09-27T10:29:45+12:00 (20 years ago)

Author:

mdewsnip

Message:

Tidied up the toString() function.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/Classifier.java (modified) (1 diff)

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

@@ -387 +387 @@
     }
 
+
     /** Method to print out this classifier as it would appear to the user in the interface
      * @return A <strong>String</strong> containing a single classifier command.
      */
-    public String toString() {
-    if(element != null) {
-        if(name == null) {
-        name = element.getAttribute(StaticStrings.TYPE_ATTRIBUTE);
-        }
-        StringBuffer text = new StringBuffer(StaticStrings.CLASSIFY_STR);
-        text.append(" ");
-        text.append(name);
-        text.append(" ");
-        ArrayList arguments = getArguments(true, true);
-        int arguments_size = arguments.size();
-        for(int i = 0; i < arguments_size; i++) {
-        Argument argument = (Argument)arguments.get(i);
-        if(argument.isAssigned()) {
-            text.append(argument.toString());
-            text.append(" ");
-        }
-        }
-        return text.substring(0, text.length() - 1);
-    }
-    else {
+    public String toString()
+    {
+    if (element == null) {
         return name;
     }
+
+    if (name == null) {
+        name = element.getAttribute(StaticStrings.TYPE_ATTRIBUTE);
+    }
+
+    StringBuffer text = new StringBuffer(StaticStrings.CLASSIFY_STR);
+    text.append(" ");
+    text.append(name);
+
+    ArrayList arguments = getArguments(true, true);
+    for (int i = 0; i < arguments.size(); i++) {
+        Argument argument = (Argument) arguments.get(i);
+        if (argument.isAssigned()) {
+        text.append(" ");
+        text.append(argument.toString());
+        }
+    }
+
+    return text.toString();
     }
 }