Author: ivaynberg
Date: Sat Sep 17 23:38:09 2011
New Revision: 1172149
URL: http://svn.apache.org/viewvc?rev=1172149&view=rev
Log:
Issue: WICKET-2930
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java?rev=1172149&r1=1172148&r2=1172149&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
Sat Sep 17 23:38:09 2011
@@ -25,6 +25,7 @@ import org.apache.wicket.WicketRuntimeEx
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.visit.IVisit;
@@ -179,7 +180,7 @@ public class Select<T> extends FormCompo
/**
* @see FormComponent#updateModel()
*/
- @SuppressWarnings( { "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void updateModel()
{
@@ -210,13 +211,15 @@ public class Select<T> extends FormCompo
}
/**
- * Checks if the specified option is selected
+ * Checks if the specified option is selected based on raw input
*
* @param option
- * @return true if the option is selected, false otherwise
+ * @return true} iff the option is selected
*/
boolean isSelected(final SelectOption<?> option)
{
+ Args.notNull(option, "option");
+
// if the raw input is specified use that, otherwise use model
if (hasRawInput())
{
