Changeset 3639

Timestamp:

Aug 7, 2007, 3:44:42 PM (16 years ago)

Author:

Johan Enell

Message:

Fixes #714

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (6 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -81 +81 @@
 import org.jdom.JDOMException;
 import org.jdom.filter.Filter;
+import org.jdom.output.Format;
+import org.jdom.output.XMLOutputter;
 
 import java.io.BufferedInputStream;
@@ -402 +404 @@
         storeValue(configuration, request, jobParametersParameter);
         // test the xml in the jobParameters parameres
-        getJobParametersFromXML(String.valueOf(configuration.getValue(jobParametersParameter.getName())));
-        
+        try
+        {
+          getJobParametersFromXML(String.valueOf(configuration.getValue(jobParametersParameter.getName())));
+        }
+        catch (BaseException e)
+        {
+          throw new BaseException("Error in the jobparameters xml. "+e.getMessage());
+        }
         response.setDone("Plugin configuration done.");
       }
@@ -882 +890 @@
     }
     
-    String parameters = "<jobparameters>\n";
+    Element parameters = new Element("jobparameters");
     while (ffp.hasMoreData())
     {
@@ -889 +897 @@
       {
         JobParameter jp = new JobParameter(dataline.line().split("\t"));
-        parameters += jp + "\n";
+        parameters.addContent(jp.toXml());
       }
       catch(BaseException e)
@@ -896 +904 @@
       }
     }
-    parameters += "</jobparameters>";
-    headers.put(jobParametersParameter.getName(), parameters);
+    XMLOutputter out = new XMLOutputter(Format.getPrettyFormat());
+    headers.put(jobParametersParameter.getName(), out.outputString(parameters));
     return headers;
   }
@@ -1830 +1838 @@
     }
 
+    public Element toXml()
+    {
+      Element parameter = new Element("parameter");
+      parameter.setAttribute("position", String.valueOf(getPosition()));
+      parameter.setAttribute("type", getType().toString());
+      
+      parameter.addContent(new Element("name").setText(getName()));
+      parameter.addContent(new Element("commonname").setText(getCommonName()));
+      parameter.addContent(new Element("options").setText(getOptions()));
+      parameter.addContent(new Element("defaultvalue").setText(getDefaultValue()));
+      
+      if (enumOptions.size() > 0)
+      {
+        Element enums = new Element("enumoptions");
+        for (int i = 0; i < enumOptions.size(); ++i)
+        {
+          Element value = new Element("value");
+          value.setAttribute("key", enumOptions.getKey(i));
+          value.setText(enumOptions.getValue(i));
+          enums.addContent(value);
+        }
+        parameter.addContent(enums);
+      }
+      if (removed) parameter.addContent(new Element("removed"));
+      return parameter;
+    }
+
     @Override
     public String toString()
     {
-      String s = "<parameter position=\""+position+"\" type=\""+type+"\">\n";
-      s += "\t<name>"+name+"</name>\n";
-      s += "\t<commonname>"+commonName+"</commonname>\n";
-      s += "\t<options>"+options+"</options>\n";
-      s += "\t<defaultvalue>"+defaultValue+"</defaultvalue>\n";
-      if (enumOptions.size() > 0)
-      {
-        s += "\t<enumoptions>\n";
-        for (int i = 0; i < enumOptions.size(); ++i)
-        {
-          s += "\t\t<value key=\""+enumOptions.getKey(i)+"\">";
-          s += enumOptions.getValue(i);
-          s += "</value>\n";
-        }
-        s += "\t</enumoptions>\n";
-      }
-      if (removed) s += "<removed/>";
-      s += "</parameter>";
-      return s;
+      XMLOutputter out = new XMLOutputter(Format.getPrettyFormat());
+      return out.outputString(toXml());
     }
   }