You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/05/07 18:37:13 UTC
svn commit: r535920 -
/incubator/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
Author: ehillenius
Date: Mon May 7 09:37:12 2007
New Revision: 535920
URL: http://svn.apache.org/viewvc?view=rev&rev=535920
Log:
users should be able to feed the velocity panel any kind of IModel, not just Model.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java?view=diff&rev=535920&r1=535919&r2=535920
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java Mon May 7 09:37:12 2007
@@ -34,7 +34,7 @@
import org.apache.wicket.markup.MarkupResourceStream;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.util.resource.IStringResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -69,10 +69,11 @@
* @param templateResource
* The velocity template as a string resource
* @param model
- * MapModel with variables that can be substituted by Velocity
+ * Model with variables that can be substituted by Velocity. Must
+ * return a {@link Map}.
*/
public VelocityPanel(final String name, final IStringResourceStream templateResource,
- final Model model)
+ final IModel/* <Map> */model)
{
super(name, model);
this.templateResource = templateResource;