You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/04/26 19:39:06 UTC
svn commit: r938142 -
/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Author: ivaynberg
Date: Mon Apr 26 17:39:06 2010
New Revision: 938142
URL: http://svn.apache.org/viewvc?rev=938142&view=rev
Log:
Issue: WICKET-2843
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=938142&r1=938141&r2=938142&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java Mon Apr 26 17:39:06 2010
@@ -509,6 +509,7 @@ public class Palette<T> extends Panel im
protected final void updateModel()
{
// prepare model
+ modelChanging();
Collection<T> model = getModelCollection();
model.clear();
@@ -520,8 +521,10 @@ public class Palette<T> extends Panel im
final T selectedChoice = it.next();
model.add(selectedChoice);
}
+ modelChanged();
- setDefaultModelObject(model);
+ // call model.setObject()
+ ((IModel<Object>) getDefaultModel()).setObject(model);
}
/**