You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/04/07 10:21:49 UTC
svn commit: r1671758 -
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java
Author: jleroux
Date: Tue Apr 7 08:21:49 2015
New Revision: 1671758
URL: http://svn.apache.org/r1671758
Log:
No functional changes, just a bit of refactoring/cleaning
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java?rev=1671758&r1=1671757&r2=1671758&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelFormFieldBuilder.java Tue Apr 7 08:21:49 2015
@@ -467,7 +467,7 @@ public class ModelFormFieldBuilder {
}
public String getParentFormName() {
- return this.parentFormName;
+ return parentFormName;
}
public String getTabindex() {
@@ -732,8 +732,6 @@ public class ModelFormFieldBuilder {
this.titleStyle = builder.getTitleStyle();
if (UtilValidate.isNotEmpty(builder.getWidgetStyle()))
this.widgetStyle = builder.getWidgetStyle();
- if (UtilValidate.isNotEmpty(builder.getParentFormName()))
- this.parentFormName = builder.getParentFormName();
if (UtilValidate.isNotEmpty(builder.getRedWhen()))
this.redWhen = builder.getRedWhen();
if (UtilValidate.isNotEmpty(builder.getEvent()))
@@ -754,6 +752,8 @@ public class ModelFormFieldBuilder {
this.onChangeUpdateAreas.addAll(builder.getOnChangeUpdateAreas());
if (UtilValidate.isNotEmpty(builder.getOnClickUpdateAreas()))
this.onClickUpdateAreas.addAll(builder.getOnClickUpdateAreas());
+ if (UtilValidate.isNotEmpty(builder.getParentFormName()))
+ this.parentFormName = builder.getParentFormName();
if (UtilValidate.isNotEmpty(builder.getTabindex()))
this.tabindex = builder.getTabindex();
this.encodeOutput = builder.getEncodeOutput();