Author: ivaynberg
Date: Mon Apr 26 17:39:24 2010
New Revision: 938144
URL: http://svn.apache.org/viewvc?rev=938144&view=rev
Log:
Issue: WICKET-2843
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=938144&r1=938143&r2=938144&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Mon Apr 26 17:39:24 2010
@@ -515,6 +515,7 @@ public class Palette<T> extends Panel im
protected final void updateModel()
{
// prepare model
+ modelChanging();
Collection<T> model = getModelCollection();
model.clear();
@@ -526,8 +527,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);
}
/**
