Changeset 3885

Timestamp:

Oct 14, 2010, 11:50:23 AM (13 years ago)

Author:

olle

Message:

Refs #700. Refs #698. Class SaveXTandemParameterSetStorage updated
to fix problems with adding string lists as list strings in hidden fields
in the form. The list string to save could be too long for the valid
VString parameter coupled to the hidden text field. A string list is now
added as a list also in the added hidden field.

1. Class/file action/xTandemInput/SaveXTandemParameterSetStorage.java in

client/servlet updated:

1. Private method Form addFormFields(Form targetForm, Form sourceForm)

updated to add a string list as a list also in the added hidden field.
In addition to solving the problem with strings being too long to be
saved in a hidden field coupled to a specific valid parameter, this
has the added benefit of not requiring detailed knowledge of the
data being saved.

2. New private convenience method

void addHiddenField(Fieldset fieldset, VParameter param, String value)
added. It creates and adds a hidden field with a String value to the
given field set.

File:

• trunk/client/servlet/src/org/proteios/action/xTandemInput/SaveXTandemParameterSetStorage.java (modified) (5 diffs)

trunk/client/servlet/src/org/proteios/action/xTandemInput/SaveXTandemParameterSetStorage.java

@@ -356 +356 @@
   /**
    * Adds form fields in source form as hidden fields to target form.
+   * 
    * @param targetForm Form The form to add hidden fields to.
    * @param sourceForm Form The form to take fields from.
@@ -362 +363 @@
   private Form addFormFields(Form targetForm, Form sourceForm)
   {
-    // Get last target fieldset to add hidden fields to
+    // Get last target field set to add hidden fields to
     Fieldset targetFS = null;
     for (Fieldset fieldset: targetForm.getFieldsets())
@@ -371 +372 @@
     {
       log.debug("No fieldset in form " + targetForm.getTitle() + " to add hidden fields to");
-      // Create new fieldset without title to store hidden fields
+      // Create new field set without title to store hidden fields
       targetFS = new Fieldset();
       targetForm.addFieldset(targetFS);
@@ -383 +384 @@
       for (GUIElement guiElement: sourceFS.getFields())
       {
-         if (guiElement instanceof Select)
-           {
-           Select sourceS = ((Select) guiElement);
-           TextField field = new TextField(sourceS.getParam());
-           field.setId(sourceS.getId());
-           field.setLabel(sourceS.getLabel());
-           try
-           {
-             List<String> stringList = getValidStringList((VString) sourceS.getParam());
-             log.debug("Source select - " + sourceS.getLabel() + " string list = " + stringList);
-             String delimiterString = new String(",");
-             if (sourceS.getLabel().equals("XTandemProteinTaxonEukaryotes") ||
-                 sourceS.getLabel().equals("XTandemProteinTaxonProkaryotes"))
-             {
-               delimiterString = new String(", ");
-             }
-             String listString = stringListToListString(stringList, delimiterString);
-             field.setValue(listString);
-           }
-           catch(InvalidParameterValue e)
-           {
-             log.debug("Source select - " + sourceS.getLabel() + " InvalidParameterValue: " + e);
-           }
-           log.debug("Target field - " + field.getLabel() + ": " + field.getValue());
-           field.setHidden(true);
-           targetFS.add(field);
-           }
-         else if (guiElement instanceof TextField)
-           {
-           TextField sourceF = ((TextField) guiElement);
-           TextField field = new TextField(sourceF.getParam());
-           field.setId(sourceF.getId());
-           field.setLabel(sourceF.getLabel());
-           field.setValue(sourceF.getValue());
-           field.setHidden(true);
-           targetFS.add(field);
-           }
+        // Get valid parameter and field label
+        VParameter param = null;
+        String label = null;
+        if (guiElement instanceof Select)
+          {
+          Select sourceS = ((Select) guiElement);
+          param = sourceS.getParam();
+          label = sourceS.getLabel();
+          }
+        else if (guiElement instanceof TextField)
+        {
+          TextField sourceF = ((TextField) guiElement);
+          param = sourceF.getParam();
+          label = sourceF.getLabel();
+        }
+        // Add string list to new hidden field
+        if (param != null)
+        {
+          try
+          {
+            List<String> stringList = getValidStringList((VString) param);
+            log.debug("Source - " + label + " string list = " + stringList);
+            if (stringList != null && stringList.size() > 0)
+            {
+              for (String value: stringList)
+              {
+                addHiddenField(targetFS, param, value);
+              }
+            }
+          }
+          catch(InvalidParameterValue e)
+          {
+            log.debug("Source - " + label + " InvalidParameterValue: " + e);
+          }
+        }
       }
     }
@@ -426 +425 @@
 
 
+    /**
+     * Creates and adds a hidden field with a String value to the given field set.
+     * 
+     * @param fieldset Fieldset The field set to add the hidden field to.
+     * @param param VParameter Valid parameter coupled to the hidden field.
+     * @param value String The string value to save in the hidden field.
+     */
+  private void addHiddenField(Fieldset fieldset, VParameter param, String value)
+  {
+    TextField<String> field = new TextField<String>(param);
+      field.setValue(value);
+      field.setHidden(true);
+      fieldset.add(field);
+     }
+
+ 
   /**
    * Fetches values of XTandemParameterSet variables from valid parameters