svn commit: r1604038 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity: condition/EntityCondition.java sql/EntityPlanner.java

[doogie-3]

Author: doogie
Date: Thu Jun 19 21:38:48 2014
New Revision: 1604038

URL: http://svn.apache.org/r1604038
Log:
Remove the last uses of FastList from the entity engine.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java?rev=1604038&r1=1604037&r2=1604038&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java Thu Jun 19 21:38:48 2014
@@ -20,11 +20,11 @@ package org.ofbiz.entity.condition;
 
 import static org.ofbiz.base.util.UtilGenerics.cast;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import javolution.lang.Reusable;
-import javolution.util.FastList;
 
 import org.ofbiz.base.lang.IsEmpty;
 import org.ofbiz.entity.Delegator;
@@ -139,7 +139,7 @@ public abstract class EntityCondition ex
 
     @Override
     public String toString() {
-        return makeWhereString(null, FastList.<EntityConditionParam>newInstance(), null);
+        return makeWhereString(null, new ArrayList<EntityConditionParam>(), null);
     }
 
     public void accept(EntityConditionVisitor visitor) {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java?rev=1604038&r1=1604037&r2=1604038&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java Thu Jun 19 21:38:48 2014
@@ -18,13 +18,12 @@
  */
 package org.ofbiz.entity.sql;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import javolution.util.FastList;
-
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.model.DynamicViewEntity;
 import org.ofbiz.entity.model.ModelKeyMap;
@@ -232,7 +231,7 @@ public class EntityPlanner extends Plann
     }
 
     private static List<ModelKeyMap> buildKeyMaps(Iterable<KeyMap> keyMaps) {
-        List<ModelKeyMap> entityKeyMaps = FastList.newInstance();
+        List<ModelKeyMap> entityKeyMaps = new ArrayList<ModelKeyMap>();
         for (KeyMap keyMap: keyMaps) {
             entityKeyMaps.add(new ModelKeyMap(keyMap.getLeftFieldName(), keyMap.getRightFieldName()));
         }