You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2013/06/19 17:52:27 UTC
svn commit: r1494668 -
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Author: adrianc
Date: Wed Jun 19 15:52:27 2013
New Revision: 1494668
URL: http://svn.apache.org/r1494668
Log:
Fix for NPE introduced in rev 1494057, reported by Ankit Jain on the dev mailing list.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1494668&r1=1494667&r2=1494668&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Wed Jun 19 15:52:27 2013
@@ -114,7 +114,7 @@ public class ModelFormField {
protected boolean separateColumn = false;
protected Boolean requiredField = null;
protected Boolean sortField = null;
- protected String sortFieldHelpText;
+ protected String sortFieldHelpText = "";
protected String headerLink;
protected String headerLinkStyle;
@@ -124,7 +124,7 @@ public class ModelFormField {
protected List<UpdateArea> onClickUpdateAreas;
// ===== CONSTRUCTORS =====
- /** Copy Constructor */
+ /** Default Constructor */
public ModelFormField(ModelForm modelForm) {
this.modelForm = modelForm;
}
@@ -244,7 +244,7 @@ public class ModelFormField {
if (UtilValidate.isNotEmpty(overrideFormField.tooltip)) this.tooltip = overrideFormField.tooltip;
if (overrideFormField.requiredField != null) this.requiredField = overrideFormField.requiredField;
if (overrideFormField.sortField != null) this.sortField = overrideFormField.sortField;
- if (!overrideFormField.sortFieldHelpText.isEmpty()) this.sortFieldHelpText = overrideFormField.sortFieldHelpText;
+ if (UtilValidate.isNotEmpty(overrideFormField.sortFieldHelpText)) this.sortFieldHelpText = overrideFormField.sortFieldHelpText;
if (UtilValidate.isNotEmpty(overrideFormField.titleAreaStyle)) this.titleAreaStyle = overrideFormField.titleAreaStyle;
if (UtilValidate.isNotEmpty(overrideFormField.widgetAreaStyle)) this.widgetAreaStyle = overrideFormField.widgetAreaStyle;
if (UtilValidate.isNotEmpty(overrideFormField.titleStyle)) this.titleStyle = overrideFormField.titleStyle;