Changeset 3638

Timestamp:

Aug 7, 2007, 11:30:02 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #713: Differences in the configuration file from base1

File:

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

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

@@ -1738 +1738 @@
             false,
             1,
-            new Integer(options),
+            Values.getInt(options, 30),
             1,
             null);
@@ -1753 +1753 @@
         {
           Float defValue = Values.getFloat(defaultValue, null);
-          FloatParameterType t = new FloatParameterType(null, null, defValue, false, 1, new Integer(options), 1, null);
+          FloatParameterType t = new FloatParameterType(null, null, defValue, false, 1, Values.getInt(options, 30), 1, null);
           parameter = new PluginParameter<Float>(name, commonName, "", t);
           break;
@@ -1760 +1760 @@
         {
           String[] wh = options.split(",");
-          StringParameterType t = new StringParameterType(null, defaultValue, false, 1, new Integer(wh[0]), wh.length > 1 ? new Integer(wh[1]) : 1);
+          int width = Values.getInt(wh[0], 30);
+          int height = wh.length > 1 ? Values.getInt(wh[1], 1) : 1;
+          StringParameterType t = new StringParameterType(null, defaultValue, false, 1, width, height);
           parameter = new PluginParameter<String>(name, commonName, "", t);
           break;
@@ -1772 +1774 @@
             enums.add(at.getName(), at.getName());
           }
-          StringParameterType t = new StringParameterType(255, defaultValue, true, 1, new Integer(options), 1, enums);
+          StringParameterType t = new StringParameterType(255, defaultValue, true, 1, Values.getInt(options, 30), 1, enums);
           parameter = new PluginParameter<String>(name, commonName, "", t);
           break;
@@ -1778 +1780 @@
         case ENUMERATION:
         {
-          StringParameterType t = new StringParameterType(255, defaultValue, true, 1, options.equals("") ? 30 : new Integer(options), 1, enumOptions);
+          StringParameterType t = new StringParameterType(255, defaultValue, true, 1, Values.getInt(options, 30), 1, enumOptions);
           parameter = new PluginParameter<String>(name, commonName, "", t);
           break;