Author: ivaynberg
Date: Wed Dec 7 16:58:46 2011
New Revision: 1211536
URL: http://svn.apache.org/viewvc?rev=1211536&view=rev
Log:
undo my previous fix, the previous one was correct
Modified:
wicket/trunk/ (props changed)
wicket/trunk/wicket-core/ (props changed)
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java
Propchange: wicket/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 7 16:58:46 2011
@@ -1,4 +1,4 @@
/wicket/branches/wicket-1.4.x:963681,1027877
-/wicket/branches/wicket-1.5.x:1208735,1209203,1210042,1210691
+/wicket/branches/wicket-1.5.x:1208735,1209203,1210042,1210691,1211532
/wicket/sandbox/jthomerson/experimental/wicket-devutils:760296-760351,760353-760355
/wicket/trunk/wicket-devutils:760352
Propchange: wicket/trunk/wicket-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 7 16:58:46 2011
@@ -1,6 +1,6 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905,760374,764756,769389,769440,774373,781715,781719,790879
/wicket/branches/wicket-1.4.x/wicket:963681,998663,1005194-1005196,1005201,1005205,1024347,1027877
-/wicket/branches/wicket-1.5.x/wicket-core:1208735,1209203
+/wicket/branches/wicket-1.5.x/wicket-core:1208735,1209203,1211532
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket:760296-760351,760353-760355
/wicket/trunk/wicket:1005201
/wicket/trunk/wicket-devutils/wicket:760352
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=1211536&r1=1211535&r2=1211536&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
Wed Dec 7 16:58:46 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)
{
Modified:
wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java?rev=1211536&r1=1211535&r2=1211536&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java
(original)
+++
wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1.java
Wed Dec 7 16:58:46 2011
@@ -110,6 +110,12 @@ public class DatesPage1 extends WebPage
setDefaultModel(new
PropertyModel<Locale>(DatesPage1.this, "selectedLocale"));
}
+ @Override
+ public String getModelValue()
+ {
+ return super.getModelValue();
+ }
+
/**
* @see
org.apache.wicket.markup.html.form.DropDownChoice#onSelectionChanged(java.lang.Object)
*/
