Changeset 4211

Timestamp:

Apr 7, 2008, 2:02:52 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #970: PluginConfigurationImporter? doesn't support multi-valued parameters

File:

• branches/2.6-stable/src/plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java (modified) (2 diffs)

branches/2.6-stable/src/plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java

@@ -615 +615 @@
   private ParameterType getParameterType(Class parameterClass, List<?> values)
   {
-    if (parameterClass.equals(Boolean.class)) return new BooleanParameterType();
-    else if (parameterClass.equals(Date.class)) return new DateParameterType();
-    else if (parameterClass.equals(Double.class)) return new DoubleParameterType();   
-    else if (parameterClass.equals(Float.class)) return new FloatParameterType();
-    else if (parameterClass.equals(Integer.class)) return new IntegerParameterType();   
-    else if (parameterClass.equals(Long.class)) return new LongParameterType();
+    int multiplicity = 1;
+    if (values != null && values.size() > 1) multiplicity = values.size();
+    ParameterType pType = null;
+    
+    if (parameterClass.equals(Boolean.class))
+    {
+      pType = new BooleanParameterType(null, false, multiplicity, null);
+    }
+    else if (parameterClass.equals(Date.class)) 
+    {
+      pType = new DateParameterType(null, false, multiplicity, 0, 0, null);
+    }
+    else if (parameterClass.equals(Double.class)) 
+    {
+      pType = new DoubleParameterType(null, null, null, false, multiplicity, 0, 0, null);   
+    }
+    else if (parameterClass.equals(Float.class)) 
+    {
+      pType = new FloatParameterType(null, null, null, false, multiplicity, 0, 0, null);
+    }
+    else if (parameterClass.equals(Integer.class))
+    {
+      pType = new IntegerParameterType(null, null, null, false, multiplicity, 0, 0, null);    
+    }
+    else if (parameterClass.equals(Long.class)) 
+    {
+      pType = new LongParameterType(null, null, null, false, multiplicity, 0, 0, null);
+    }
     else if (parameterClass.equals(String.class)) 
     {
-      StringParameterType stp = null;
+      // Find longest string
+      int maxLength = 255;
       if (values != null && !values.isEmpty())
       {
-        int maxLength = 0;
         for (Object obj : values)
         {
@@ -632 +654 @@
           {
             String str = obj.toString();
-            maxLength = maxLength < str.length() ? str.length() : maxLength;            
+            if (str.length() > maxLength) maxLength = str.length();
           }
         }
-        stp = new StringParameterType(maxLength, null, false);
-      }
-      else
-      {
-        stp = new StringParameterType();
-      }
-      return stp;
-      
-    }
-    else return null;
+      }
+      pType = new StringParameterType(maxLength, null, false, multiplicity, 0, 0);
+    }
+    return pType;
   }