Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #622 from apache/WW-5133-labelposition

Browse Source 
[WW-5133] Drops labelposition attribute
This commit is contained in:
Lukasz Lenart
2022-10-24 10:12:39 +02:00
committed by GitHub
parent 936481e7ea 943cb62953
commit 58dcc830ea
36 changed files with 23 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/components/Checkbox.java
-11
View File
@@ -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) {
core/src/main/java/org/apache/struts2/components/UIBean.java
-11
View File
@@ -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;
core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
-9
View File
@@ -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;
}
core/src/main/resources/template/xhtml/validation.js
+2 -2
View File
@@ -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) {
core/src/site/resources/tags/a-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/actionerror-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/actionmessage-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/checkbox-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/checkboxlist-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/combobox-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/component-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/datetextfield-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/debug-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/doubleselect-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/fielderror-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/file-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/form-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/head-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/hidden-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/inputtransferselect-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/label-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/link-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/optiontransferselect-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/password-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/radio-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/reset-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/script-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/select-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/submit-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/textarea-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/textfield-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/token-attributes.html
-8
View File
@@ -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>
core/src/site/resources/tags/updownselect-attributes.html
-8
View File
@@ -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>
core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
+4 -4
View File
@@ -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).
core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
+12 -12
View File
@@ -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).
core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
+5 -5
View File
@@ -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().