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 5b4d99839..6c6b08a34 100644 --- a/core/src/main/java/org/apache/struts2/components/Checkbox.java +++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java @@ -91,7 +91,7 @@ public class Checkbox extends UIBean { @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); + super.setLabelposition(labelPosition); } @Override 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 21ae1d588..2dc82f630 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -1106,6 +1106,7 @@ public abstract class UIBean extends Component { @StrutsTagAttribute(description="(Deprecated) Define label position of form element (top/left)") @Deprecated public void setLabelposition(String labelPosition) { + LOG.warn("\"labelposition\" attribute is deprecated, please use \"labelPosition\" instead!"); 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 6c4323805..44bad4364 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 @@ -30,6 +30,7 @@ import java.util.Map; * Abstract base class for all UI tags. */ public abstract class AbstractUITag extends ComponentTagSupport implements DynamicAttributes { + protected String cssClass; protected String cssErrorClass; protected String cssStyle; @@ -38,6 +39,8 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam protected String disabled; protected String label; protected String labelSeparator; + @Deprecated + protected String labelposition; protected String labelPosition; protected String requiredPosition; protected String errorPosition; @@ -90,7 +93,11 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam uiBean.setDisabled(disabled); uiBean.setLabel(label); uiBean.setLabelSeparator(labelSeparator); - uiBean.setLabelPosition(labelPosition); + if (labelposition != null) { + uiBean.setLabelposition(labelposition); + } else { + uiBean.setLabelPosition(labelPosition); + } uiBean.setRequiredPosition(requiredPosition); uiBean.setErrorPosition(errorPosition); uiBean.setName(name); @@ -176,8 +183,8 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam * @deprecated use {@link #setLabelPosition(String)} instead */ @Deprecated - public void setLabelposition(String labelPosition) { - this.labelPosition = labelPosition; + public void setLabelposition(String labelposition) { + this.labelposition = labelposition; } public void setLabelPosition(String labelPosition) {