Changeset 4517

Timestamp:

Sep 9, 2013, 11:26:15 AM (10 years ago)

Author:

Fredrik Levander

Message:

Fixes #814. Escaping the selected option list when matching.

File:

• trunk/client/servlet/src/org/proteios/gui/form/Select.java (modified) (6 diffs)

trunk/client/servlet/src/org/proteios/gui/form/Select.java

@@ -27 +27 @@
  */
 package org.proteios.gui.form;
+
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import se.lu.thep.waf.constraints.VParameter;
@@ -52 +54 @@
     this.name = param.getName();
     this.options = new ArrayList<Option>();
-  setLabel(param.getName());
-  }
-
- public Select(D param, List<Option> options)
-  {
-    this(param);  
-  this.options.addAll(options);
-  }
-
- public Select(D param, List<String> options, String selected)
+    setLabel(param.getName());
+  }
+
+
+  public Select(D param, List<Option> options)
   {
     this(param);
-  for(String str : options)
-  {
-    Option o = new Option(str);
-    addOption(o);
-  }
-  selectOption(selected);
-  }
-
- public Select(D param, List<Option> optionList, List<String> selected)
- {
-  this(param);
-  this.options.addAll(optionList);
-  setMultiple(true);
-  if (selected != null)
-  {   
-    for(String str : selected)
-    {
-      selectOption(str);
-    }
-  }
-  setMaxSize(5);  
- }
+    this.options.addAll(options);
+  }
+
+
+  public Select(D param, List<String> options, String selected)
+  {
+    this(param);
+    for (String str : options)
+    {
+      Option o = new Option(str);
+      addOption(o);
+    }
+    selectOption(selected);
+  }
+
+
+  public Select(D param, List<Option> optionList, List<String> selected)
+  {
+    this(param);
+    this.options.addAll(optionList);
+    setMultiple(true);
+    if (selected != null)
+    {
+      for (String str : selected)
+      {
+        selectOption(str);
+      }
+    }
+    setMaxSize(5);
+  }
+
 
   public String getName()
@@ -92 +98 @@
   }
 
+
   public void setName(String name)
   {
@@ -139 +146 @@
   }
 
+
   public Boolean isHidden()
   {
@@ -150 +158 @@
   }
 
- /**
-  Sets number of visible options. If number of options is lower than the given size 
-  size is set to the number of options. Does nothing if there are no options.
- */
+
+  /**
+   * Sets number of visible options. If number of options is lower than the
+   * given size size is set to the number of options. Does nothing if there
+   * are no options.
+   */
   public void setMaxSize(Integer size)
   {
-    if (getOptions() != null)
-      {
-        if (getOptions().size() < size)
-        {
-          setSize(getOptions().size());
-        }
-        else
-        {
-          setSize(size);
-        }
-      }
-  }
-
- /**
-  Sets all options matching the given value to selected
- */
- public void selectOption(String value)
- {
+    if (getOptions() != null)
+    {
+      if (getOptions().size() < size)
+      {
+        setSize(getOptions().size());
+      }
+      else
+      {
+        setSize(size);
+      }
+    }
+  }
+
+
+  /**
+   * Sets all options matching the given value to selected
+   */
+  public void selectOption(String value)
+  {
     // Set selected option
     if (value != null)
     {
+      // The option list is escaped. So the value also need to be escaped
+      // for proper string matching
+      String compValue = StringEscapeUtils.escapeHtml3(value);
       if (getOptions() != null)
       {
-        for( Option opt : getOptions())
+        for (Option opt : getOptions())
         {
-          if (opt.getValue().equals(value))
+          if (opt.getValue().equals(compValue))
           {
             opt.setSelected(true);
@@ -190 +204 @@
   }
 
- 
- /**
-  * Sets all options matching any value in the input list to selected.
-  * 
-  * @param selected List<Sting> selected List with selected values.
-  */
- public void selectOptions(List<String> selected)
- {
-   if (selected != null)
-   {
-     for(String str : selected)
-     {
-       selectOption(str);
-     }
-   }
- }
+
+  /**
+   * Sets all options matching any value in the input list to selected.
+   * 
+   * @param selected List<Sting> selected List with selected values.
+   */
+  public void selectOptions(List<String> selected)
+  {
+    if (selected != null)
+    {
+      for (String str : selected)
+      {
+        selectOption(str);
+      }
+    }
+  }
 }