Author: ivaynberg
Date: Wed Dec 7 16:56:50 2011
New Revision: 1211532
URL: http://svn.apache.org/viewvc?rev=1211532&view=rev
Log:
undo my previous fix, the previous one was correct
Modified:
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
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=1211532&r1=1211531&r2=1211532&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
Wed Dec 7 16:56:50 2011
@@ -193,18 +193,7 @@ public abstract class AbstractSingleSele
final T object = getModelObject();
if (object != null)
{
- 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;
- }
- }
+ int index = getChoices().indexOf(object);
if (index < 0)
{
