Author: gseitz
Date: Mon May 5 16:06:05 2008
New Revision: 653625
URL: http://svn.apache.org/viewvc?rev=653625&view=rev
Log:
generics
Removed:
wicket/trunk/wicket-velocity/src/test/java/wicket/contrib/
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptPage.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java?rev=653625&r1=653624&r2=653625&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
Mon May 5 16:06:05 2008
@@ -41,7 +41,6 @@
* @param parameters
* Page parameters
*/
- @SuppressWarnings("unchecked")
public DynamicPage(final PageParameters parameters)
{
final IStringResourceStream template = new
PackageResourceStream(DynamicPage.class,
Modified:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java?rev=653625&r1=653624&r2=653625&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
(original)
+++
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
Mon May 5 16:06:05 2008
@@ -42,24 +42,22 @@
private String encoding = "ISO-8859-1";
- private final IModel model;
+ private final IModel< ? extends Map< ? , ? >> model;
private final String templateName;
/**
- * Ctor for VelocityContributor
- *
* The templateName needs to have the full path relative to where the
resource loader starts
* looking. For example, if there is a template next to this class in
the package called foo.vm,
* and you have configured the ClassPathResourceLoader, template name
will then be
* "wicket/contrib/util/resource/foo.vm". Wicket provides a nice utility
- * [EMAIL PROTECTED] wicket.util.lang.Packages} for this.
+ * [EMAIL PROTECTED] org.apache.wicket.util.lang.Packages} for this.
*
*
* @param templateName
* @param model
*/
- public VelocityContributor(String templateName, final IModel model)
+ public VelocityContributor(String templateName, final IModel< ? extends
Map< ? , ? >> model)
{
this.templateName = templateName;
this.model = model;
@@ -68,7 +66,8 @@
/**
* @see
org.apache.wicket.behavior.AbstractBehavior#detach(org.apache.wicket.Component)
*/
- public void detach(Component c)
+ @Override
+ public void detach(Component< ? > c)
{
if (model instanceof IDetachable)
{
@@ -87,6 +86,7 @@
/**
* @see
org.apache.wicket.behavior.AbstractBehavior#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
+ @Override
public void renderHead(IHeaderResponse response)
{
CharSequence s = evaluate();
@@ -116,7 +116,7 @@
/**
* Evaluate the template.
*
- * @return The avaluated template
+ * @return The evaluated template
*/
protected final CharSequence evaluate()
{
@@ -125,7 +125,7 @@
return null;
}
// create a Velocity context object using the model if set
- final VelocityContext ctx = new
VelocityContext((Map)model.getObject());
+ final VelocityContext ctx = new
VelocityContext(model.getObject());
// create a writer for capturing the Velocity output
StringWriter writer = new StringWriter();
Modified:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java?rev=653625&r1=653624&r2=653625&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java
(original)
+++
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java
Mon May 5 16:06:05 2008
@@ -31,7 +31,7 @@
public class VelocityHeaderContributor extends AbstractHeaderContributor
{
- private final List contributors = new ArrayList(1);
+ private final List<VelocityContributor> contributors = new
ArrayList<VelocityContributor>(1);
/**
* Adds a contributor.
@@ -48,11 +48,12 @@
/**
* @see
org.apache.wicket.behavior.AbstractBehavior#detach(org.apache.wicket.Component)
*/
- public void detach(Component component)
+ @Override
+ public void detach(Component< ? > component)
{
- for (Iterator i = contributors.iterator(); i.hasNext();)
+ for (Iterator<VelocityContributor> i = contributors.iterator();
i.hasNext();)
{
- VelocityContributor vc = (VelocityContributor)i.next();
+ VelocityContributor vc = i.next();
vc.detach(component);
}
}
@@ -60,9 +61,9 @@
/**
* @see
org.apache.wicket.behavior.AbstractHeaderContributor#getHeaderContributors()
*/
+ @Override
public IHeaderContributor[] getHeaderContributors()
{
- return (IHeaderContributor[])contributors.toArray(new
IHeaderContributor[contributors
- .size()]);
+ return contributors.toArray(new
IHeaderContributor[contributors.size()]);
}
}
Modified:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java?rev=653625&r1=653624&r2=653625&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
(original)
+++
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
Mon May 5 16:06:05 2008
@@ -16,21 +16,22 @@
*/
package org.apache.wicket.velocity;
+import java.util.Map;
+
+import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Packages;
/**
* A derivation of VelocityContributor that uses
- * [EMAIL PROTECTED]
wicket.markup.html.IHeaderResponse#renderJavascript(CharSequence, String)}
+ * [EMAIL PROTECTED]
org.apache.wicket.markup.html.IHeaderResponse#renderJavascript(CharSequence,
String)}
*/
public class VelocityJavascriptContributor extends VelocityContributor
{
private final String id;
/**
- * Ctor
- *
* Use this constructor if you have configured Velocity to use a
ClasspathResourceLoader. The
* templatePath will then be relative to the package for clazz
*
@@ -39,23 +40,23 @@
* @param model
* @param id
*/
- public VelocityJavascriptContributor(Class clazz, String templatePath,
IModel model, String id)
+ public VelocityJavascriptContributor(Class< ? > clazz, String
templatePath,
+ IModel< ? extends Map< ? , ? >> model, String id)
{
super(Packages.absolutePath(clazz, templatePath), model);
this.id = id;
}
/**
- * Construct.
- *
- * Use this constructor when Velocity is configured with the
FileResourceLoader. templatePath
- * with then be relative to the loader path configured in
velocity.properties
+ * Use this constructor when Velocity is configured with the [EMAIL
PROTECTED] FileResourceLoader}.
+ * templatePath with then be relative to the loader path configured in
velocity.properties
*
* @param templatePath
* @param model
* @param id
*/
- public VelocityJavascriptContributor(String templatePath, IModel model,
String id)
+ public VelocityJavascriptContributor(String templatePath,
+ IModel< ? extends Map< ? , ? >> model, String id)
{
super(templatePath, model);
this.id = id;
@@ -64,6 +65,7 @@
/**
* @see
org.apache.wicket.velocity.VelocityContributor#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
+ @Override
public void renderHead(IHeaderResponse response)
{
CharSequence s = evaluate();
Modified:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java?rev=653625&r1=653624&r2=653625&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
(original)
+++
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
Mon May 5 16:06:05 2008
@@ -70,7 +70,7 @@
* The template resource
* @return an instance of [EMAIL PROTECTED] VelocityPanel}
*/
- public static VelocityPanel forTemplateResource(String id, IModel<Map>
model,
+ public static VelocityPanel forTemplateResource(String id, IModel< ?
extends Map> model,
final IStringResourceStream templateResource)
{
if (templateResource == null)
@@ -101,9 +101,9 @@
* @param model
* Model with variables that can be substituted by Velocity.
*/
- public VelocityPanel(final String id, final IModel<Map> model)
+ public VelocityPanel(final String id, final IModel< ? extends Map>
model)
{
- super(id, model);
+ super(id, (IModel<Map>)model);
}
/**
Modified:
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java?rev=653625&r1=653624&r2=653625&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
(original)
+++
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
Mon May 5 16:06:05 2008
@@ -28,7 +28,7 @@
*
* @see org.apache.wicket.velocity.markup.html.VelocityPanel
*/
-public class VelocityPage extends WebPage
+public class VelocityPage extends WebPage<Void>
{
protected static final String TEST_STRING = "Hello, World!";
@@ -37,9 +37,9 @@
*/
public VelocityPage()
{
- HashMap values = new HashMap();
+ HashMap<String, String> values = new HashMap<String, String>();
values.put("message", TEST_STRING);
- add(VelocityPanel.forTemplateResource("velocityPanel", new
Model(values),
- new
UrlResourceStream(this.getClass().getResource("test.html"))));
+ add(VelocityPanel.forTemplateResource("velocityPanel", new
Model<HashMap<String, String>>(
+ values), new
UrlResourceStream(this.getClass().getResource("test.html"))));
}
}
Modified:
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java?rev=653625&r1=653624&r2=653625&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
(original)
+++
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
Mon May 5 16:06:05 2008
@@ -28,32 +28,36 @@
/**
* Test page for <code>VelocityPanel</code>
- *
+ *
* @see org.apache.wicket.velocity.markup.html.VelocityPanel
*/
-public class VelocityWithMarkupParsingPage extends WebPage
+public class VelocityWithMarkupParsingPage extends WebPage<Void>
{
/**
* Adds a VelocityPanel to the page with markup parsing
*/
public VelocityWithMarkupParsingPage()
{
- HashMap values = new HashMap();
+ HashMap<String, String> values = new HashMap<String, String>();
values.put("labelId", "message");
- VelocityPanel velocityPanel = new
VelocityPanel("velocityPanel", new Model(values))
+ VelocityPanel velocityPanel = new VelocityPanel("velocityPanel",
+ new Model<HashMap<String, String>>(values))
{
+ @Override
protected IStringResourceStream getTemplateResource()
{
return new
UrlResourceStream(getClass().getResource("testWithMarkup.html"));
}
+ @Override
public boolean parseGeneratedMarkup()
{
return true;
}
};
- velocityPanel.add(new Label("message", VelocityPage.TEST_STRING)
+ velocityPanel.add(new Label<String>("message",
VelocityPage.TEST_STRING)
{
+ @Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
Modified:
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptPage.java?rev=653625&r1=653624&r2=653625&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptPage.java
(original)
+++
wicket/trunk/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavascriptPage.java
Mon May 5 16:06:05 2008
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.contrib.velocity;
-import java.io.Serializable;
-
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -29,7 +27,7 @@
/**
* Test page.
*/
-public class VelocityJavascriptPage extends WebPage
+public class VelocityJavascriptPage extends WebPage<Void>
{
static final String MSG1 = "Stoopid test 1";
@@ -44,11 +42,12 @@
String javascript = "msg1: Stoopid test 1\nmsg2: Stooopid test
2";
JavascriptUtils.writeJavascript(getResponse(), javascript, id);
- IModel model = new Model()
+ IModel<MiniMap<String, String>> model = new
Model<MiniMap<String, String>>()
{
- public Serializable getObject()
+ @Override
+ public MiniMap<String, String> getObject()
{
- MiniMap map = new MiniMap(2);
+ MiniMap<String, String> map = new
MiniMap<String, String>(2);
map.put("msg1", MSG1);
map.put("msg2", "Stooopid test 2");
return map;
