From 685a38d601d5edd10e616abcda3169b72d14cb18 Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Thu, 14 Sep 2006 03:17:51 +0000
Subject: [PATCH] Remove the deprecated view tag attributes 'labelPosition'
 (all UI tags) and 'show' (password tag) WW-1447

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@443205 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/struts2/components/Password.java   |   8 -
 .../org/apache/struts2/components/UIBean.java |   9 -
 .../struts2/views/jsp/ui/AbstractUITag.java   |   7 -
 .../main/resources/META-INF/struts-tags.tld   | 264 ------------------
 4 files changed, 288 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/components/Password.java b/core/src/main/java/org/apache/struts2/components/Password.java
index 52ec2675b..34dc017fd 100644
--- a/core/src/main/java/org/apache/struts2/components/Password.java
+++ b/core/src/main/java/org/apache/struts2/components/Password.java
@@ -71,12 +71,4 @@ public class Password extends TextField {
         this.showPassword = showPassword;
     }
 
-    /**
-     * Deprecated. Use showPassword instead.
-     * @s.tagattribute required="false" rtexprvalue="true"
-     * @deprecated use {@link #setShowPassword(String)}
-     */
-    public void setShow(String showPassword) {
-        this.showPassword = showPassword;
-    }
 }
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 365f2f4fe..56800b9dc 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -904,15 +904,6 @@ public abstract class UIBean extends Component {
         this.label = label;
     }
 
-    /**
-     * deprecated.
-     * @s.tagattribute required="false" default="left"
-     * @deprecated please use {@link #setLabelposition(String)} instead
-     */
-    public void setLabelPosition(String labelPosition) {
-        this.labelPosition = labelPosition;
-    }
-
     /**
      * define label position of form element (top/left)
      * @s.tagattribute required="false"
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
index a6f7bd5b5..cf9dbe48e 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
@@ -119,13 +119,6 @@ public abstract class AbstractUITag extends ComponentTagSupport {
         this.label = label;
     }
 
-    /**
-     * @deprecated please use {@link #setLabelposition} instead
-     */
-    public void setLabelPosition(String labelPosition) {
-        this.labelPosition = labelPosition;
-    }
-
     public void setLabelposition(String labelPosition) {
         this.labelPosition = labelPosition;
     }
diff --git a/core/src/main/resources/META-INF/struts-tags.tld b/core/src/main/resources/META-INF/struts-tags.tld
index 44bee5a44..1a515f132 100644
--- a/core/src/main/resources/META-INF/struts-tags.tld
+++ b/core/src/main/resources/META-INF/struts-tags.tld
@@ -104,14 +104,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -439,14 +431,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -715,14 +699,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -991,14 +967,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -1298,14 +1266,6 @@
 
             <description><![CDATA[Whether to show input]]></description>
 
-        </attribute>
-        <attribute>
-            <name>show</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[Deprecated. Use showPassword instead.]]></description>
-
         </attribute>
         <attribute>
             <name>maxlength</name>
@@ -1403,14 +1363,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -1765,14 +1717,6 @@
 
             <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -2131,14 +2075,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -2510,14 +2446,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -2794,14 +2722,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -3240,14 +3160,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -3552,14 +3464,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -3921,14 +3825,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -4231,14 +4127,6 @@
 
             <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -4640,14 +4528,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -4933,14 +4813,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -5662,14 +5534,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -5970,14 +5834,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -6562,14 +6418,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -6870,14 +6718,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -7206,14 +7046,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -7593,14 +7425,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -7876,14 +7700,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -8292,14 +8108,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -8609,14 +8417,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -8910,14 +8710,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -9288,14 +9080,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -9564,14 +9348,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -10032,14 +9808,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -10366,14 +10134,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -10641,14 +10401,6 @@
 
             <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -10918,14 +10670,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>
@@ -11363,14 +11107,6 @@
 
             <description><![CDATA[Label expression used for rendering a element specific label]]></description>
 
-        </attribute>
-        <attribute>
-            <name>labelPosition</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-
-            <description><![CDATA[deprecated.]]></description>
-
         </attribute>
         <attribute>
             <name>labelposition</name>