You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/02/15 12:10:40 UTC

svn commit: r910203 - /wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java

Author: jdonnerstag
Date: Mon Feb 15 11:10:40 2010
New Revision: 910203

URL: http://svn.apache.org/viewvc?rev=910203&view=rev
Log:
Improved error message
Issue: WICKET-2442

Modified:
    wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java

Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.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/component/Recorder.java?rev=910203&r1=910202&r2=910203&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java Mon Feb 15 11:10:40 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;
@@ -96,7 +97,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())
@@ -162,7 +170,7 @@
 
 		if (choices.size() - ids.length == 0)
 		{
-			return Collections.<T>emptyList().iterator();
+			return Collections.<T> emptyList().iterator();
 		}
 
 		List<T> unselected = new ArrayList<T>(Math.max(1, choices.size() - ids.length));