Repository: wicket
Updated Branches:
  refs/heads/master d636c3d43 -> 156d4a327


WICKET-6004 Wicket 8 cleanup - minimize markup mangling


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d50bb0d7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d50bb0d7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d50bb0d7

Branch: refs/heads/master
Commit: d50bb0d7c04559e12f95aa197c9644301aede66e
Parents: d636c3d
Author: Sven Meier <[email protected]>
Authored: Tue Oct 13 10:39:50 2015 +0200
Committer: Sven Meier <[email protected]>
Committed: Fri Oct 16 14:24:25 2015 +0200

----------------------------------------------------------------------
 .../CheckBoxMultipleChoiceWicket6Listener.java  | 50 --------------------
 .../html/form/RadioChoiceWicket6Listener.java   | 50 --------------------
 2 files changed, 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/d50bb0d7/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
deleted file mode 100644
index 1969e75..0000000
--- 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoiceWicket6Listener.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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;
-import org.apache.wicket.application.IComponentInstantiationListener;
-
-/**
- * Restores the rendering behavior of CheckBoxMultipleChoice until Wicket 6.x.
- * That means:
- * <ul>
- *     <li>Uses <xmp><br/></xmp> as a suffix</li>
- *     <li>renders the label after the checkbox</li>
- * </ul>
- *
- * <p>
- *  Usage (in MyApplication#init()):
- *      getComponentInstantionListeners().add(new 
CheckBoxMultipleChoiceWicket6Listener());
- * </p>
- *
- * @deprecated Will be removed for Wicket 8.0.0. Use CSS for styling
- */
-@Deprecated
-public class CheckBoxMultipleChoiceWicket6Listener implements 
IComponentInstantiationListener
-{
-       @Override
-       public void onInstantiation(Component component)
-       {
-               if (component instanceof CheckBoxMultipleChoice<?>)
-               {
-                       CheckBoxMultipleChoice<?> checkBoxMultipleChoice = 
(CheckBoxMultipleChoice<?>) component;
-                       checkBoxMultipleChoice.setSuffix("<br/>\n");
-                       
checkBoxMultipleChoice.setLabelPosition(AbstractChoice.LabelPosition.AFTER);
-               }
-       }
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/d50bb0d7/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
deleted file mode 100644
index 36b8b5e..0000000
--- 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoiceWicket6Listener.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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;
-import org.apache.wicket.application.IComponentInstantiationListener;
-
-/**
- * Restores the rendering behavior of RadioChoice until Wicket 6.x.
- * That means:
- * <ul>
- *     <li>Uses <xmp><br/></xmp> as a suffix</li>
- *     <li>renders the label after the checkbox</li>
- * </ul>
- *
- * <p>
- *  Usage (in MyApplication#init()):
- *      getComponentInstantionListeners().add(new 
RadioChoiceWicket6Listener());
- * </p>
- *
- * @deprecated Will be removed for Wicket 8.0.0. Use CSS for styling
- */
-@Deprecated
-public class RadioChoiceWicket6Listener implements 
IComponentInstantiationListener
-{
-       @Override
-       public void onInstantiation(Component component)
-       {
-               if (component instanceof RadioChoice<?>)
-               {
-                       RadioChoice<?> radioChoice = (RadioChoice<?>) component;
-                       radioChoice.setSuffix("<br />\n");
-                       
radioChoice.setLabelPosition(AbstractChoice.LabelPosition.AFTER);
-               }
-       }
-}

Reply via email to