Repository: wicket Updated Branches: refs/heads/wicket-6.x e213b0d2c -> a289bd1e3
Fix compilation issues caused by git cherry-picking from 7.x Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a289bd1e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a289bd1e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a289bd1e Branch: refs/heads/wicket-6.x Commit: a289bd1e3eed883ffbbf7b486d5c271fbdd0899e Parents: e213b0d Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Dec 21 17:12:11 2015 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Dec 21 17:12:11 2015 +0100 ---------------------------------------------------------------------- .../markup/html/form/EscapeAttributesInChoicesPage.java | 8 ++++---- .../markup/html/form/EscapeAttributesInChoicesTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a289bd1e/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesPage.java index a6051fa..c944e17 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesPage.java @@ -29,7 +29,7 @@ public class EscapeAttributesInChoicesPage extends WebPage { public EscapeAttributesInChoicesPage(final PageParameters parameters) { super(parameters); - final Map<String, String> fruits = new HashMap<>(); + final Map<String, String> fruits = new HashMap<String, String>(); fruits.put("apple\" onmouseover=\"alert('hi');\" \"", "Apple"); IChoiceRenderer<String> iChoiceRenderer = new ChoiceRenderer<String>() { @@ -44,9 +44,9 @@ public class EscapeAttributesInChoicesPage extends WebPage { } }; - add(new RadioChoice<>("radiofield", new ArrayList<>(fruits.keySet()), iChoiceRenderer)); - add(new DropDownChoice<>("dropdownfield", new ArrayList<>(fruits.keySet()), iChoiceRenderer)); - add(new CheckBoxMultipleChoice<>("checkboxfield", new ArrayList<>(fruits.keySet()), iChoiceRenderer)); + add(new RadioChoice<String>("radiofield", new ArrayList<String>(fruits.keySet()), iChoiceRenderer)); + add(new DropDownChoice<String>("dropdownfield", new ArrayList<String>(fruits.keySet()), iChoiceRenderer)); + add(new CheckBoxMultipleChoice<String>("checkboxfield", new ArrayList<String>(fruits.keySet()), iChoiceRenderer)); } http://git-wip-us.apache.org/repos/asf/wicket/blob/a289bd1e/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java index 0953587..d29ce87 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/EscapeAttributesInChoicesTest.java @@ -16,8 +16,8 @@ */ package org.apache.wicket.markup.html.form; +import org.apache.wicket.WicketTestCase; import org.apache.wicket.util.tester.TagTester; -import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; import static org.apache.wicket.util.tester.TagTester.createTagByAttribute;
