Changeset 2944

Timestamp:

Nov 23, 2006, 11:09:29 AM (16 years ago)

Author:

Martin Svensson

Message:

Fixes #441. The maxLength of an imported StringParameterType? is now depending on the imported
parametervalue's length.
No configurations will be imported if something goes wrong during the job.

File:

• branches/2.1/src/plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java (modified) (9 diffs)

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

@@ -88 +88 @@
   extends AbstractPlugin
     implements InteractivePlugin, AutoDetectingImporter
-{
-  
+{ 
   private static final About about = new AboutImpl
   (
@@ -116 +115 @@
   
   private RequestInformation configureJob;
-  
-  // Counting variables for the job
-  private int numImportedConfigurations;
-  private int numNotImportedConfigurations;
   
   // Variables to store the job parameters in.
@@ -232 +227 @@
         is.close();
         
-        response.setDone(getSuccessMessage());
+        response.setDone("The configurations were imported successfully!");
         
       }
@@ -300 +295 @@
     throws BaseException
   {           
-    DbControl dc = null;    
-    numNotImportedConfigurations = 0;
+    DbControl dc = null;
+    
     try
     {
@@ -319 +314 @@
         String pluginClassName = configuration.getAttributeValue("pluginClassName");
         
-        try
-        {
-          PluginDefinition pluginDefinition = PluginDefinition.getByClassName(dc, pluginClassName);
-          
-          PluginConfiguration pluginConfig = PluginConfiguration.getNew(dc, pluginDefinition);          
-          dc.saveItem(pluginConfig);
-          pluginConfig.setName(name);
-          pluginConfig.setDescription(description);
-          
-          List parameters = configuration.getChildren("parameter");
-          setPluginConf(parameters, pluginConfig);          
-          numImportedConfigurations++;        
-        }
-        catch(Throwable ex)
-        {
-          numNotImportedConfigurations++;         
-        }
+      
+        PluginDefinition pluginDefinition = PluginDefinition.getByClassName(dc, pluginClassName);
+        
+        PluginConfiguration pluginConfig = PluginConfiguration.getNew(dc, pluginDefinition);          
+        dc.saveItem(pluginConfig);
+        pluginConfig.setName(name);
+        pluginConfig.setDescription(description);
+        
+        List parameters = configuration.getChildren("parameter");
+        setPluginConf(parameters, pluginConfig);          
       }       
       dc.commit();
@@ -355 +343 @@
       -----------------------------------------------------
   */  
-  /**
-    Gets the message of how many parameters that were handled/imported of the parameters in the xml-file
-  */
-  private String getSuccessMessage()
-  {
-    StringBuilder message = new StringBuilder();    
-    message.append(numImportedConfigurations + " configurations were imported.\n");
-    if (numNotImportedConfigurations > 0)
-    {
-      message.append(numNotImportedConfigurations + " configurations were not imported.\n");
-    }
-    return message.toString();
-  } 
   
   private RequestInformation getConfiguredJobParameters()
@@ -413 +388 @@
       Returns null if this importer doesn't support the class.
   */ 
-  private ParameterType getParameterType(Class parameterClass)
+  private ParameterType getParameterType(Class parameterClass, List<?> values)
   {
     if (parameterClass.equals(Boolean.class)) return new BooleanParameterType();
@@ -421 +396 @@
     else if (parameterClass.equals(Integer.class)) return new IntegerParameterType();   
     else if (parameterClass.equals(Long.class)) return new LongParameterType();
-    else if (parameterClass.equals(String.class)) return new StringParameterType();
+    else if (parameterClass.equals(String.class)) 
+    {
+      StringParameterType stp = null;
+      if (values != null && !values.isEmpty())
+      {
+        int maxLength = 0;
+        for (Object obj : values)
+        {
+          if (obj instanceof String)
+          {
+            String str = obj.toString();
+            maxLength = maxLength < str.length() ? str.length() : maxLength;            
+          }
+        }
+        stp = new StringParameterType(maxLength, null, false);
+      }
+      else
+      {
+        stp = new StringParameterType();
+      }
+      return stp;
+      
+    }
     else return null;
   }
@@ -448 +445 @@
         clazz = Class.forName(cl);
         values = getValueList(parameter, clazz);
-        plc.setParameterValues(name,label, "", getParameterType(clazz), values);
+        ParameterType pType = getParameterType(clazz, values);
+        plc.setParameterValues(name,label, "", pType, values);
       }
     }