Author: ivaynberg
Date: Tue Dec 6 17:26:52 2011
New Revision: 1211039
URL: http://svn.apache.org/viewvc?rev=1211039&view=rev
Log:
use id renderer instead of indexof to determine if a choice is selected
Modified:
wicket/branches/wicket-1.5.x/ (props changed)
wicket/branches/wicket-1.5.x/wicket-core/ (props changed)
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
Propchange: wicket/branches/wicket-1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 6 17:26:52 2011
@@ -1,3 +1,4 @@
/wicket/branches/wicket-1.4.x:963681,1027877,1210482
/wicket/sandbox/jthomerson/experimental/wicket-devutils:760296-760351,760353-760355
+/wicket/trunk:1211037
/wicket/trunk/wicket-devutils:760352
Propchange: wicket/branches/wicket-1.5.x/wicket-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 6 17:26:52 2011
@@ -2,5 +2,5 @@
/wicket/branches/wicket-1.4.x/wicket:963681,998663,1005194-1005196,1005201,1005205,1024347,1027877
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket:760296-760351,760353-760355
/wicket/trunk/wicket:1005201
-/wicket/trunk/wicket-core:1204836,1204865
+/wicket/trunk/wicket-core:1204836,1204865,1211037
/wicket/trunk/wicket-devutils/wicket:760352
Modified:
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java?rev=1211039&r1=1211038&r2=1211039&view=diff
==============================================================================
---
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
(original)
+++
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
Tue Dec 6 17:26:52 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)
{
