Author: ivaynberg
Date: Tue Dec 6 17:23:30 2011
New Revision: 1211037
URL: http://svn.apache.org/viewvc?rev=1211037&view=rev
Log:
use id renderer instead of indexof to determine if a choice is selected
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java?rev=1211037&r1=1211036&r2=1211037&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
Tue Dec 6 17:23:30 2011
@@ -193,7 +193,18 @@ public abstract class AbstractSingleSele
final T object = getModelObject();
if (object != null)
{
- int index = getChoices().indexOf(object);
+ int index = -1;
+
+ List<? extends T> choices = getChoices();
+ for (int i = 0; i < choices.size(); i++)
+ {
+ String otherId =
getChoiceRenderer().getIdValue(choices.get(i), i);
+ if (isSelected(object, i, otherId))
+ {
+ index = i;
+ break;
+ }
+ }
if (index < 0)
{
