This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5133-labelposition in repository https://gitbox.apache.org/repos/asf/struts.git
commit 943cb6295393a784719e00dc4a9d0465e3d150ca Author: Lukasz Lenart <[email protected]> AuthorDate: Fri Oct 21 10:49:31 2022 +0200 WW-5133 Drops labelposition attribute --- .../org/apache/struts2/components/Checkbox.java | 11 ---------- .../java/org/apache/struts2/components/UIBean.java | 11 ---------- .../apache/struts2/views/jsp/ui/AbstractUITag.java | 9 -------- .../main/resources/template/xhtml/validation.js | 4 ++-- core/src/site/resources/tags/a-attributes.html | 8 -------- .../resources/tags/actionerror-attributes.html | 8 -------- .../resources/tags/actionmessage-attributes.html | 8 -------- .../site/resources/tags/checkbox-attributes.html | 8 -------- .../resources/tags/checkboxlist-attributes.html | 8 -------- .../site/resources/tags/combobox-attributes.html | 8 -------- .../site/resources/tags/component-attributes.html | 8 -------- .../resources/tags/datetextfield-attributes.html | 8 -------- core/src/site/resources/tags/debug-attributes.html | 8 -------- .../resources/tags/doubleselect-attributes.html | 8 -------- .../site/resources/tags/fielderror-attributes.html | 8 -------- core/src/site/resources/tags/file-attributes.html | 8 -------- core/src/site/resources/tags/form-attributes.html | 8 -------- core/src/site/resources/tags/head-attributes.html | 8 -------- .../src/site/resources/tags/hidden-attributes.html | 8 -------- .../tags/inputtransferselect-attributes.html | 8 -------- core/src/site/resources/tags/label-attributes.html | 8 -------- core/src/site/resources/tags/link-attributes.html | 8 -------- .../tags/optiontransferselect-attributes.html | 8 -------- .../site/resources/tags/password-attributes.html | 8 -------- core/src/site/resources/tags/radio-attributes.html | 8 -------- core/src/site/resources/tags/reset-attributes.html | 8 -------- .../src/site/resources/tags/script-attributes.html | 8 -------- .../src/site/resources/tags/select-attributes.html | 8 -------- .../src/site/resources/tags/submit-attributes.html | 8 -------- .../site/resources/tags/textarea-attributes.html | 8 -------- .../site/resources/tags/textfield-attributes.html | 8 -------- core/src/site/resources/tags/token-attributes.html | 8 -------- .../resources/tags/updownselect-attributes.html | 8 -------- .../apache/struts2/views/jsp/ui/CheckboxTest.java | 8 ++++---- .../apache/struts2/views/jsp/ui/FormTagTest.java | 24 +++++++++++----------- .../org/apache/struts2/views/jsp/ui/LabelTest.java | 10 ++++----- 36 files changed, 23 insertions(+), 286 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java index dd853caba..81ea73fa7 100644 --- a/core/src/main/java/org/apache/struts2/components/Checkbox.java +++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java @@ -96,17 +96,6 @@ public class Checkbox extends UIBean { this.submitUnchecked = submitUnchecked; } - /** - * Deprecated since 2.5.27 - * @deprecated use {@link #setLabelPosition(String)} instead - */ - @Deprecated - @Override - @StrutsTagAttribute(description="(Deprecated) Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme") - public void setLabelposition(String labelPosition) { - super.setLabelPosition(labelPosition); - } - @Override @StrutsTagAttribute(description="Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme") public void setLabelPosition(String labelPosition) { 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 4a4b5eb2b..5455960d5 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -689,7 +689,6 @@ public abstract class UIBean extends Component { if (labelPosition != null) { String labelPosition = findString(this.labelPosition); - addParameter("labelposition", labelPosition); addParameter("labelPosition", labelPosition); } @@ -1119,16 +1118,6 @@ public abstract class UIBean extends Component { this.labelSeparator = labelseparator; } - /** - * Deprecated since 2.5.27 - * @deprecated use {@link #setLabelPosition(String)} instead - */ - @StrutsTagAttribute(description="(Deprecated) Define label position of form element (top/left)") - @Deprecated - public void setLabelposition(String labelPosition) { - this.labelPosition = labelPosition; - } - @StrutsTagAttribute(description="Define label position of form element (top/left)") public void setLabelPosition(String labelPosition) { this.labelPosition = labelPosition; 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 345d37254..cb2b0b075 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 @@ -173,15 +173,6 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam this.label = label; } - /** - * Deprecated since 2.5.27 - * @deprecated use {@link #setLabelPosition(String)} instead - */ - @Deprecated - public void setLabelposition(String labelPosition) { - this.labelPosition = labelPosition; - } - public void setLabelPosition(String labelPosition) { this.labelPosition = labelPosition; } diff --git a/core/src/main/resources/template/xhtml/validation.js b/core/src/main/resources/template/xhtml/validation.js index feb1a9d14..abeaa7011 100644 --- a/core/src/main/resources/template/xhtml/validation.js +++ b/core/src/main/resources/template/xhtml/validation.js @@ -76,7 +76,7 @@ function clearErrorLabelsXHTML(form) { parentEl = null; } - //if labelposition is 'top' the label is on the row above + //if labelPosition is 'top' the label is on the row above if(parentEl && parentEl.cells) { var labelRow = parentEl.cells.length > 1 ? parentEl : StrutsUtils.previousElement(parentEl, "tr"); if (labelRow) { @@ -120,7 +120,7 @@ function addErrorXHTML(e, errorText) { table.insertBefore(tr, row); // update the label too - //if labelposition is 'top' the label is on the row above + //if labelPosition is 'top' the label is on the row above var labelRow = row.cells.length > 1 ? row : StrutsUtils.previousElement(tr, "tr"); var label = labelRow.cells[0].getElementsByTagName("label")[0]; if (label) { diff --git a/core/src/site/resources/tags/a-attributes.html b/core/src/site/resources/tags/a-attributes.html index e9fd9089c..dc26f4acb 100644 --- a/core/src/site/resources/tags/a-attributes.html +++ b/core/src/site/resources/tags/a-attributes.html @@ -197,14 +197,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">method</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/actionerror-attributes.html b/core/src/site/resources/tags/actionerror-attributes.html index 4d59c5fe1..4bde23efb 100644 --- a/core/src/site/resources/tags/actionerror-attributes.html +++ b/core/src/site/resources/tags/actionerror-attributes.html @@ -133,14 +133,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/actionmessage-attributes.html b/core/src/site/resources/tags/actionmessage-attributes.html index c00042bc1..1b8e70654 100644 --- a/core/src/site/resources/tags/actionmessage-attributes.html +++ b/core/src/site/resources/tags/actionmessage-attributes.html @@ -133,14 +133,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/checkbox-attributes.html b/core/src/site/resources/tags/checkbox-attributes.html index 23bc4b205..ca70c0528 100644 --- a/core/src/site/resources/tags/checkbox-attributes.html +++ b/core/src/site/resources/tags/checkbox-attributes.html @@ -133,14 +133,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left), also 'right' is supported when using 'xhtml' theme</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/checkboxlist-attributes.html b/core/src/site/resources/tags/checkboxlist-attributes.html index e75143e02..00eb35f80 100644 --- a/core/src/site/resources/tags/checkboxlist-attributes.html +++ b/core/src/site/resources/tags/checkboxlist-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">list</td> <td align="left" valign="top"><strong>true</strong></td> diff --git a/core/src/site/resources/tags/combobox-attributes.html b/core/src/site/resources/tags/combobox-attributes.html index c1c6454b3..d81412d76 100644 --- a/core/src/site/resources/tags/combobox-attributes.html +++ b/core/src/site/resources/tags/combobox-attributes.html @@ -149,14 +149,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">list</td> <td align="left" valign="top"><strong>true</strong></td> diff --git a/core/src/site/resources/tags/component-attributes.html b/core/src/site/resources/tags/component-attributes.html index d11ee7ece..b1c5caf56 100644 --- a/core/src/site/resources/tags/component-attributes.html +++ b/core/src/site/resources/tags/component-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/datetextfield-attributes.html b/core/src/site/resources/tags/datetextfield-attributes.html index 066ab75db..0e9d618f5 100644 --- a/core/src/site/resources/tags/datetextfield-attributes.html +++ b/core/src/site/resources/tags/datetextfield-attributes.html @@ -133,14 +133,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/debug-attributes.html b/core/src/site/resources/tags/debug-attributes.html index d11ee7ece..b1c5caf56 100644 --- a/core/src/site/resources/tags/debug-attributes.html +++ b/core/src/site/resources/tags/debug-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/doubleselect-attributes.html b/core/src/site/resources/tags/doubleselect-attributes.html index de13fdd73..7ddbe2f0e 100644 --- a/core/src/site/resources/tags/doubleselect-attributes.html +++ b/core/src/site/resources/tags/doubleselect-attributes.html @@ -413,14 +413,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">list</td> <td align="left" valign="top"><strong>true</strong></td> diff --git a/core/src/site/resources/tags/fielderror-attributes.html b/core/src/site/resources/tags/fielderror-attributes.html index 8e1b52154..7f0b4fae2 100644 --- a/core/src/site/resources/tags/fielderror-attributes.html +++ b/core/src/site/resources/tags/fielderror-attributes.html @@ -141,14 +141,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/file-attributes.html b/core/src/site/resources/tags/file-attributes.html index f456771ea..66a193d1b 100644 --- a/core/src/site/resources/tags/file-attributes.html +++ b/core/src/site/resources/tags/file-attributes.html @@ -133,14 +133,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/form-attributes.html b/core/src/site/resources/tags/form-attributes.html index 46784d5e3..73734a1c6 100644 --- a/core/src/site/resources/tags/form-attributes.html +++ b/core/src/site/resources/tags/form-attributes.html @@ -165,14 +165,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">method</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/head-attributes.html b/core/src/site/resources/tags/head-attributes.html index 4a93dab0f..e69d09195 100644 --- a/core/src/site/resources/tags/head-attributes.html +++ b/core/src/site/resources/tags/head-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/hidden-attributes.html b/core/src/site/resources/tags/hidden-attributes.html index 4a93dab0f..e69d09195 100644 --- a/core/src/site/resources/tags/hidden-attributes.html +++ b/core/src/site/resources/tags/hidden-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/inputtransferselect-attributes.html b/core/src/site/resources/tags/inputtransferselect-attributes.html index 1160bc9f5..d2f68a88d 100644 --- a/core/src/site/resources/tags/inputtransferselect-attributes.html +++ b/core/src/site/resources/tags/inputtransferselect-attributes.html @@ -189,14 +189,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">leftTitle</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/label-attributes.html b/core/src/site/resources/tags/label-attributes.html index 440ce9b72..b118c807b 100644 --- a/core/src/site/resources/tags/label-attributes.html +++ b/core/src/site/resources/tags/label-attributes.html @@ -133,14 +133,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/link-attributes.html b/core/src/site/resources/tags/link-attributes.html index 668f893e4..f340117f4 100644 --- a/core/src/site/resources/tags/link-attributes.html +++ b/core/src/site/resources/tags/link-attributes.html @@ -157,14 +157,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">media</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/optiontransferselect-attributes.html b/core/src/site/resources/tags/optiontransferselect-attributes.html index 074624e1e..78f12211e 100644 --- a/core/src/site/resources/tags/optiontransferselect-attributes.html +++ b/core/src/site/resources/tags/optiontransferselect-attributes.html @@ -549,14 +549,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">leftDownLabel</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/password-attributes.html b/core/src/site/resources/tags/password-attributes.html index 7fd3e771d..c3fb4ce77 100644 --- a/core/src/site/resources/tags/password-attributes.html +++ b/core/src/site/resources/tags/password-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">maxLength</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/radio-attributes.html b/core/src/site/resources/tags/radio-attributes.html index e75143e02..00eb35f80 100644 --- a/core/src/site/resources/tags/radio-attributes.html +++ b/core/src/site/resources/tags/radio-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">list</td> <td align="left" valign="top"><strong>true</strong></td> diff --git a/core/src/site/resources/tags/reset-attributes.html b/core/src/site/resources/tags/reset-attributes.html index e002708da..b2b742a08 100644 --- a/core/src/site/resources/tags/reset-attributes.html +++ b/core/src/site/resources/tags/reset-attributes.html @@ -133,14 +133,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">method</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/script-attributes.html b/core/src/site/resources/tags/script-attributes.html index 452acb390..aa9d22ba9 100644 --- a/core/src/site/resources/tags/script-attributes.html +++ b/core/src/site/resources/tags/script-attributes.html @@ -165,14 +165,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/select-attributes.html b/core/src/site/resources/tags/select-attributes.html index 75cbba6cb..b25f92ffc 100644 --- a/core/src/site/resources/tags/select-attributes.html +++ b/core/src/site/resources/tags/select-attributes.html @@ -149,14 +149,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">list</td> <td align="left" valign="top"><strong>true</strong></td> diff --git a/core/src/site/resources/tags/submit-attributes.html b/core/src/site/resources/tags/submit-attributes.html index 52ed55ad0..0d6ef2a8f 100644 --- a/core/src/site/resources/tags/submit-attributes.html +++ b/core/src/site/resources/tags/submit-attributes.html @@ -141,14 +141,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">method</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/textarea-attributes.html b/core/src/site/resources/tags/textarea-attributes.html index 60119551d..3b75f3045 100644 --- a/core/src/site/resources/tags/textarea-attributes.html +++ b/core/src/site/resources/tags/textarea-attributes.html @@ -133,14 +133,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">maxlength</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/textfield-attributes.html b/core/src/site/resources/tags/textfield-attributes.html index 194e76874..72fe987f4 100644 --- a/core/src/site/resources/tags/textfield-attributes.html +++ b/core/src/site/resources/tags/textfield-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">maxLength</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/token-attributes.html b/core/src/site/resources/tags/token-attributes.html index d11ee7ece..b1c5caf56 100644 --- a/core/src/site/resources/tags/token-attributes.html +++ b/core/src/site/resources/tags/token-attributes.html @@ -125,14 +125,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">name</td> <td align="left" valign="top">false</td> diff --git a/core/src/site/resources/tags/updownselect-attributes.html b/core/src/site/resources/tags/updownselect-attributes.html index 94b2d3099..b827b514e 100644 --- a/core/src/site/resources/tags/updownselect-attributes.html +++ b/core/src/site/resources/tags/updownselect-attributes.html @@ -173,14 +173,6 @@ <td align="left" valign="top">String</td> <td align="left" valign="top">String that will be appended to the label</td> </tr> - <tr> - <td align="left" valign="top">labelposition</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">false</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">(Deprecated) Define label position of form element (top/left)</td> - </tr> <tr> <td align="left" valign="top">list</td> <td align="left" valign="top"><strong>true</strong></td> diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java index 783d5aefd..7bed748c2 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java @@ -123,7 +123,7 @@ public class CheckboxTest extends AbstractUITagTest { tag.setFieldValue("baz"); tag.setOnfocus("test();"); tag.setTitle("mytitle"); - tag.setLabelposition("top"); + tag.setLabelPosition("top"); tag.doStartTag(); tag.doEndTag(); @@ -151,7 +151,7 @@ public class CheckboxTest extends AbstractUITagTest { tag.setFieldValue("baz"); tag.setOnfocus("test();"); tag.setTitle("mytitle"); - tag.setLabelposition("top"); + tag.setLabelPosition("top"); tag.doStartTag(); setComponentTagClearTagState(tag, true); // Ensure component tag state clearing is set true (to match tag). @@ -180,7 +180,7 @@ public class CheckboxTest extends AbstractUITagTest { tag.setFieldValue("baz"); tag.setOnfocus("test();"); tag.setTitle("mytitle"); - tag.setLabelposition("left"); + tag.setLabelPosition("left"); tag.doStartTag(); tag.doEndTag(); @@ -208,7 +208,7 @@ public class CheckboxTest extends AbstractUITagTest { tag.setFieldValue("baz"); tag.setOnfocus("test();"); tag.setTitle("mytitle"); - tag.setLabelposition("left"); + tag.setLabelPosition("left"); tag.doStartTag(); setComponentTagClearTagState(tag, true); // Ensure component tag state clearing is set true (to match tag). diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java index e9fba3ee6..6aa273574 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java @@ -1800,7 +1800,7 @@ public class FormTagTest extends AbstractUITagTest { form.setAction("testAction"); form.setPageContext(pageContext); form.setIncludeContext(false); - form.setLabelposition("top"); + form.setLabelPosition("top"); TextFieldTag text = new TextFieldTag(); text.setPageContext(pageContext); @@ -1835,7 +1835,7 @@ public class FormTagTest extends AbstractUITagTest { form.setAction("testAction"); form.setPageContext(pageContext); form.setIncludeContext(false); - form.setLabelposition("top"); + form.setLabelPosition("top"); TextFieldTag text = new TextFieldTag(); text.setPerformClearTagStateForTagPoolingServers(true); // Explicitly request tag state clearing. @@ -1874,12 +1874,12 @@ public class FormTagTest extends AbstractUITagTest { form.setAction("testAction"); form.setPageContext(pageContext); form.setIncludeContext(false); - form.setLabelposition("left"); + form.setLabelPosition("left"); TextFieldTag text = new TextFieldTag(); text.setPageContext(pageContext); text.setLabel("label"); - text.setLabelposition("top"); + text.setLabelPosition("top"); form.doStartTag(); text.doStartTag(); @@ -1910,13 +1910,13 @@ public class FormTagTest extends AbstractUITagTest { form.setAction("testAction"); form.setPageContext(pageContext); form.setIncludeContext(false); - form.setLabelposition("left"); + form.setLabelPosition("left"); TextFieldTag text = new TextFieldTag(); text.setPerformClearTagStateForTagPoolingServers(true); // Explicitly request tag state clearing. text.setPageContext(pageContext); text.setLabel("label"); - text.setLabelposition("top"); + text.setLabelPosition("top"); form.doStartTag(); setComponentTagClearTagState(form, true); // Ensure component tag state clearing is set true (to match tag). @@ -1950,7 +1950,7 @@ public class FormTagTest extends AbstractUITagTest { form.setAction("testAction"); form.setPageContext(pageContext); form.setIncludeContext(false); - form.setLabelposition("top"); + form.setLabelPosition("top"); TextFieldTag text = new TextFieldTag(); text.setPageContext(pageContext); @@ -1985,7 +1985,7 @@ public class FormTagTest extends AbstractUITagTest { form.setAction("testAction"); form.setPageContext(pageContext); form.setIncludeContext(false); - form.setLabelposition("top"); + form.setLabelPosition("top"); TextFieldTag text = new TextFieldTag(); text.setPerformClearTagStateForTagPoolingServers(true); // Explicitly request tag state clearing. @@ -2024,12 +2024,12 @@ public class FormTagTest extends AbstractUITagTest { form.setAction("testAction"); form.setPageContext(pageContext); form.setIncludeContext(false); - form.setLabelposition("left"); + form.setLabelPosition("left"); TextFieldTag text = new TextFieldTag(); text.setPageContext(pageContext); text.setLabel("label"); - text.setLabelposition("top"); + text.setLabelPosition("top"); form.doStartTag(); text.doStartTag(); @@ -2060,13 +2060,13 @@ public class FormTagTest extends AbstractUITagTest { form.setAction("testAction"); form.setPageContext(pageContext); form.setIncludeContext(false); - form.setLabelposition("left"); + form.setLabelPosition("left"); TextFieldTag text = new TextFieldTag(); text.setPerformClearTagStateForTagPoolingServers(true); // Explicitly request tag state clearing. text.setPageContext(pageContext); text.setLabel("label"); - text.setLabelposition("top"); + text.setLabelPosition("top"); form.doStartTag(); setComponentTagClearTagState(form, true); // Ensure component tag state clearing is set true (to match tag). diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java index c277ef9ee..7bc5a7c54 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java @@ -80,7 +80,7 @@ public class LabelTest extends AbstractUITagTest { strutsBodyTagsAreReflectionEqual(tag, freshTag)); } - public void testSimpleWithLabelposition() throws Exception { + public void testSimpleWithLabelPosition() throws Exception { TestAction testAction = (TestAction) action; testAction.setFoo("bar"); @@ -89,7 +89,7 @@ public class LabelTest extends AbstractUITagTest { tag.setLabel("mylabel"); tag.setName("myname"); tag.setValue("%{foo}"); - tag.setLabelposition("top"); + tag.setLabelPosition("top"); tag.doStartTag(); tag.doEndTag(); @@ -104,7 +104,7 @@ public class LabelTest extends AbstractUITagTest { strutsBodyTagsAreReflectionEqual(tag, freshTag)); } - public void testSimpleWithLabelposition_clearTagStateSet() throws Exception { + public void testSimpleWithLabelPosition_clearTagStateSet() throws Exception { TestAction testAction = (TestAction) action; testAction.setFoo("bar"); @@ -114,7 +114,7 @@ public class LabelTest extends AbstractUITagTest { tag.setLabel("mylabel"); tag.setName("myname"); tag.setValue("%{foo}"); - tag.setLabelposition("top"); + tag.setLabelPosition("top"); tag.doStartTag(); setComponentTagClearTagState(tag, true); // Ensure component tag state clearing is set true (to match tag). @@ -398,7 +398,7 @@ public class LabelTest extends AbstractUITagTest { tag.doStartTag(); tag.doEndTag(); - + verify(LabelTest.class.getResource("Label-7.txt")); // Basic sanity check of clearTagStateForTagPoolingServers() behaviour for Struts Tags after doEndTag().
