You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2013/05/14 18:38:23 UTC
svn commit: r1482440 -
/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java
Author: doogie
Date: Tue May 14 16:38:23 2013
New Revision: 1482440
URL: http://svn.apache.org/r1482440
Log:
FORMATTING: Improve formatting; no single-line if, use {} for if.
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java?rev=1482440&r1=1482439&r2=1482440&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java Tue May 14 16:38:23 2013
@@ -42,7 +42,9 @@ public class EntityFieldMap extends Enti
}
public static <V> List<EntityExpr> makeConditionList(Map<String, V> fieldMap, EntityComparisonOperator<?,V> op) {
- if (fieldMap == null) return new ArrayList<EntityExpr>();
+ if (fieldMap == null) {
+ return new ArrayList<EntityExpr>();
+ }
List<EntityExpr> list = new ArrayList<EntityExpr>(fieldMap.size());
for (Map.Entry<String, ? extends Object> entry: fieldMap.entrySet()) {
list.add(EntityCondition.makeCondition(entry.getKey(), op, entry.getValue()));
@@ -53,14 +55,18 @@ public class EntityFieldMap extends Enti
public <V> void init(EntityComparisonOperator<?,?> compOp, EntityJoinOperator joinOp, V... keysValues) {
super.init(makeConditionList(EntityUtil.makeFields(keysValues), UtilGenerics.<EntityComparisonOperator<String,V>>cast(compOp)), joinOp);
this.fieldMap = EntityUtil.makeFields(keysValues);
- if (this.fieldMap == null) this.fieldMap = new HashMap<String, Object>();
+ if (this.fieldMap == null) {
+ this.fieldMap = new HashMap<String, Object>();
+ }
this.operator = joinOp;
}
public <V> void init(Map<String, V> fieldMap, EntityComparisonOperator<?,?> compOp, EntityJoinOperator joinOp) {
super.init(makeConditionList(fieldMap, UtilGenerics.<EntityComparisonOperator<String,V>>cast(compOp)), joinOp);
this.fieldMap = fieldMap;
- if (this.fieldMap == null) this.fieldMap = new HashMap<String, Object>();
+ if (this.fieldMap == null) {
+ this.fieldMap = new HashMap<String, Object>();
+ }
this.operator = joinOp;
}