From fe455117129ff04d868e15fac5263be5e7720e17 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 27 Jun 2021 09:48:43 +0200 Subject: [PATCH] WW-5136 Makes class attribute deprecated --- core/src/main/java/org/apache/struts2/components/UIBean.java | 3 ++- .../java/org/apache/struts2/views/jsp/ui/AbstractUITag.java | 4 ++++ core/src/site/resources/tags/a.html | 2 +- core/src/site/resources/tags/actionerror.html | 2 +- core/src/site/resources/tags/actionmessage.html | 2 +- core/src/site/resources/tags/checkbox.html | 2 +- core/src/site/resources/tags/checkboxlist.html | 2 +- core/src/site/resources/tags/combobox.html | 2 +- core/src/site/resources/tags/component.html | 2 +- core/src/site/resources/tags/datetextfield.html | 2 +- core/src/site/resources/tags/debug.html | 2 +- core/src/site/resources/tags/doubleselect.html | 2 +- core/src/site/resources/tags/fielderror.html | 2 +- core/src/site/resources/tags/file.html | 2 +- core/src/site/resources/tags/form.html | 2 +- core/src/site/resources/tags/head.html | 2 +- core/src/site/resources/tags/hidden.html | 2 +- core/src/site/resources/tags/inputtransferselect.html | 2 +- core/src/site/resources/tags/label.html | 2 +- core/src/site/resources/tags/optiontransferselect.html | 2 +- core/src/site/resources/tags/password.html | 2 +- core/src/site/resources/tags/radio.html | 2 +- core/src/site/resources/tags/reset.html | 2 +- core/src/site/resources/tags/select.html | 2 +- core/src/site/resources/tags/submit.html | 2 +- core/src/site/resources/tags/textarea.html | 2 +- core/src/site/resources/tags/textfield.html | 2 +- core/src/site/resources/tags/token.html | 2 +- core/src/site/resources/tags/updownselect.html | 2 +- 29 files changed, 33 insertions(+), 28 deletions(-) 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 060d48b72c..21ae1d5880 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -1053,7 +1053,8 @@ public void setCssClass(String cssClass) { this.cssClass = cssClass; } - @StrutsTagAttribute(description="The css class to use for element - it's an alias of cssClass attribute.") + @Deprecated + @StrutsTagAttribute(description="(Deprecated) The css class to use for element - it's an alias of cssClass attribute.") public void setClass(String cssClass) { this.cssClass = cssClass; } 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 5c7a835dbc..6c43238056 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 @@ -135,6 +135,10 @@ public void setCssClass(String cssClass) { this.cssClass = cssClass; } + /** + * @deprecated Use {@link #setCssClass(String)} instead + */ + @Deprecated public void setClass(String cssClass) { this.cssClass = cssClass; } diff --git a/core/src/site/resources/tags/a.html b/core/src/site/resources/tags/a.html index 2001968195..48a63c9525 100644 --- a/core/src/site/resources/tags/a.html +++ b/core/src/site/resources/tags/a.html @@ -63,7 +63,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/actionerror.html b/core/src/site/resources/tags/actionerror.html index 6bb733d93d..1f5fb2c533 100644 --- a/core/src/site/resources/tags/actionerror.html +++ b/core/src/site/resources/tags/actionerror.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/actionmessage.html b/core/src/site/resources/tags/actionmessage.html index e22de1e7f3..7c07710f10 100644 --- a/core/src/site/resources/tags/actionmessage.html +++ b/core/src/site/resources/tags/actionmessage.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/checkbox.html b/core/src/site/resources/tags/checkbox.html index f40559c49b..c379e4c895 100644 --- a/core/src/site/resources/tags/checkbox.html +++ b/core/src/site/resources/tags/checkbox.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/checkboxlist.html b/core/src/site/resources/tags/checkboxlist.html index 39ce917ddf..8f0c2f4c01 100644 --- a/core/src/site/resources/tags/checkboxlist.html +++ b/core/src/site/resources/tags/checkboxlist.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/combobox.html b/core/src/site/resources/tags/combobox.html index 6051105015..9901d90eb2 100644 --- a/core/src/site/resources/tags/combobox.html +++ b/core/src/site/resources/tags/combobox.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/component.html b/core/src/site/resources/tags/component.html index 0ad47e785f..3eb8ae6f11 100644 --- a/core/src/site/resources/tags/component.html +++ b/core/src/site/resources/tags/component.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/datetextfield.html b/core/src/site/resources/tags/datetextfield.html index 030987d75f..d7bddb2b14 100644 --- a/core/src/site/resources/tags/datetextfield.html +++ b/core/src/site/resources/tags/datetextfield.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/debug.html b/core/src/site/resources/tags/debug.html index f274227649..821a036785 100644 --- a/core/src/site/resources/tags/debug.html +++ b/core/src/site/resources/tags/debug.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/doubleselect.html b/core/src/site/resources/tags/doubleselect.html index 82ce362d47..3cae8ebcad 100644 --- a/core/src/site/resources/tags/doubleselect.html +++ b/core/src/site/resources/tags/doubleselect.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/fielderror.html b/core/src/site/resources/tags/fielderror.html index 4ad39e684f..5d9140fc3d 100644 --- a/core/src/site/resources/tags/fielderror.html +++ b/core/src/site/resources/tags/fielderror.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/file.html b/core/src/site/resources/tags/file.html index c9aaa340b4..3e7c67e934 100644 --- a/core/src/site/resources/tags/file.html +++ b/core/src/site/resources/tags/file.html @@ -55,7 +55,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/form.html b/core/src/site/resources/tags/form.html index 268b705e97..d416676ca8 100644 --- a/core/src/site/resources/tags/form.html +++ b/core/src/site/resources/tags/form.html @@ -63,7 +63,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/head.html b/core/src/site/resources/tags/head.html index aefe87b359..f59edb63ac 100644 --- a/core/src/site/resources/tags/head.html +++ b/core/src/site/resources/tags/head.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/hidden.html b/core/src/site/resources/tags/hidden.html index b0d766fefd..97fdba159b 100644 --- a/core/src/site/resources/tags/hidden.html +++ b/core/src/site/resources/tags/hidden.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/inputtransferselect.html b/core/src/site/resources/tags/inputtransferselect.html index 6879c959e0..a4c848181e 100644 --- a/core/src/site/resources/tags/inputtransferselect.html +++ b/core/src/site/resources/tags/inputtransferselect.html @@ -87,7 +87,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/label.html b/core/src/site/resources/tags/label.html index 07c1f11947..4ea504faa6 100644 --- a/core/src/site/resources/tags/label.html +++ b/core/src/site/resources/tags/label.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/optiontransferselect.html b/core/src/site/resources/tags/optiontransferselect.html index 37ae0da93e..66ea9ef9bd 100644 --- a/core/src/site/resources/tags/optiontransferselect.html +++ b/core/src/site/resources/tags/optiontransferselect.html @@ -183,7 +183,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/password.html b/core/src/site/resources/tags/password.html index a712b6203c..f9087e0444 100644 --- a/core/src/site/resources/tags/password.html +++ b/core/src/site/resources/tags/password.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/radio.html b/core/src/site/resources/tags/radio.html index 98686ae257..384755f169 100644 --- a/core/src/site/resources/tags/radio.html +++ b/core/src/site/resources/tags/radio.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/reset.html b/core/src/site/resources/tags/reset.html index cb5c5f8dda..4992dbf5d8 100644 --- a/core/src/site/resources/tags/reset.html +++ b/core/src/site/resources/tags/reset.html @@ -55,7 +55,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/select.html b/core/src/site/resources/tags/select.html index da5056ad8c..dcb13b53bf 100644 --- a/core/src/site/resources/tags/select.html +++ b/core/src/site/resources/tags/select.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/submit.html b/core/src/site/resources/tags/submit.html index 12b243537e..afc871e41c 100644 --- a/core/src/site/resources/tags/submit.html +++ b/core/src/site/resources/tags/submit.html @@ -55,7 +55,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/textarea.html b/core/src/site/resources/tags/textarea.html index bbbeabff09..10f2289ff2 100644 --- a/core/src/site/resources/tags/textarea.html +++ b/core/src/site/resources/tags/textarea.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cols diff --git a/core/src/site/resources/tags/textfield.html b/core/src/site/resources/tags/textfield.html index 0f9666caf9..1f1877037f 100644 --- a/core/src/site/resources/tags/textfield.html +++ b/core/src/site/resources/tags/textfield.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/token.html b/core/src/site/resources/tags/token.html index 3b572f8cef..ab3e68a2f6 100644 --- a/core/src/site/resources/tags/token.html +++ b/core/src/site/resources/tags/token.html @@ -47,7 +47,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass diff --git a/core/src/site/resources/tags/updownselect.html b/core/src/site/resources/tags/updownselect.html index 16b37afca2..714875be1b 100644 --- a/core/src/site/resources/tags/updownselect.html +++ b/core/src/site/resources/tags/updownselect.html @@ -71,7 +71,7 @@

Attributes

false String - The css class to use for element - it's an alias of cssClass attribute. + (Deprecated) The css class to use for element - it's an alias of cssClass attribute. cssClass