You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/07/23 17:05:47 UTC
git commit: Fix the build
Repository: wicket
Updated Branches:
refs/heads/master 0b0e0980d -> c73a4fe80
Fix the build
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c73a4fe8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c73a4fe8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c73a4fe8
Branch: refs/heads/master
Commit: c73a4fe807f8ea8cc7578a93a54da637651f629f
Parents: 0b0e098
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jul 23 18:05:21 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jul 23 18:05:21 2014 +0300
----------------------------------------------------------------------
.../form/CheckBoxMultipleChoiceWicket6Listener.java | 16 ++++++++++++++++
.../html/form/RadioChoiceWicket6Listener.java | 16 ++++++++++++++++
.../html/form/CheckBoxMultipleChoiceTest.java | 8 ++++----
.../wicket/markup/html/form/RadioChoiceTest.java | 8 ++++----
4 files changed, 40 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c73a4fe8/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceWicket6Listener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceWicket6Listener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceWicket6Listener.java
index 0958710..1969e75 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceWicket6Listener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceWicket6Listener.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.wicket.markup.html.form;
import org.apache.wicket.Component;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c73a4fe8/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoiceWicket6Listener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoiceWicket6Listener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoiceWicket6Listener.java
index 757dd1a..36b8b5e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoiceWicket6Listener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoiceWicket6Listener.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.wicket.markup.html.form;
import org.apache.wicket.Component;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c73a4fe8/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
index 219fedd..8ed5677 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceTest.java
@@ -152,7 +152,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
CheckBoxMultipleChoice<Integer> radioChoice = new CheckBoxMultipleChoice<Integer>("id", Arrays.asList(1));
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"id\"><input name=\"id\" type=\"checkbox\" value=\"0\" id=\"id1-id_0\"/><label for=\"id1-id_0\">1</label><br/>\n</span>");
+ tester.assertResultPage("<span wicket:id=\"id\"><input name=\"id\" type=\"checkbox\" value=\"0\" id=\"id1-id_0\"/><label for=\"id1-id_0\">1</label></span>");
}
@Test
@@ -162,7 +162,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.BEFORE);
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"id\"><label for=\"id1-id_0\">1</label><input name=\"id\" type=\"checkbox\" value=\"0\" id=\"id1-id_0\"/><br/>\n</span>");
+ tester.assertResultPage("<span wicket:id=\"id\"><label for=\"id1-id_0\">1</label><input name=\"id\" type=\"checkbox\" value=\"0\" id=\"id1-id_0\"/></span>");
}
@Test
@@ -172,7 +172,7 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_BEFORE);
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"id\"><label>1 <input name=\"id\" type=\"checkbox\" value=\"0\" id=\"id1-id_0\"/></label><br/>\n</span>");
+ tester.assertResultPage("<span wicket:id=\"id\"><label>1 <input name=\"id\" type=\"checkbox\" value=\"0\" id=\"id1-id_0\"/></label></span>");
}
@Test
@@ -182,6 +182,6 @@ public class CheckBoxMultipleChoiceTest extends WicketTestCase
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_AFTER);
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"id\"><label><input name=\"id\" type=\"checkbox\" value=\"0\" id=\"id1-id_0\"/> 1</label><br/>\n</span>");
+ tester.assertResultPage("<span wicket:id=\"id\"><label><input name=\"id\" type=\"checkbox\" value=\"0\" id=\"id1-id_0\"/> 1</label></span>");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/c73a4fe8/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
index 496a389..22d040f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioChoiceTest.java
@@ -29,7 +29,7 @@ public class RadioChoiceTest extends WicketTestCase
RadioChoice<Integer> radioChoice = new RadioChoice<Integer>("id", Arrays.asList(1));
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"id\"><input name=\"id\" type=\"radio\" value=\"0\" id=\"id1-0\"/><label for=\"id1-0\">1</label><br />\n</span>");
+ tester.assertResultPage("<span wicket:id=\"id\"><input name=\"id\" type=\"radio\" value=\"0\" id=\"id1-0\"/><label for=\"id1-0\">1</label></span>");
}
@Test
@@ -39,7 +39,7 @@ public class RadioChoiceTest extends WicketTestCase
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.BEFORE);
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"id\"><label for=\"id1-0\">1</label><input name=\"id\" type=\"radio\" value=\"0\" id=\"id1-0\"/><br />\n</span>");
+ tester.assertResultPage("<span wicket:id=\"id\"><label for=\"id1-0\">1</label><input name=\"id\" type=\"radio\" value=\"0\" id=\"id1-0\"/></span>");
}
@Test
@@ -49,7 +49,7 @@ public class RadioChoiceTest extends WicketTestCase
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_BEFORE);
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"id\"><label>1 <input name=\"id\" type=\"radio\" value=\"0\" id=\"id1-0\"/></label><br />\n</span>");
+ tester.assertResultPage("<span wicket:id=\"id\"><label>1 <input name=\"id\" type=\"radio\" value=\"0\" id=\"id1-0\"/></label></span>");
}
@Test
@@ -59,6 +59,6 @@ public class RadioChoiceTest extends WicketTestCase
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.WRAP_AFTER);
tester.startComponentInPage(radioChoice);
- tester.assertResultPage("<span wicket:id=\"id\"><label><input name=\"id\" type=\"radio\" value=\"0\" id=\"id1-0\"/> 1</label><br />\n</span>");
+ tester.assertResultPage("<span wicket:id=\"id\"><label><input name=\"id\" type=\"radio\" value=\"0\" id=\"id1-0\"/> 1</label></span>");
}
}