svn commit: r1672752 [18/18] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/agreement/ applications/accounting/src/org/ofbiz/accounting/finaccount/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/s...

[nmalin]

Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java Fri Apr 10 20:22:54 2015
@@ -18,6 +18,8 @@
  *******************************************************************************/
 package org.ofbiz.webpos;
 
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -26,9 +28,6 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilGenerics;
@@ -154,7 +153,7 @@ public class WebPosEvents {
     public static String getProductType(HttpServletRequest request, HttpServletResponse response) {
         Map<String, Object> featureMap = null;
         Map<String, Object> variantTreeMap = null;
-        Map<String, Object> featureTypes = FastMap.newInstance();
+        Map<String, Object> featureTypes = new HashMap<String, Object>();
         WebPosSession webPosSession = getWebPosSession(request, null);
         if (webPosSession != null) {
             Delegator delegator = webPosSession.getDelegator();
@@ -184,7 +183,7 @@ public class WebPosEvents {
                                         if (UtilValidate.isNotEmpty(variantTree)) {
                                             request.setAttribute("variantTree", variantTree);
                                             request.setAttribute("variantTreeSize", variantTree.size());
-                                            List<String> featureOrder = FastList.newInstance();
+                                            List<String> featureOrder = new LinkedList<String>();
                                             featureOrder = UtilMisc.toList(featureSet);
                                             for (int i=0; i < featureOrder.size(); i++) {
                                                 String featureKey = featureOrder.get(i);
@@ -204,7 +203,7 @@ public class WebPosEvents {
                                         }
                                         Map<String, Object> imageMap = UtilGenerics.cast(variantTreeMap.get("variantSample"));
                                         if (UtilValidate.isNotEmpty(imageMap)) {
-                                            List<String> variantSampleList = FastList.newInstance();
+                                            List<String> variantSampleList = new LinkedList<String>();
                                             variantSampleList = UtilMisc.toList(imageMap.keySet());
                                             request.setAttribute("variantSample", imageMap);
                                             request.setAttribute("variantSampleList", variantSampleList);

Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/search/WebPosSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/search/WebPosSearch.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/search/WebPosSearch.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/search/WebPosSearch.java Fri Apr 10 20:22:54 2015
@@ -18,11 +18,10 @@
  *******************************************************************************/
 package org.ofbiz.webpos.search;
 
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import javolution.util.FastList;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
@@ -51,7 +50,7 @@ public class WebPosSearch {
         String goodIdentificationTypeId = (String) context.get("goodIdentificationTypeId");
         Map<String, Object> result = ServiceUtil.returnSuccess();
         
-        List<EntityCondition> andExprs = FastList.newInstance();
+        List<EntityCondition> andExprs = new LinkedList<EntityCondition>();
         EntityCondition mainCond = null;
         String entityName = "Product";
         
@@ -95,10 +94,10 @@ public class WebPosSearch {
         String shippingLocation = (String) context.get("shippingLocation");
         Map<String, Object> result = ServiceUtil.returnSuccess();
         
-        List<EntityCondition> andExprs = FastList.newInstance();
-        List<EntityCondition> orExprs = FastList.newInstance();
+        List<EntityCondition> andExprs = new LinkedList<EntityCondition>();
+        List<EntityCondition> orExprs = new LinkedList<EntityCondition>();
         EntityCondition mainCond = null;
-        List<String> orderBy = FastList.newInstance();
+        List<String> orderBy = new LinkedList<String>();
         
         // default view settings
         DynamicViewEntity dynamicView = new DynamicViewEntity();

Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java Fri Apr 10 20:22:54 2015
@@ -18,11 +18,10 @@
  *******************************************************************************/
 package org.ofbiz.webpos.session;
 
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilMisc;
@@ -44,7 +43,7 @@ public class WebPosSession {
     public static final String module = WebPosSession.class.getName();
 
     private String id = null;
-    private Map<String, Object> attributes = FastMap.newInstance();
+    private Map<String, Object> attributes = new HashMap<String, Object>();
     private GenericValue userLogin = null;
     private Locale locale = null;
     private String productStoreId = null;

Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Fri Apr 10 20:22:54 2015
@@ -19,12 +19,11 @@
 package org.ofbiz.webpos.transaction;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilDateTime;
@@ -419,7 +418,7 @@ public class WebPosTransaction {
             expYear = "20" + expYear;
         }
 
-        Map<String, Object> svcCtx = FastMap.newInstance();
+        Map<String, Object> svcCtx = new HashMap<String, Object>();
         svcCtx.put("userLogin", webPosSession.getUserLogin());
         svcCtx.put("partyId", partyId);
         svcCtx.put("cardNumber", cardNumber);

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/SideDeepCategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/SideDeepCategory.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/SideDeepCategory.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/SideDeepCategory.groovy Fri Apr 10 20:22:54 2015
@@ -19,7 +19,6 @@
 import org.ofbiz.base.util.*;
 import org.ofbiz.product.catalog.*;
 import org.ofbiz.product.category.*;
-import javolution.util.FastMap;
 
 CategoryWorker.getRelatedCategories(request, "topLevelList", CatalogWorker.getCatalogTopCategoryId(request, CatalogWorker.getCurrentCatalogId(request)), true);
 curCategoryId = parameters.category_id ?: parameters.CATEGORY_ID ?: "";
@@ -28,7 +27,7 @@ CategoryWorker.setTrail(request, curCate
 
 categoryList = request.getAttribute("topLevelList");
 if (categoryList) {
-    catContentWrappers = FastMap.newInstance();
+    catContentWrappers = [:];
     CategoryWorker.getCategoryContentWrappers(catContentWrappers, categoryList, request);
     context.catContentWrappers = catContentWrappers;
 }