Author: mrdon
Date: Wed Sep 13 20:17:51 2006
New Revision: 443205
URL: http://svn.apache.org/viewvc?view=rev&rev=443205
Log:
Remove the deprecated view tag attributes 'labelPosition' (all UI tags) and
'show' (password tag)
WW-1447
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java?view=diff&rev=443205&r1=443204&r2=443205
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java
Wed Sep 13 20:17:51 2006
@@ -71,12 +71,4 @@
this.showPassword = showPassword;
}
- /**
- * Deprecated. Use showPassword instead.
- * @s.tagattribute required="false" rtexprvalue="true"
- * @deprecated use [EMAIL PROTECTED] #setShowPassword(String)}
- */
- public void setShow(String showPassword) {
- this.showPassword = showPassword;
- }
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?view=diff&rev=443205&r1=443204&r2=443205
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
Wed Sep 13 20:17:51 2006
@@ -905,15 +905,6 @@
}
/**
- * deprecated.
- * @s.tagattribute required="false" default="left"
- * @deprecated please use [EMAIL PROTECTED] #setLabelposition(String)}
instead
- */
- public void setLabelPosition(String labelPosition) {
- this.labelPosition = labelPosition;
- }
-
- /**
* define label position of form element (top/left)
* @s.tagattribute required="false"
*/
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java?view=diff&rev=443205&r1=443204&r2=443205
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
Wed Sep 13 20:17:51 2006
@@ -119,13 +119,6 @@
this.label = label;
}
- /**
- * @deprecated please use [EMAIL PROTECTED] #setLabelposition} instead
- */
- public void setLabelPosition(String labelPosition) {
- this.labelPosition = labelPosition;
- }
-
public void setLabelposition(String labelPosition) {
this.labelPosition = labelPosition;
}
Modified: struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld?view=diff&rev=443205&r1=443204&r2=443205
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
(original)
+++ struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld Wed
Sep 13 20:17:51 2006
@@ -106,14 +106,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -441,14 +433,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -717,14 +701,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -993,14 +969,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1300,14 +1268,6 @@
</attribute>
<attribute>
- <name>show</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[Deprecated. Use showPassword
instead.]]></description>
-
- </attribute>
- <attribute>
<name>maxlength</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1405,14 +1365,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1767,14 +1719,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2133,14 +2077,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2512,14 +2448,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2796,14 +2724,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -3242,14 +3162,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -3554,14 +3466,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -3923,14 +3827,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -4233,14 +4129,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -4642,14 +4530,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -4935,14 +4815,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -5664,14 +5536,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -5972,14 +5836,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -6564,14 +6420,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -6872,14 +6720,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -7208,14 +7048,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -7595,14 +7427,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -7878,14 +7702,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -8294,14 +8110,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -8611,14 +8419,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -8912,14 +8712,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -9290,14 +9082,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -9566,14 +9350,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -10034,14 +9810,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -10368,14 +10136,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -10643,14 +10403,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -10920,14 +10672,6 @@
</attribute>
<attribute>
- <name>labelPosition</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[deprecated.]]></description>
-
- </attribute>
- <attribute>
<name>labelposition</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -11362,14 +11106,6 @@
<rtexprvalue>true</rtexprvalue>
<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>
