You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2013/05/08 15:46:06 UTC
svn commit: r1480273 - in /struts/struts2/trunk/core/src/main:
java/org/apache/struts2/components/UIBean.java
java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
resources/template/xhtml/checkbox.ftl
resources/template/xhtml/controlheader-core.ftl
Author: lukaszlenart
Date: Wed May 8 13:46:05 2013
New Revision: 1480273
URL: http://svn.apache.org/r1480273
Log:
WW-4056 Changes case of requiredPosition getter to match tag attribute definition
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=1480273&r1=1480272&r2=1480273&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Wed May 8 13:46:05 2013
@@ -153,7 +153,7 @@ import java.util.concurrent.ConcurrentMa
* <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 Com
}
if (requiredPosition != null) {
- addParameter("requiredposition", findString(requiredPosition));
+ addParameter("requiredPosition", findString(requiredPosition));
}
if (errorPosition != null) {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java?rev=1480273&r1=1480272&r2=1480273&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java Wed May 8 13:46:05 2013
@@ -45,7 +45,7 @@ public abstract class AbstractUITag exte
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 exte
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 exte
this.labelPosition = labelPosition;
}
- public void setRequiredposition(String requiredPosition) {
- this.requiredposition = requiredPosition;
+ public void setRequiredPosition(String requiredPosition) {
+ this.requiredPosition = requiredPosition;
}
public void setErrorPosition(String errorPosition) {
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl?rev=1480273&r1=1480272&r2=1480273&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/checkbox.ftl Wed May 8 13:46:05 2013
@@ -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/>
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl?rev=1480273&r1=1480272&r2=1480273&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/controlheader-core.ftl Wed May 8 13:46:05 2013
@@ -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/>