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

WW-4056 Changes case of requiredPosition getter to match tag attribute definition

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1480273 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-05-08 13:46:05 +00:00
parent 369063406d
commit 2580daa903
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/components/UIBean.java
+2 -2
View File
@@ -153,7 +153,7 @@ import java.util.concurrent.ConcurrentMap;
* <td>define label position of form element (top/left), default to left</td>
* </tr>
* <tr>
* <td>requiredposition</td>
* <td>requiredPosition</td>
* <td>xhtml</td>
* <td>String</td>
* <td>define required label position of form element (left/right), default to right</td>
@@ -671,7 +671,7 @@ public abstract class UIBean extends Component {
}
if (requiredPosition != null) {
addParameter("requiredposition", findString(requiredPosition));
addParameter("requiredPosition", findString(requiredPosition));
}
if (errorPosition != null) {
core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+4 -4
View File
@@ -45,7 +45,7 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam
protected String label;
protected String labelSeparator;
protected String labelPosition;
protected String requiredposition;
protected String requiredPosition;
protected String errorPosition;
protected String name;
protected String requiredLabel;
@@ -97,7 +97,7 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam
uiBean.setLabel(label);
uiBean.setLabelSeparator(labelSeparator);
uiBean.setLabelposition(labelPosition);
uiBean.setRequiredPosition(requiredposition);
uiBean.setRequiredPosition(requiredPosition);
uiBean.setErrorPosition(errorPosition);
uiBean.setName(name);
uiBean.setRequiredLabel(requiredLabel);
@@ -169,8 +169,8 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam
this.labelPosition = labelPosition;
}
public void setRequiredposition(String requiredPosition) {
this.requiredposition = requiredPosition;
public void setRequiredPosition(String requiredPosition) {
this.requiredPosition = requiredPosition;
}
public void setErrorPosition(String errorPosition) {
core/src/main/resources/template/xhtml/checkbox.ftl
+4 -4
View File
@@ -47,11 +47,11 @@
class="checkboxLabel"<#rt/>
</#if>
>
<#if parameters.required?default(false) && parameters.requiredposition?default("right") != 'right'>
<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
<span class="required">*</span><#t/>
</#if>
${parameters.label?html}<#t/>
<#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'>
<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
<span class="required">*</span><#t/>
</#if>
:<#t/>
@@ -79,11 +79,11 @@ ${parameters.label?html}<#t/>
class="checkboxLabel"<#rt/>
</#if>
>
<#if parameters.required?default(false) && parameters.requiredposition?default("right") != 'right'>
<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
<span class="required">*</span><#t/>
</#if>
${parameters.label?html}<#t/>
<#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'>
<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
<span class="required">*</span><#t/>
</#if>
:<#t/>
core/src/main/resources/template/xhtml/controlheader-core.ftl
+2 -2
View File
@@ -57,11 +57,11 @@
class="label"<#t/>
</#if>
><#t/>
<#if parameters.required?default(false) && parameters.requiredposition?default("right") != 'right'>
<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'>
<span class="required">*</span><#t/>
</#if>
${parameters.label?html}<#t/>
<#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'>
<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'>
<span class="required">*</span><#t/>
</#if>
${parameters.labelseparator?default(":")?html}<#t/>