Changeset 5585

Timestamp:

Mar 15, 2011, 2:41:24 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1585: Problem with 'null' parameter values in plug-in configuration when handling errors

Location:

branches/2.17-stable

Files:

• src/core/net/sf/basedb/core/ParameterValuesImpl.java (modified) (2 diffs)
• www/common/plugin/configure.jsp (modified) (2 diffs)

branches/2.17-stable/src/core/net/sf/basedb/core/ParameterValuesImpl.java

@@ -175 +175 @@
     type.validate(name, value);
     List<T> l = new ArrayList<T>(1);
-    l.add(value);
+    if (value != null) l.add(value);
     parameters.put(name, l);
     parameterTypes.put(name, type);
@@ -195 +195 @@
     }
     type.validate(name, values);
-    parameters.put(name, values);
+    // Create copy of list but remove null values
+    ArrayList<T> l = new ArrayList<T>(values.size());
+    for (T value : values)
+    {
+      if (value != null) l.add(value);
+    }
+    parameters.put(name, l);
     parameterTypes.put(name, type);
   }

branches/2.17-stable/www/common/plugin/configure.jsp

@@ -197 +197 @@
               values = Collections.singletonList(pType.getItems().get(0));  
             }
+            %>
+            var values = new Array();
+            <%
+            int numNotNullValues = 0;
+            if (values != null && values.size() > 0)
+            {
+              for (Object value : values)
+              {
+                if (value instanceof Date) 
+                {
+                  if (pType.isEnumeration())
+                  {
+                    value = ((Date)value).getTime();
+                  }
+                  else
+                  {
+                    if (pType.getValueType() == Type.TIMESTAMP)
+                    {
+                      value = dateTimeFormatter.format((Date)value);
+                    }
+                    else
+                    {
+                      value = dateFormatter.format((Date)value);
+                    }
+                  }
+                }
+                else if (value instanceof File && pType instanceof FileParameterType)
+                {
+                  File file = File.getById(dc, ((File)value).getId());
+                  value = file.getPath().toString();
+                }
+                else if (value instanceof BasicItem)
+                {
+                  value = ((BasicItem)value).getId();
+                }
+                if (value != null)
+                {
+                  numNotNullValues++;
+                  %>
+                  values[values.length] = '<%=HTML.javaScriptEncode(value.toString())%>';
+                  <%
+                }
+              }
+            }
+            %>
+            new Parameter('<%=name%>', '<%=HTML.javaScriptEncode(param.getLabel())%>', <%=pType.getMultiplicity()%>, <%=pType.isEnumeration()%>, <%=pType.getNotNull()%>, values);
+            <%
             String icon = "";
-            if (values != null && values.size() > 0)
+            if (numNotNullValues > 0)
             {
               icon = pType.getNotNull() ? "required_values.gif" : "notrequired_values.gif";
@@ -213 +260 @@
               sb.append(icon+"<span class=\"label\">"+label+"</span></div>\n");
             }
-            %>
-            var values = new Array();
-            <%
-            if (values != null && values.size() > 0)
-            {
-              for (Object value : values)
-              {
-                if (value instanceof Date) 
-                {
-                  if (pType.isEnumeration())
-                  {
-                    value = ((Date)value).getTime();
-                  }
-                  else
-                  {
-                    if (pType.getValueType() == Type.TIMESTAMP)
-                    {
-                      value = dateTimeFormatter.format((Date)value);
-                    }
-                    else
-                    {
-                      value = dateFormatter.format((Date)value);
-                    }
-                  }
-                }
-                else if (value instanceof File && pType instanceof FileParameterType)
-                {
-                  File file = File.getById(dc, ((File)value).getId());
-                  value = file.getPath().toString();
-                }
-                else if (value instanceof BasicItem)
-                {
-                  value = ((BasicItem)value).getId();
-                }
-                %>
-                values[values.length] = '<%=HTML.javaScriptEncode(value == null ? "" : value.toString())%>';
-                <%
-              }
-            }
-            %>
-            new Parameter('<%=name%>', '<%=HTML.javaScriptEncode(param.getLabel())%>', <%=pType.getMultiplicity()%>, <%=pType.isEnumeration()%>, <%=pType.getNotNull()%>, values);
-            <%
           }
           else