Changeset 2946

Timestamp:

Nov 23, 2006, 2:41:47 PM (16 years ago)

Author:

Martin Svensson

Message:

Fixes #442. Description for plugin parameters are now exported/imported with pluginconfigurations.

Location:

branches/2.1/src

Files:

• core/net/sf/basedb/core/dtd/plugin-configuration-file.dtd (modified) (1 diff)
• plugins/core/net/sf/basedb/plugins/PluginConfigurationExporter.java (modified) (1 diff)
• plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java (modified) (2 diffs)

branches/2.1/src/core/net/sf/basedb/core/dtd/plugin-configuration-file.dtd

@@ -32 +32 @@
 <!ELEMENT configname (#PCDATA)>
 <!ELEMENT description (#PCDATA)>
-<!ELEMENT parameter (name, label, class, value*)>
+<!ELEMENT parameter (name, label, pdescription?, class, value*)>
 
 <!ELEMENT name (#PCDATA)>
 <!ELEMENT label (#PCDATA)>
+<!ELEMENT pdescription (#PCDATA)>
 <!ELEMENT class (#PCDATA)>
 <!ELEMENT value (#PCDATA)>

branches/2.1/src/plugins/core/net/sf/basedb/plugins/PluginConfigurationExporter.java

@@ -325 +325 @@
             labelElement.setText(parameterInfo.getLabel());
             newParameterElement.addContent(labelElement);
+            Element parameterDescription = new Element ("pdescription");
+            parameterDescription.setText(parameterInfo.getDescription());
+            newParameterElement.addContent(parameterDescription);
             List<?> values = parameterInfo.getValues();
-            Element classElement = new Element("class");        
+            Element classElement = new Element("class");            
             
             // Add the parameter values to the parameter element          

branches/2.1/src/plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java

@@ -437 +437 @@
       String name = parameter.getChildText("name");               
       String cl = parameter.getChildText("class"); 
-      String label = parameter.getChildText("label").length() > 0 ? parameter.getChildText("label") : name;         
+      String label = parameter.getChildText("label").length() > 0 ? parameter.getChildText("label") : name;   
+      String description = parameter.getChildText("pdescription");
       Class clazz = null;
       List<?> values = null;
@@ -446 +447 @@
         values = getValueList(parameter, clazz);
         ParameterType pType = getParameterType(clazz, values);
-        plc.setParameterValues(name,label, "", pType, values);
+        plc.setParameterValues(name,label, description, pType, values);
       }
     }