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 a957244c7..100a54ed8 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -153,7 +153,7 @@ import java.util.concurrent.ConcurrentMap; * define label position of form element (top/left), default to left * * - * requiredposition + * requiredPosition * xhtml * String * define required label position of form element (left/right), default to right @@ -671,7 +671,7 @@ public abstract class UIBean extends Component { } if (requiredPosition != null) { - addParameter("requiredposition", findString(requiredPosition)); + addParameter("requiredPosition", findString(requiredPosition)); } if (errorPosition != null) { 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 386edfd1e..517e5144f 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 @@ -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) { diff --git a/core/src/main/resources/template/xhtml/checkbox.ftl b/core/src/main/resources/template/xhtml/checkbox.ftl index d49a4f571..10cdd3d1f 100644 --- a/core/src/main/resources/template/xhtml/checkbox.ftl +++ b/core/src/main/resources/template/xhtml/checkbox.ftl @@ -47,11 +47,11 @@ class="checkboxLabel"<#rt/> > -<#if parameters.required?default(false) && parameters.requiredposition?default("right") != 'right'> +<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'> *<#t/> ${parameters.label?html}<#t/> -<#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'> +<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'> *<#t/> :<#t/> @@ -79,11 +79,11 @@ ${parameters.label?html}<#t/> class="checkboxLabel"<#rt/> > -<#if parameters.required?default(false) && parameters.requiredposition?default("right") != 'right'> +<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'> *<#t/> ${parameters.label?html}<#t/> -<#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'> +<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'> *<#t/> :<#t/> diff --git a/core/src/main/resources/template/xhtml/controlheader-core.ftl b/core/src/main/resources/template/xhtml/controlheader-core.ftl index d9417a529..a73d9aac3 100644 --- a/core/src/main/resources/template/xhtml/controlheader-core.ftl +++ b/core/src/main/resources/template/xhtml/controlheader-core.ftl @@ -57,11 +57,11 @@ class="label"<#t/> ><#t/> -<#if parameters.required?default(false) && parameters.requiredposition?default("right") != 'right'> +<#if parameters.required?default(false) && parameters.requiredPosition?default("right") != 'right'> *<#t/> ${parameters.label?html}<#t/> -<#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'> +<#if parameters.required?default(false) && parameters.requiredPosition?default("right") == 'right'> *<#t/> ${parameters.labelseparator?default(":")?html}<#t/>