Author: jdonnerstag
Date: Mon Feb 15 11:10:59 2010
New Revision: 910204
URL: http://svn.apache.org/viewvc?rev=910204&view=rev
Log:
Improved error message
Issue: WICKET-2442
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java?rev=910204&r1=910203&r2=910204&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
Mon Feb 15 11:10:59 2010
@@ -23,6 +23,7 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.markup.html.form.HiddenField;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
@@ -99,7 +100,14 @@
// construct the model string based on selection collection
IChoiceRenderer<T> renderer = getPalette().getChoiceRenderer();
StringBuffer modelStringBuffer = new StringBuffer();
- Iterator<T> selection =
getPalette().getModelCollection().iterator();
+ Collection<T> modelCollection =
getPalette().getModelCollection();
+ if (modelCollection == null)
+ {
+ throw new WicketRuntimeException(
+ "Expected getPalette().getModelCollection() to
return a non-null value."
+ + " Please make sure you have model
object assigned to the palette");
+ }
+ Iterator<T> selection = modelCollection.iterator();
int i = 0;
while (selection.hasNext())
