Updated Branches: refs/heads/master 44a4132fc -> eaa22123f
Java 7 diamonds for wicket-velocity Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0576c4a4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0576c4a4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0576c4a4 Branch: refs/heads/master Commit: 0576c4a48feee71defd3f85c9b127e455eb5e57f Parents: c1a28ab Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Jun 21 15:39:47 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Jun 21 15:47:38 2013 +0200 ---------------------------------------------------------------------- .../apache/wicket/contrib/markup/html/velocity/VelocityPage.java | 4 ++-- .../markup/html/velocity/VelocityWithMarkupParsingPage.java | 2 +- .../apache/wicket/contrib/velocity/VelocityJavaScriptPage.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0576c4a4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java index 8da0c80..44c8f52 100644 --- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java +++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java @@ -38,9 +38,9 @@ public class VelocityPage extends WebPage */ public VelocityPage() { - HashMap<String, String> values = new HashMap<String, String>(); + HashMap<String, String> values = new HashMap<>(); values.put("message", TEST_STRING); - add(VelocityPanel.forTemplateResource("velocityPanel", new Model<HashMap<String, String>>( + add(VelocityPanel.forTemplateResource("velocityPanel", new Model<>( values), new UrlResourceStream(this.getClass().getResource("test.html")))); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0576c4a4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java index b8f0b0e..850fda9 100644 --- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java +++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java @@ -40,7 +40,7 @@ public class VelocityWithMarkupParsingPage extends WebPage */ public VelocityWithMarkupParsingPage() { - HashMap<String, String> values = new HashMap<String, String>(); + HashMap<String, String> values = new HashMap<>(); values.put("labelId", "message"); VelocityPanel velocityPanel = new VelocityPanel("velocityPanel", new Model<HashMap<String, String>>(values)) http://git-wip-us.apache.org/repos/asf/wicket/blob/0576c4a4/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java index 5bdf3a2..7c4fc57 100644 --- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java +++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java @@ -50,7 +50,7 @@ public class VelocityJavaScriptPage extends WebPage @Override public MiniMap<String, String> getObject() { - MiniMap<String, String> map = new MiniMap<String, String>(2); + MiniMap<String, String> map = new MiniMap<>(2); map.put("msg1", MSG1); map.put("msg2", "Stooopid test 2"); return map;
