You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/04/10 22:22:59 UTC

svn commit: r1672752 [15/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...

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Fri Apr 10 20:22:54 2015
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -31,9 +32,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.UtilGenerics;
 import org.ofbiz.base.util.UtilHttp;
@@ -118,7 +116,7 @@ public class EbayEvents {
                 String ratingShipHand = (String)requestParams.get("ratingShipHand"+i);
                 String AqItemAsDescribedId = (String)requestParams.get("AqItemAsDescribedId"+i);
 
-                Map<String, Object> leavefeedback =  FastMap.newInstance();
+                Map<String, Object> leavefeedback =  new HashMap<String, Object>();
                 leavefeedback.put("productStoreId", productStoreId);
                 leavefeedback.put("userLogin", userLogin);
                 leavefeedback.put("itemId", itemId);
@@ -162,7 +160,7 @@ public class EbayEvents {
             try {
                 productIds = UtilGenerics.checkList(requestParams.get("selectResult"));
             } catch (ClassCastException e) {
-                if (UtilValidate.isEmpty(productIds)) productIds = FastList.newInstance();
+                if (UtilValidate.isEmpty(productIds)) productIds = new LinkedList<String>();
                 productIds.add((String) requestParams.get("selectResult"));
             }
         } else {
@@ -179,7 +177,7 @@ public class EbayEvents {
         if (UtilValidate.isNotEmpty(addItemObject.get("itemListings"))) {
             itemObjs = UtilGenerics.checkList(addItemObject.get("itemListings"));
         } else {
-            itemObjs = FastList.newInstance();
+            itemObjs = new LinkedList<Map<String,Object>>();
         }
 
         if (UtilValidate.isNotEmpty(productIds)) {
@@ -251,7 +249,7 @@ public class EbayEvents {
                         }
                     }
                     if (UtilValidate.isEmpty(itemListing)) {
-                        itemListing = FastMap.newInstance();
+                        itemListing = new HashMap<String, Object>();
                         itemListing.put("addItemCall", addItemCall);
                         itemListing.put("productId", productId);
                     }
@@ -360,7 +358,7 @@ public class EbayEvents {
             session.setAttribute("itemListings_".concat(siteCode), addItemObject);
         }
         if (addItemObject == null) {
-            addItemObject = FastMap.newInstance();
+            addItemObject = new HashMap<String, Object>();
             session.setAttribute("itemListings_".concat(siteCode), addItemObject);
         }
         return addItemObject;
@@ -368,7 +366,7 @@ public class EbayEvents {
 
     // make ebay category list
     public static List<CategoryType> getChildCategories(HttpServletRequest request) throws ApiException, SdkException, Exception{
-        List<CategoryType> categories = FastList.newInstance();
+        List<CategoryType> categories = new LinkedList<CategoryType>();
         EbayStoreSiteFacade sf = null;
         String categoryId = null;
 
@@ -426,8 +424,8 @@ public class EbayEvents {
     }
 
     public static List<StoreCustomCategoryType> getStoreChildCategories(HttpServletRequest request) throws ApiException, SdkException, Exception {
-        List<StoreCustomCategoryType> categories = FastList.newInstance();
-        List<StoreCustomCategoryType> csCateList = FastList.newInstance();
+        List<StoreCustomCategoryType> categories = new LinkedList<StoreCustomCategoryType>();
+        List<StoreCustomCategoryType> csCateList = new LinkedList<StoreCustomCategoryType>();
         EbayStoreSiteFacade sf = null;
         String categoryId = null;
 
@@ -645,8 +643,8 @@ public class EbayEvents {
         
         // initialize request parameter.
         Map<String, Object> paramMap = UtilHttp.getParameterMap(request);
-        List<String> nameSpecificList = FastList.newInstance();
-        List<String> valueSpecificList = FastList.newInstance();
+        List<String> nameSpecificList = new LinkedList<String>();
+        List<String> valueSpecificList = new LinkedList<String>();
         String nameValueListType = null;
         String valueListType = null;
         int rowCount = UtilHttp.getMultiFormRowCount(paramMap);
@@ -676,7 +674,7 @@ public class EbayEvents {
             if (UtilValidate.isNotEmpty(addItemObject.get("itemListing"))) {
                 listAddItem = UtilGenerics.checkList(addItemObject.get("itemListing"));
             } else {
-                listAddItem = FastList.newInstance();
+                listAddItem = new LinkedList<Map<String,Object>>();
             }
 
             for (Map<String,Object> itemObj : listAddItem) {
@@ -871,7 +869,7 @@ public class EbayEvents {
                                 int intAtp = atp.intValue();
                                 if ((facilityId != "")  && (intAtp != 0)) {
                                     int newAtp = intAtp - 1;
-                                    Map<String,Object> inMap = FastMap.newInstance();
+                                    Map<String,Object> inMap = new HashMap<String, Object>();
                                     inMap.put("productStoreId", productStoreId);
                                     inMap.put("facilityId", facilityId);
                                     inMap.put("productId", productId);
@@ -891,7 +889,7 @@ public class EbayEvents {
                         addItemCall.setItem(item);
 
                         // create/update EbayProductListing entity
-                        Map<String, Object> prodMap = FastMap.newInstance();
+                        Map<String, Object> prodMap = new HashMap<String, Object>();
                         prodMap.put("productStoreId", productStoreId);
                         prodMap.put("productId", productId);
                         prodMap.put("userLogin", userLogin);
@@ -942,7 +940,7 @@ public class EbayEvents {
                         // create/update EbayProductListingAttribute
                         if (UtilValidate.isNotEmpty(productListingId)) {
                             attributeMapList.put("productListingId", productListingId);
-                            Map<String, Object> ebayProdAttrMap = FastMap.newInstance();
+                            Map<String, Object> ebayProdAttrMap = new HashMap<String, Object>();
                             ebayProdAttrMap.put("productListingId", productListingId);
                             ebayProdAttrMap.put("userLogin", userLogin);
                             ebayProdAttrMap.put("attributeMapList", attributeMapList);
@@ -988,7 +986,7 @@ public class EbayEvents {
             if (UtilValidate.isNotEmpty(addItemObject.get("itemListing"))) {
                 listAddItem = UtilGenerics.checkList(addItemObject.get("itemListing"));
             } else {
-                listAddItem = FastList.newInstance();
+                listAddItem = new LinkedList<Map<String,Object>>();
             }
             double feesummary = 0.0;
             for (Map<String,Object> itemObj : listAddItem) {
@@ -1043,7 +1041,7 @@ public class EbayEvents {
             if (UtilValidate.isNotEmpty(addItemObject.get("itemListing"))) {
                 listAddItem = UtilGenerics.checkList(addItemObject.get("itemListing"));
             } else {
-                listAddItem = FastList.newInstance();
+                listAddItem = new LinkedList<Map<String,Object>>();
             }
             int i = 0;
             for (Map<String,Object> itemObj : listAddItem) {
@@ -1085,7 +1083,7 @@ public class EbayEvents {
             if (UtilValidate.isNotEmpty(addItemObject.get("itemListing"))) {
                 listAddItem = UtilGenerics.checkList(addItemObject.get("itemListing"));
             } else {
-                listAddItem = FastList.newInstance();
+                listAddItem = new LinkedList<Map<String,Object>>();
             }
             for (Map<String,Object> itemObj : listAddItem) {
                 updateQuantityInventoryProduct(itemObj, productStoreId, locale, delegator, dispatcher, userLogin);
@@ -1143,7 +1141,7 @@ public class EbayEvents {
     }
     
     public static Map<String, Map<String, List<String>>> categorySpecifics(String categoryId, HttpServletRequest request) {
-        Map<String, Map<String, List<String>>> recommendationMap = FastMap.newInstance();
+        Map<String, Map<String, List<String>>> recommendationMap = new HashMap<String, Map<String,List<String>>>();
         Delegator delegator = (Delegator) request.getAttribute("delegator");
         Map<String,Object> requestParams = UtilHttp.getParameterMap(request);
         Locale locale = UtilHttp.getLocale(request);
@@ -1164,10 +1162,10 @@ public class EbayEvents {
             
             for (int i = 0; i < recommend.length; i++) {
                 NameRecommendationType[] nameRecommend = recommend[i].getNameRecommendation();
-                Map<String, List<String>> nameRecommendationMap = FastMap.newInstance();
+                Map<String, List<String>> nameRecommendationMap = new HashMap<String, List<String>>();
                 for (int j = 0; j < nameRecommend.length; j++) {
                     String name = nameRecommend[j].getName();
-                    List<String> valueList = FastList.newInstance();
+                    List<String> valueList = new LinkedList<String>();
                     ValueRecommendationType[] valueRecommend = nameRecommend[j].getValueRecommendation();
                     for (int k = 0; k < valueRecommend.length; k++) {
                         String value = valueRecommend[k].getValue();

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java Fri Apr 10 20:22:54 2015
@@ -48,15 +48,12 @@ import com.ebay.soap.eBLBaseComponents.S
 import com.ebay.soap.eBLBaseComponents.TransactionArrayType;
 import com.ebay.soap.eBLBaseComponents.TransactionType;
 
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
 public class EbayFeedback {
 
     public static final String resource = "EbayUiLabels";
 
     public static Map<String, Object> loadFeedback(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         LocalDispatcher dispatcher = dctx.getDispatcher();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Delegator delegator = dctx.getDelegator();
@@ -65,7 +62,7 @@ public class EbayFeedback {
 
         ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
         try {
-            Map<String, Object> inMap = FastMap.newInstance();
+            Map<String, Object> inMap = new HashMap<String, Object>();
             inMap.put("productStoreId", productStoreId);
             inMap.put("userLogin", userLogin);
             Map<String, Object> resultUser = dispatcher.runSync("getEbayStoreUser", inMap);
@@ -212,12 +209,12 @@ public class EbayFeedback {
     }
 
     public static Map<String, Object> getItemsAwaitingFeedback(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");
         ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
-        List<Map<String, Object>> itemsResult = FastList.newInstance();
+        List<Map<String, Object>> itemsResult = new LinkedList<Map<String,Object>>();
         try {
             GetItemsAwaitingFeedbackCall awaitingFeedbackCall = new GetItemsAwaitingFeedbackCall();
             awaitingFeedbackCall.setApiContext(apiContext);
@@ -227,7 +224,7 @@ public class EbayFeedback {
             GetUserCall getUserCall = new GetUserCall(apiContext);
             String commentingUser = getUserCall.getUser().getUserID();
             for (int i = 0;i < items.getTransactionLength(); i++) {
-                Map<String, Object> entry = FastMap.newInstance();
+                Map<String, Object> entry = new HashMap<String, Object>();
                 TransactionType transection = items.getTransaction(i);
                 entry.put("itemID", transection.getItem().getItemID());
                 entry.put("commentingUser", commentingUser);
@@ -267,7 +264,7 @@ public class EbayFeedback {
     }
 
     public static Map<String, Object> leaveFeedback(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object>result = FastMap.newInstance();
+        Map<String, Object>result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Fri Apr 10 20:22:54 2015
@@ -32,7 +32,10 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -40,9 +43,6 @@ import java.util.Map;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
 
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilGenerics;
@@ -184,7 +184,7 @@ public class EbayStore {
         outputStream.close();
         int responseCode = connection.getResponseCode();
         InputStream inputStream;
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         String response = null;
 
         if (responseCode == HttpURLConnection.HTTP_CREATED ||
@@ -221,7 +221,7 @@ public class EbayStore {
     public static Map<String,Object> exportCategoriesSelectedToEbayStore(DispatchContext dctx, Map<String,? extends Object>  context) {
         Locale locale = (Locale) context.get("locale");
         Delegator delegator = dctx.getDelegator();
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         SetStoreCategoriesRequestType req = null;
         StoreCustomCategoryArrayType categoryArrayType = null;
 
@@ -238,8 +238,8 @@ public class EbayStore {
 
             catalogCategories = EntityQuery.use(delegator).from("ProdCatalogCategory").where("prodCatalogId", context.get("prodCatalogId").toString(),"prodCatalogCategoryTypeId","PCCT_EBAY_ROOT").orderBy("sequenceNum ASC").queryList();
             if (catalogCategories != null && catalogCategories.size() > 0) {
-                List<StoreCustomCategoryType> listAdd = FastList.newInstance();
-                List<StoreCustomCategoryType> listEdit = FastList.newInstance();
+                List<StoreCustomCategoryType> listAdd = new LinkedList<StoreCustomCategoryType>();
+                List<StoreCustomCategoryType> listEdit = new LinkedList<StoreCustomCategoryType>();
                 //start at level 0 of categories
                 for (GenericValue catalogCategory : catalogCategories) {
                     GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory", false);
@@ -272,8 +272,8 @@ public class EbayStore {
                 }
 
                 //start at level 1 of categories
-                listAdd = FastList.newInstance();
-                listEdit = FastList.newInstance();
+                listAdd = new LinkedList<StoreCustomCategoryType>();
+                listEdit = new LinkedList<StoreCustomCategoryType>();
                 for (GenericValue catalogCategory : catalogCategories) {
                     GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory", false);
                     if (productCategory != null) {
@@ -313,8 +313,8 @@ public class EbayStore {
                     }
                 }
                 //start at level 2 of categories
-                listAdd = FastList.newInstance();
-                listEdit = FastList.newInstance();
+                listAdd = new LinkedList<StoreCustomCategoryType>();
+                listEdit = new LinkedList<StoreCustomCategoryType>();
                 for (GenericValue catalogCategory : catalogCategories) {
                     GenericValue productCategory = catalogCategory.getRelatedOne("ProductCategory", false);
                     if (productCategory != null) {
@@ -385,7 +385,7 @@ public class EbayStore {
     }
 
     public static Map<String, Object> excuteExportCategoryToEbayStore(SetStoreCategoriesCall  call, SetStoreCategoriesRequestType req, StoreCategoryUpdateActionCodeType actionCode,Delegator delegator, String partyId,List<GenericValue> catalogCategories, Locale locale) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         SetStoreCategoriesResponseType resp = null;
         try {
             if (req != null && actionCode != null) {
@@ -544,7 +544,7 @@ public class EbayStore {
 
     public static Map<String, Object> readEbayGetStoreCategoriesResponse(String msg, Locale locale) {
         Map<String, Object> results = null;
-        List<Map<Object, Object>> categories = FastList.newInstance();
+        List<Map<Object, Object>> categories = new LinkedList<Map<Object, Object>>();
         try {
             Document docResponse = UtilXml.readXmlDocument(msg, true);
             Element elemResponse = docResponse.getDocumentElement();
@@ -575,7 +575,7 @@ public class EbayStore {
                         List<Element> customCategory = UtilGenerics.checkList(UtilXml.childElementList(customCategoriesElemIterElement, "CustomCategory"));
                         Iterator<Element> customCategoryElemIter = customCategory.iterator();
                         while (customCategoryElemIter.hasNext()) {
-                            Map<Object, Object> categ = FastMap.newInstance();
+                            Map<Object, Object> categ = new HashMap<Object, Object>();
                             Element categoryElement = customCategoryElemIter.next();
                             categ.put("CategoryID", UtilXml.childElementValue(categoryElement, "CategoryID"));
                             categ.put("CategoryName", UtilXml.childElementValue(categoryElement, "Name"));
@@ -594,7 +594,7 @@ public class EbayStore {
     }
 
     public static Map<String, Object> getEbayStoreUser(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         String productStoreId = (String) context.get("productStoreId");
         try {
@@ -619,7 +619,7 @@ public class EbayStore {
         Locale locale = (Locale) context.get("locale");
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Delegator delegator = dctx.getDelegator();
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         StoreType returnedStoreType = null;
         GetStoreRequestType req = new GetStoreRequestType();
         GetStoreResponseType resp =  null;
@@ -654,7 +654,7 @@ public class EbayStore {
                     //result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "EbayStoreLoadSuccess", locale));
                     // update product store in ofbiz
                     updateProductStore(dctx, context, returnedStoreType,(String) context.get("productStoreId"));
-                    Map<String,Object> ebayResp = FastMap.newInstance();
+                    Map<String,Object> ebayResp = new HashMap<String, Object>();
                     ebayResp.put("storeName", returnedStoreType.getName());
                     ebayResp.put("storeUrl", returnedStoreType.getURL());
                     ebayResp.put("storeUrlPath", returnedStoreType.getURLPath());
@@ -707,10 +707,10 @@ public class EbayStore {
                     ebayResp.put("storeHeaderStyle", storeHeaderStyleCodeType.value());
                     StoreHeaderStyleCodeType[] storeHeaderStyleCodeList =  StoreHeaderStyleCodeType.values();
                     if (storeHeaderStyleCodeList != null) {
-                        List<Map<String,Object>> storeHeaderStyleList  = FastList.newInstance();
+                        List<Map<String,Object>> storeHeaderStyleList = new LinkedList<Map<String, Object>>();
                         int i=0;
                         while (i<storeHeaderStyleCodeList.length) {
-                            Map<String,Object> storeHeaderStyleMap = FastMap.newInstance();
+                            Map<String,Object> storeHeaderStyleMap = new HashMap<String, Object>();
                             StoreHeaderStyleCodeType storeHeaderStyleCode = storeHeaderStyleCodeList[i];
                             storeHeaderStyleMap.put("storeHeaderStyleName", storeHeaderStyleCode.name());
                             storeHeaderStyleMap.put("storeHeaderStyleValue", storeHeaderStyleCode.value());
@@ -726,10 +726,10 @@ public class EbayStore {
                     ebayResp.put("storeItemLayoutSelected", storeItemListLayoutCodeType.value());
                     StoreItemListLayoutCodeType[] storeItemListLayoutCodeTypeList = StoreItemListLayoutCodeType.values();
                     if (storeItemListLayoutCodeTypeList != null) {
-                        List<Map<String,Object>> storeItemListLayoutCodeList  = FastList.newInstance();
+                        List<Map<String,Object>> storeItemListLayoutCodeList  = new LinkedList<Map<String, Object>>();
                         int i = 0;
                         while (i < storeItemListLayoutCodeTypeList.length) {
-                            Map<String,Object> storeItemListLayoutCodeMap = FastMap.newInstance();
+                            Map<String,Object> storeItemListLayoutCodeMap = new HashMap<String, Object>();
                             StoreItemListLayoutCodeType storeItemListLayoutCode = storeItemListLayoutCodeTypeList[i];
                             storeItemListLayoutCodeMap.put("storeItemLayoutName", storeItemListLayoutCode.name());
                             storeItemListLayoutCodeMap.put("storeItemLayoutValue", storeItemListLayoutCode.value());
@@ -742,10 +742,10 @@ public class EbayStore {
                     ebayResp.put("storeItemSortOrderSelected", storeItemListSortOrderCodeType.value());
                     StoreItemListSortOrderCodeType[] storeItemListSortOrderCodeTypeList = StoreItemListSortOrderCodeType.values();
                     if (storeItemListSortOrderCodeTypeList != null) {
-                        List<Map<String,Object>> storeItemSortOrderCodeList  = FastList.newInstance();
+                        List<Map<String,Object>> storeItemSortOrderCodeList  = new LinkedList<Map<String, Object>>();
                         int i = 0;
                         while (i < storeItemListSortOrderCodeTypeList.length) {
-                            Map<String,Object> storeItemSortOrderCodeMap = FastMap.newInstance();
+                            Map<String,Object> storeItemSortOrderCodeMap = new HashMap<String, Object>();
                             StoreItemListSortOrderCodeType storeItemListLayoutCode = storeItemListSortOrderCodeTypeList[i];
                             storeItemSortOrderCodeMap.put("storeItemSortLayoutName", storeItemListLayoutCode.name());
                             storeItemSortOrderCodeMap.put("storeItemSortLayoutValue", storeItemListLayoutCode.value());
@@ -760,10 +760,10 @@ public class EbayStore {
                     ebayResp.put("storeCustomHeaderLayout", storeCustomHeaderLayoutCodeType.value());
                     StoreCustomHeaderLayoutCodeType[] storeCustomHeaderLayoutCodeTypeList = StoreCustomHeaderLayoutCodeType.values();
                     if (storeCustomHeaderLayoutCodeTypeList != null) {
-                        List<Map<String,Object>> storeCustomHeaderLayoutList  = FastList.newInstance();
+                        List<Map<String,Object>> storeCustomHeaderLayoutList  = new LinkedList<Map<String, Object>>();
                         int i = 0;
                         while (i < storeCustomHeaderLayoutCodeTypeList.length) {
-                            Map<String,Object> storeCustomHeaderLayoutMap = FastMap.newInstance();
+                            Map<String,Object> storeCustomHeaderLayoutMap = new HashMap<String, Object>();
                             StoreCustomHeaderLayoutCodeType StoreCustomHeaderLayoutCode = storeCustomHeaderLayoutCodeTypeList[i];
                             storeCustomHeaderLayoutMap.put("storeCustomHeaderLayoutName", StoreCustomHeaderLayoutCode.name());
                             storeCustomHeaderLayoutMap.put("storeCustomHeaderLayoutValue", StoreCustomHeaderLayoutCode.value());
@@ -785,10 +785,10 @@ public class EbayStore {
                         ebayResp.put("storeCustomListingHeaderDisplayValue", storeCustomListingHeaderDisplayCodeType.value());
                         StoreCustomListingHeaderDisplayCodeType[] storeCustomListingHeaderDisplayCodeTypeList = StoreCustomListingHeaderDisplayCodeType.values();
                         if (storeCustomListingHeaderDisplayCodeTypeList != null) {
-                            List<Map<String,Object>> storeCustomListingHeaderDisplayCodeList  = FastList.newInstance();
+                            List<Map<String,Object>> storeCustomListingHeaderDisplayCodeList  = new LinkedList<Map<String, Object>>();
                             int i = 0;
                             while (i < storeCustomListingHeaderDisplayCodeTypeList.length) {
-                                Map<String,Object> storeCustomListingHeaderDisplayCodeMap = FastMap.newInstance();
+                                Map<String,Object> storeCustomListingHeaderDisplayCodeMap = new HashMap<String, Object>();
                                 StoreCustomListingHeaderDisplayCodeType storeCustomListingHeaderDisplayCode = storeCustomListingHeaderDisplayCodeTypeList[i];
                                 storeCustomListingHeaderDisplayCodeMap.put("storeCustomHeaderLayoutName", storeCustomListingHeaderDisplayCode.name());
                                 storeCustomListingHeaderDisplayCodeMap.put("storeCustomHeaderLayoutValue", storeCustomListingHeaderDisplayCode.value());
@@ -804,10 +804,10 @@ public class EbayStore {
                     ebayResp.put("storeMerchDisplay",merchDisplayCodeType.value());
                     MerchDisplayCodeType[] merchDisplayCodeTypeList = MerchDisplayCodeType.values();
                     if (merchDisplayCodeTypeList != null) {
-                        List<Map<String,Object>> merchDisplayCodeList = FastList.newInstance();
+                        List<Map<String,Object>> merchDisplayCodeList = new LinkedList<Map<String, Object>>();
                         int i = 0;
                         while (i < merchDisplayCodeTypeList.length) {
-                            Map<String,Object> merchDisplayCodeMap = FastMap.newInstance();
+                            Map<String,Object> merchDisplayCodeMap = new HashMap<String, Object>();
                             MerchDisplayCodeType merchDisplayCode = merchDisplayCodeTypeList[i];
                             merchDisplayCodeMap.put("merchDisplayCodeName", merchDisplayCode.name());
                             merchDisplayCodeMap.put("merchDisplayCodeValue", merchDisplayCode.value());
@@ -823,10 +823,10 @@ public class EbayStore {
                     returnedStoreType.getSubscriptionLevel();
                     StoreSubscriptionLevelCodeType[] storeSubscriptionlevelList = StoreSubscriptionLevelCodeType.values();
                     if (storeSubscriptionlevelList != null) {
-                        List<Map<String,Object>> storeSubscriptionLevelCodeList = FastList.newInstance();
+                        List<Map<String,Object>> storeSubscriptionLevelCodeList = new LinkedList<Map<String, Object>>();
                         int i = 0;
                         while (i < storeSubscriptionlevelList.length) {
-                            Map<String,Object> storeSubscriptionLevelCodeMap = FastMap.newInstance();
+                            Map<String,Object> storeSubscriptionLevelCodeMap = new HashMap<String, Object>();
                             StoreSubscriptionLevelCodeType storeSubscriptionLevelCode= storeSubscriptionlevelList[i];
                             storeSubscriptionLevelCodeMap.put("storeSubscriptionLevelCodeName", storeSubscriptionLevelCode.name());
                             storeSubscriptionLevelCodeMap.put("storeSubscriptionLevelCodeValue", storeSubscriptionLevelCode.value());
@@ -859,7 +859,7 @@ public class EbayStore {
     public static void updateProductStore(DispatchContext dctx, Map<String,Object> context, StoreType returnStoreType, String productStoreId) {
         LocalDispatcher dispatcher = dctx.getDispatcher();
         try {
-            Map<String,Object> inMap = FastMap.newInstance();
+            Map<String,Object> inMap = new HashMap<String, Object>();
             if (returnStoreType != null) {
                 inMap.put("productStoreId", productStoreId);
                 inMap.put("storeName", returnStoreType.getName());
@@ -877,7 +877,7 @@ public class EbayStore {
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
         Delegator delegator = dctx.getDelegator();
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         GetStoreOptionsRequestType req = null;
         GetStoreOptionsResponseType resp  = null;
         StoreThemeArrayType returnedBasicThemeArray = null;
@@ -907,7 +907,7 @@ public class EbayStore {
                             if (colorSchemeType != null) {
                                 if (colorSchemeId.equals(colorSchemeType.getColorSchemeID().toString())) {
                                     // get font,size and color
-                                    storeColorSchemeMap = FastMap.newInstance();
+                                    storeColorSchemeMap = new HashMap<String, Object>();
                                     StoreFontType storeFontType = colorSchemeType.getFont();
                                     storeColorSchemeMap.put("storeFontTypeFontFaceValue", storeFontType.getNameFace().value());
                                     storeColorSchemeMap.put("storeFontTypeSizeFaceValue", storeFontType.getNameSize().value());
@@ -940,7 +940,7 @@ public class EbayStore {
 
     public static Map<String,Object> retrievePredesignedLogoOption(DispatchContext dctx, Map<String,Object> context) {
         GenericValue userLogin = (GenericValue) context.get("userLogin");
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         Locale locale = (Locale) context.get("locale");
         Delegator delegator = dctx.getDelegator();
         GetStoreOptionsRequestType req = null;
@@ -957,9 +957,9 @@ public class EbayStore {
                     returnedLogoArray = resp.getLogoArray();
 
                     int i = 0;
-                    List<Map<String,Object>> logoList = FastList.newInstance();
+                    List<Map<String,Object>> logoList = new LinkedList<Map<String, Object>>();
                     while (i < returnedLogoArray.getLogoLength()) {
-                        Map<String,Object> logo  = FastMap.newInstance();
+                        Map<String,Object> logo  = new HashMap<String, Object>();
                         StoreLogoType storeLogoType = returnedLogoArray.getLogo(i);
                         logo.put("storeLogoId", storeLogoType.getLogoID());
                         logo.put("storeLogoName", storeLogoType.getName());
@@ -984,7 +984,7 @@ public class EbayStore {
     }
 
     public static Map<String,Object> retrieveBasicThemeArray(DispatchContext dctx, Map<String,Object> context) {
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
         Delegator delegator = dctx.getDelegator();
@@ -1002,9 +1002,9 @@ public class EbayStore {
                 if (resp != null && "SUCCESS".equals(resp.getAck().toString())) {
                     returnedBasicThemeArray = resp.getBasicThemeArray();
                     int i = 0;
-                    List<Map<String,Object>> themeList = FastList.newInstance();
+                    List<Map<String,Object>> themeList = new LinkedList<Map<String, Object>>();
                     while (i < returnedBasicThemeArray.getThemeLength()) {
-                        Map<String,Object> basictheme  = FastMap.newInstance();
+                        Map<String,Object> basictheme  = new HashMap<String, Object>();
                         StoreThemeType storeBasicThemeType = returnedBasicThemeArray.getTheme(i);
                         basictheme.put("storeThemeId", storeBasicThemeType.getThemeID());
                         basictheme.put("storeThemeName", storeBasicThemeType.getName());
@@ -1036,7 +1036,7 @@ public class EbayStore {
     }
 
     public static Map<String,Object> retrieveAdvancedThemeArray(DispatchContext dctx, Map<String,Object> context) {
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
         Delegator delegator = dctx.getDelegator();
@@ -1056,9 +1056,9 @@ public class EbayStore {
                     returnedAdvancedThemeArray = resp.getAdvancedThemeArray();
 
                     int i = 0;
-                    List<Map<String,Object>> themeList = FastList.newInstance();
+                    List<Map<String,Object>> themeList = new LinkedList<Map<String, Object>>();
                     while (i < returnedAdvancedThemeArray.getThemeLength()) {
-                        Map<String,Object> advanceTheme = FastMap.newInstance();
+                        Map<String,Object> advanceTheme = new HashMap<String, Object>();
                         StoreThemeType storeThemeType = returnedAdvancedThemeArray.getTheme(i);
                         advanceTheme.put("storeThemeId",storeThemeType.getThemeID());
                         advanceTheme.put("storeThemeName",storeThemeType.getName());
@@ -1068,9 +1068,9 @@ public class EbayStore {
                     result.put("storeThemeList", themeList);
                     int j = 0;
                     StoreColorSchemeType[] storeColorSchemeTypes = returnedAdvancedThemeArray.getGenericColorSchemeArray().getColorScheme();
-                    List<Map<String,Object>> themeColorList = FastList.newInstance();
+                    List<Map<String,Object>> themeColorList = new LinkedList<Map<String, Object>>();
                     while (j < storeColorSchemeTypes.length) {
-                        Map<String,Object> advanceColorTheme = FastMap.newInstance();
+                        Map<String,Object> advanceColorTheme = new HashMap<String, Object>();
                         StoreColorSchemeType storeColorSchemeType = storeColorSchemeTypes[j];
                         advanceColorTheme.put("storeColorSchemeId", storeColorSchemeType.getColorSchemeID());
                         advanceColorTheme.put("storeColorName", storeColorSchemeType.getName());
@@ -1094,7 +1094,7 @@ public class EbayStore {
     }
 
     public static Map<String,Object> retrieveStoreFontTheme(DispatchContext dctx, Map<String,Object> context) {
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
         Delegator delegator = dctx.getDelegator();
@@ -1108,7 +1108,7 @@ public class EbayStore {
 
                 resp = (GetStoreOptionsResponseType) call.execute(req);
 
-                Map<String,Object> advanceFontTheme = FastMap.newInstance();
+                Map<String,Object> advanceFontTheme = new HashMap<String, Object>();
                 if (resp != null && "SUCCESS".equals(resp.getAck().toString())) {
                     returnedThemeArray = resp.getAdvancedThemeArray();
                     int i = 0;
@@ -1121,9 +1121,9 @@ public class EbayStore {
                         int j = 0;
                         storeFontType.getNameFace();
                         StoreFontFaceCodeType[] storeFontNameFaceCodeTypes = StoreFontFaceCodeType.values();
-                        List<Map<String,Object>> nameFaces = FastList.newInstance();
+                        List<Map<String,Object>> nameFaces = new LinkedList<Map<String, Object>>();
                         while (j < storeFontNameFaceCodeTypes.length) {
-                            Map<String,Object> storeFontNameFaceCodeTypeMap = FastMap.newInstance();
+                            Map<String,Object> storeFontNameFaceCodeTypeMap = new HashMap<String, Object>();
                             StoreFontFaceCodeType storeFontNameFaceCodeType = storeFontNameFaceCodeTypes[j];
                             storeFontNameFaceCodeTypeMap.put("storeFontValue", storeFontNameFaceCodeType.value());
                             storeFontNameFaceCodeTypeMap.put("storeFontName", storeFontNameFaceCodeType.name());
@@ -1134,9 +1134,9 @@ public class EbayStore {
                         j = 0;
                         storeFontType.getNameSize();
                         StoreFontSizeCodeType[] storeFontSizeCodeTypes =  StoreFontSizeCodeType.values();
-                        List<Map<String,Object>> sizeFaces = FastList.newInstance();
+                        List<Map<String,Object>> sizeFaces = new LinkedList<Map<String, Object>>();
                         while (j < storeFontSizeCodeTypes.length) {
-                            Map<String,Object> storeFontSizeCodeTypeMap = FastMap.newInstance();
+                            Map<String,Object> storeFontSizeCodeTypeMap = new HashMap<String, Object>();
                             StoreFontSizeCodeType storeFontSizeCodeType = storeFontSizeCodeTypes[j];
                             storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value());
                             storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name());
@@ -1149,9 +1149,9 @@ public class EbayStore {
                         j = 0;
                         storeFontType.getTitleFace();
                         StoreFontFaceCodeType[] storeFontTypeTitleFaces = StoreFontFaceCodeType.values();
-                        List<Map<String,Object>> titleFaces = FastList.newInstance();
+                        List<Map<String,Object>> titleFaces = new LinkedList<Map<String, Object>>();
                         while (j < storeFontTypeTitleFaces.length) {
-                            Map<String,Object> storeFontTypeTitleFaceMap = FastMap.newInstance();
+                            Map<String,Object> storeFontTypeTitleFaceMap = new HashMap<String, Object>();
                             StoreFontFaceCodeType storeFontTypeTitleFace = storeFontTypeTitleFaces[j];
                             storeFontTypeTitleFaceMap.put("storeFontValue", storeFontTypeTitleFace.value());
                             storeFontTypeTitleFaceMap.put("storeFontName", storeFontTypeTitleFace.name());
@@ -1163,9 +1163,9 @@ public class EbayStore {
                         j = 0;
                         storeFontType.getTitleSize();
                         StoreFontSizeCodeType[] storeTitleSizeCodeTypes =  StoreFontSizeCodeType.values();
-                        List<Map<String,Object>> titleSizes = FastList.newInstance();
+                        List<Map<String,Object>> titleSizes = new LinkedList<Map<String, Object>>();
                         while (j < storeTitleSizeCodeTypes.length) {
-                            Map<String,Object> storeFontSizeCodeTypeMap = FastMap.newInstance();
+                            Map<String,Object> storeFontSizeCodeTypeMap = new HashMap<String, Object>();
                             StoreFontSizeCodeType storeFontSizeCodeType = storeTitleSizeCodeTypes[j];
                             storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value());
                             storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name());
@@ -1179,9 +1179,9 @@ public class EbayStore {
                         j = 0;
                         storeFontType.getDescFace();
                         StoreFontFaceCodeType[] storeFontTypeDescFaces = StoreFontFaceCodeType.values();
-                        List<Map<String,Object>> descFaces = FastList.newInstance();
+                        List<Map<String,Object>> descFaces = new LinkedList<Map<String, Object>>();
                         while (j < storeFontTypeDescFaces.length) {
-                            Map<String,Object> storeFontTypeDescFaceMap = FastMap.newInstance();
+                            Map<String,Object> storeFontTypeDescFaceMap = new HashMap<String, Object>();
                             StoreFontFaceCodeType storeFontTypeDescFace = storeFontTypeDescFaces[j];
                             storeFontTypeDescFaceMap.put("storeFontValue", storeFontTypeDescFace.value());
                             storeFontTypeDescFaceMap.put("storeFontName", storeFontTypeDescFace.name());
@@ -1193,9 +1193,9 @@ public class EbayStore {
                         j = 0;
                         storeFontType.getDescSize();
                         StoreFontSizeCodeType[] storeDescSizeCodeTypes =   StoreFontSizeCodeType.values();
-                        List<Map<String,Object>> descSizes = FastList.newInstance();
+                        List<Map<String,Object>> descSizes = new LinkedList<Map<String, Object>>();
                         while (j < storeDescSizeCodeTypes.length) {
-                            Map<String,Object> storeFontSizeCodeTypeMap = FastMap.newInstance();
+                            Map<String,Object> storeFontSizeCodeTypeMap = new HashMap<String, Object>();
                             StoreFontSizeCodeType storeFontSizeCodeType = storeDescSizeCodeTypes[j];
                             storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value());
                             storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name());
@@ -1222,7 +1222,7 @@ public class EbayStore {
     }
 
     public static Map<String,Object>  setEbayStoreInput(DispatchContext dctx, Map<String,Object> context) {
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         Locale locale = (Locale) context.get("locale");
         Delegator delegator = dctx.getDelegator();
         SetStoreRequestType req = null;
@@ -1338,11 +1338,11 @@ public class EbayStore {
     }
 
     public static Map<String, Object> getEbayActiveItems(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");
-        List<Map<String, Object>> activeItems = FastList.newInstance();
+        List<Map<String, Object>> activeItems = new LinkedList<Map<String, Object>>();
         try {
             ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
             GetMyeBaySellingCall getMyeBaySellingCall = new GetMyeBaySellingCall(apiContext);
@@ -1357,7 +1357,7 @@ public class EbayStore {
                 ItemArrayType itemArrayType = itemListCustomizationType.getItemArray();
                 int itemArrayTypeSize = itemArrayType.getItemLength();
                 for (int i = 0; i < itemArrayTypeSize; i++) {
-                    Map<String, Object> entry = FastMap.newInstance();
+                    Map<String, Object> entry = new HashMap<String, Object>();
                     ItemType item = itemArrayType.getItem(i);
                     entry.put("itemId", item.getItemID());
                     entry.put("title", item.getTitle());
@@ -1404,14 +1404,14 @@ public class EbayStore {
     }
 
     public static Map<String, Object> getEbaySoldItems(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");
         String filter = (String) context.get("filter");
         String itemId = (String) context.get("itemId");
         String buyerId = (String) context.get("buyerId");
-        List<Map<String, Object>> soldItems = FastList.newInstance();
+        List<Map<String, Object>> soldItems = new LinkedList<Map<String, Object>>();
         double reservPrice = 0;
         try {
             ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
@@ -1443,7 +1443,7 @@ public class EbayStore {
                         SellingManagerSoldTransactionType[] sellingManagerSoldTransactions = sellingManagerSoldOrder.getSellingManagerSoldTransaction();
                         int sellingManagerSoldTransactionLength = sellingManagerSoldTransactions.length;
                         for (int j = 0; j < sellingManagerSoldTransactionLength; j++) {
-                            Map<String, Object> entry = FastMap.newInstance();
+                            Map<String, Object> entry = new HashMap<String, Object>();
                             SellingManagerSoldTransactionType sellingManagerSoldTransaction = sellingManagerSoldTransactions[j];
                             entry.put("itemId", sellingManagerSoldTransaction.getItemID());
                             entry.put("title", sellingManagerSoldTransaction.getItemTitle());
@@ -1539,7 +1539,7 @@ public class EbayStore {
     }
 
     public static Map<String, Object> exportProductsFromEbayStore(DispatchContext dctx, Map<String, Object> context) {
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Map<String, Object> eBayConfigResult = EbayHelper.buildEbayConfig(context, delegator);
@@ -1633,7 +1633,7 @@ public class EbayStore {
             if (UtilValidate.isNotEmpty(ProductsExportToEbay.getProductExportSuccessMessageList())) {
                 if ((facilityId != "")  && (intAtp != 0)) {
                     int newAtp = intAtp - 1;
-                    Map<String,Object> inMap = FastMap.newInstance();
+                    Map<String,Object> inMap = new HashMap<String, Object>();
                     inMap.put("productStoreId", context.get("productStoreId").toString());
                     inMap.put("facilityId", facilityId);
                     inMap.put("productId", context.get("productId"));
@@ -1700,7 +1700,7 @@ public class EbayStore {
     }
 
     public static Map<String, Object> addEbayDispute(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");
@@ -1731,7 +1731,7 @@ public class EbayStore {
     }
 
     public static Map<String, Object> verifyEbayAddSecondChanceItem(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         boolean checkVerify = false;
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Delegator delegator = dctx.getDelegator();
@@ -1750,7 +1750,7 @@ public class EbayStore {
             verify.setDetailLevel(detailLevels);
 
             verify.setDuration(SecondChanceOfferDurationCodeType.DAYS_1);
-            Map<String, Object> serviceMap = FastMap.newInstance();
+            Map<String, Object> serviceMap = new HashMap<String, Object>();
             serviceMap.put("itemId", itemID);
             serviceMap.put("productStoreId", productStoreId);
             serviceMap.put("locale", locale);
@@ -1771,8 +1771,8 @@ public class EbayStore {
     }
 
     public static Map<String, Object> getEbayAllBidders(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
-        List<Map<String, Object>> allBidders = FastList.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
+        List<Map<String, Object>> allBidders = new LinkedList<Map<String, Object>>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");
@@ -1791,7 +1791,7 @@ public class EbayStore {
             OfferType[] bidders = api.getAllBidders();
 
             for (int count = 0; count < bidders.length; count++) {
-                Map<String, Object> entry = FastMap.newInstance();
+                Map<String, Object> entry = new HashMap<String, Object>();
                 OfferType offer = bidders[count];
                 entry.put("userId", offer.getUser().getUserID());
                 entry.put("bidder", offer.getUser());
@@ -1837,7 +1837,7 @@ public class EbayStore {
 
     @SuppressWarnings("serial")
     public Map<String, Object> getMyeBaySelling(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object>result = FastMap.newInstance();
+        Map<String, Object>result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");
@@ -1916,7 +1916,7 @@ public class EbayStore {
             OrderTransactionType[] tempSoldItems = null;
             if (UtilValidate.isNotEmpty(api.getReturnedSoldList())) tempSoldItems = (api.getReturnedSoldList().getOrderTransactionArray()).getOrderTransaction();
             // add to list
-            List<Map<String, Object>> soldList = FastList.newInstance();
+            List<Map<String, Object>> soldList = new LinkedList<Map<String, Object>>();
             if (UtilValidate.isNotEmpty(tempSoldItems)) {
                 soldList =  EbayStore.getOrderTransactions(tempSoldItems);
             }
@@ -1956,14 +1956,14 @@ public class EbayStore {
     }
     // set output data list (MyeBaySelling)
     public List<Map<Object, Object>> getDataModelToList(TableModel dataModel) {
-        List<Map<Object, Object>> list = FastList.newInstance();
+        List<Map<Object, Object>> list = new LinkedList<Map<Object, Object>>();
         for (int rowIndex = 0; rowIndex < dataModel.getRowCount(); rowIndex++) {
             list.add(UtilGenerics.checkMap(dataModel.getValueAt(rowIndex, 0)));
         }
         return list;
     }
     static Map<String, Object> itemToColumns(ItemType item) {
-        Map<String, Object> cols = FastMap.newInstance();
+        Map<String, Object> cols = new HashMap<String, Object>();
         cols.put("itemId", item.getItemID() != null ? item.getItemID() : "");
         cols.put("title", item.getTitle() != null ? item.getTitle() : "");
 
@@ -1997,7 +1997,7 @@ public class EbayStore {
     }
 
     static Map<String, Object> schItemToColumns(ItemType item) {
-        Map<String, Object> cols = FastMap.newInstance();
+        Map<String, Object> cols = new HashMap<String, Object>();
         double reservPrice = 0;
         cols.put("itemId", item.getItemID() != null ? item.getItemID() : "");
         cols.put("title", item.getTitle() != null ? item.getTitle() : "");
@@ -2022,7 +2022,7 @@ public class EbayStore {
     }
 
     static Map<String, Object> unsoldItemToColumns(ItemType item) {
-        Map<String, Object> cols = FastMap.newInstance();
+        Map<String, Object> cols = new HashMap<String, Object>();
         double reservPrice = 0;
         cols.put("itemId", item.getItemID() != null ? item.getItemID() : "");
         cols.put("title", item.getTitle() != null ? item.getTitle() : "");
@@ -2051,7 +2051,7 @@ public class EbayStore {
     }
 
     public static List<Map<String, Object>> getOrderTransactions(OrderTransactionType[] orderTrans) {
-        List<Map<String, Object>> colsList = FastList.newInstance();
+        List<Map<String, Object>> colsList = new LinkedList<Map<String, Object>>();
         OrderTransactionType orderTran = null;
         OrderType order = null;
         TransactionType transaction= null;
@@ -2075,7 +2075,7 @@ public class EbayStore {
     }
 
     public static Map<String, Object> getTransaction(TransactionType transaction){
-        Map<String, Object> cols = FastMap.newInstance();
+        Map<String, Object> cols = new HashMap<String, Object>();
         ItemType item = transaction.getItem();
         String itemId = null;
         String title = null;
@@ -2173,7 +2173,7 @@ public class EbayStore {
     }
 
     public Map<String, Object> getEbayStoreProductItem(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object>result = FastMap.newInstance();
+        Map<String, Object>result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");
@@ -2286,11 +2286,11 @@ public class EbayStore {
         return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreUpdateItemSuccessfully", locale));
     }
     public Map<String, Object> geteBayClosedItem(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map <String, Object> result = FastMap.newInstance();
+        Map <String, Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
         String productStoreId = (String) context.get("productStoreId");
-        List <Map<String, Object>> closedItems = FastList.newInstance();
+        List <Map<String, Object>> closedItems = new LinkedList<Map<String, Object>>();
         try {
             ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
             ItemListCustomizationType itemListType = new ItemListCustomizationType();
@@ -2353,7 +2353,7 @@ public class EbayStore {
     }
     
     public static Map<String ,Object> getClosedItem(ItemType tempItems) {
-        Map <String, Object> result = FastMap.newInstance();
+        Map <String, Object> result = new HashMap<String, Object>();
         if(UtilValidate.isNotEmpty(tempItems)) {
             double hitCount = 0;
             int quantity = 0;
@@ -2408,7 +2408,7 @@ public class EbayStore {
         if(UtilValidate.isEmpty(shippingAddress)) {
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreRequiredShippingAddressParameter", locale));
         }
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         String buyerName = null;
         String street = null;
         String street1 = null;
@@ -2474,7 +2474,7 @@ public class EbayStore {
         return checkResult;
     }
     public static Map<String, Object> getTransactionHelper(TransactionType transaction, Locale locale) {
-        Map<String, Object> orderMap = FastMap.newInstance();
+        Map<String, Object> orderMap = new HashMap<String, Object>();
         if(UtilValidate.isNotEmpty(transaction)) {
             String orderId = null;
             String externalId = null;
@@ -2501,8 +2501,8 @@ public class EbayStore {
             String paidTime = null;
             double salesTaxAmount = 0.0;
             float salesTaxPercent = 0;
-            Map<String, Object> itemSold = FastMap.newInstance();
-            Map<String, Object> address = FastMap.newInstance();
+            Map<String, Object> itemSold = new HashMap<String, Object>();
+            Map<String, Object> address = new HashMap<String, Object>();
 
             if(UtilValidate.isNotEmpty(transaction.getItem())) {
                 ItemType item = transaction.getItem();
@@ -2627,11 +2627,11 @@ public class EbayStore {
         return orderMap;
     }
     public Map<String, Object> getEbayStoreTransaction(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
-        List<Map<String, Object>> transactionList = FastList.newInstance();
-        List<String> orderIdList = FastList.newInstance();
+        List<Map<String, Object>> transactionList = new LinkedList<Map<String, Object>>();
+        List<String> orderIdList = new LinkedList<String>();
         String productStoreId = (String) context.get("productStoreId");
         try {
             Calendar fromDate = Calendar.getInstance();
@@ -2687,10 +2687,10 @@ public class EbayStore {
     }
 
     public Map<String, Object> getEbayStoreOrder(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
-        List<Map<String, Object>> orderList = FastList.newInstance();
+        List<Map<String, Object>> orderList = new LinkedList<Map<String,Object>>();
         String productStoreId = (String) context.get("productStoreId");
         ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
         try {
@@ -2739,7 +2739,7 @@ public class EbayStore {
     }
 
     private static Map<String, Object> getOrderHelper(OrderType order, Locale locale) {
-        FastMap<String, Object> orderCtx = FastMap.newInstance();
+        LinkedHashMap<String, Object> orderCtx = new LinkedHashMap<String, Object>();
         String externalOrderId = "EBS_"+order.getOrderID();
         double amountPaid = 0.0;
         String emailBuyer = null;
@@ -2764,11 +2764,11 @@ public class EbayStore {
         String externalTransactionTime = null;
         double feeOrCreditAmount = 0.0;
         double paymentOrRefundAmount = 0.0;
-        Map<String, Object> shippingServiceSelectedCtx = FastMap.newInstance();
-        Map<String, Object> shippingDetailsCtx = FastMap.newInstance();
-        Map<String, Object> shippingAddressMap = FastMap.newInstance();
-        Map<String, Object> checkoutStatusCtx = FastMap.newInstance();
-        Map<String, Object> externalTransactionCtx = FastMap.newInstance();
+        Map<String, Object> shippingServiceSelectedCtx = new HashMap<String, Object>();
+        Map<String, Object> shippingDetailsCtx = new HashMap<String, Object>();
+        Map<String, Object> shippingAddressMap = new HashMap<String, Object>();
+        Map<String, Object> checkoutStatusCtx = new HashMap<String, Object>();
+        Map<String, Object> externalTransactionCtx = new HashMap<String, Object>();
         if (UtilValidate.isNotEmpty(order.getTotal())) {
             amountPaid = order.getTotal().getValue();
         }
@@ -2878,11 +2878,11 @@ public class EbayStore {
         externalTransactionCtx.put("feeOrCreditAmount", feeOrCreditAmount);
         externalTransactionCtx.put("paymentOrRefundAmount", paymentOrRefundAmount);
 
-        List<Map<String, Object>> orderItemList = FastList.newInstance();
+        List<Map<String, Object>> orderItemList = new LinkedList<Map<String,Object>>();
         if (UtilValidate.isNotEmpty(order.getTransactionArray().getTransaction())) {
             TransactionType[] transactions = order.getTransactionArray().getTransaction();
             for (int tranCount = 0; tranCount < transactions.length; tranCount++) {
-                Map<String, Object> orderItemCtx = FastMap.newInstance();
+                Map<String, Object> orderItemCtx = new HashMap<String, Object>();
                 TransactionType transaction = transactions[tranCount];
                 int quantityPurchased = 0;
                 double transactionPrice = 0.0;

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java Fri Apr 10 20:22:54 2015
@@ -18,14 +18,13 @@
  */
 package org.ofbiz.ebaystore;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilValidate;
@@ -86,7 +85,7 @@ public class EbayStoreAutoPrefEvents{
             }
         }
 
-        Map<String, Object> bestOfferCondition =  FastMap.newInstance();
+        Map<String, Object> bestOfferCondition = new HashMap<String, Object>();
         bestOfferCondition.put("productStoreId", productStoreId);
         bestOfferCondition.put("userLogin", userLogin);
         bestOfferCondition.put("enabled", enabled);

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Fri Apr 10 20:22:54 2015
@@ -25,7 +25,9 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -36,9 +38,6 @@ import java.util.TreeMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilGenerics;
@@ -139,7 +138,7 @@ public class EbayStoreAutoPreferences {
         String isAutoPositiveFeedback = "N";
         String feedbackEventCode = null;
         GenericValue ebayProductStorePref = null;
-        List<String> list = FastList.newInstance();
+        List<String> list = new LinkedList<String>();
 
         try {
             ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
@@ -162,7 +161,7 @@ public class EbayStoreAutoPreferences {
                     // start getting sold item list from ebay follow your site
                     GetSellingManagerSoldListingsCall sellingManagerSoldListings = new GetSellingManagerSoldListingsCall(apiContext);
 
-                    List<SellingManagerSoldOrderType> items = FastList.newInstance();
+                    List<SellingManagerSoldOrderType> items = new LinkedList<SellingManagerSoldOrderType>();
                     SellingManagerSoldOrderType[] sellingManagerSoldOrders = sellingManagerSoldListings.getSellingManagerSoldListings();
                     if (UtilValidate.isNotEmpty(sellingManagerSoldOrders)) {
                         for (SellingManagerSoldOrderType solditem : sellingManagerSoldOrders) {
@@ -325,7 +324,7 @@ public class EbayStoreAutoPreferences {
                     
                     // start getting sold item list from ebay follow your site
                     GetSellingManagerSoldListingsCall sellingManagerSoldListings = new GetSellingManagerSoldListingsCall(apiContext);
-                    List<SellingManagerSoldOrderType> items = FastList.newInstance();
+                    List<SellingManagerSoldOrderType> items = new LinkedList<SellingManagerSoldOrderType>();
                     SellingManagerSoldOrderType[] sellingManagerSoldOrders = sellingManagerSoldListings.getSellingManagerSoldListings();
                     if (UtilValidate.isNotEmpty(sellingManagerSoldOrders)) {
                         for (SellingManagerSoldOrderType solditem : sellingManagerSoldOrders) {
@@ -353,7 +352,7 @@ public class EbayStoreAutoPreferences {
                         // call service send email (get template follow productStoreId)
                         for (SellingManagerSoldOrderType item : items) {
                             // call send
-                            Map<String, Object> sendMap = FastMap.newInstance();
+                            Map<String, Object> sendMap = new HashMap<String, Object>();
                             GenericValue productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", "EBAY_FEEBACK_REMIN").queryOne();
                             String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation");
                             sendMap.put("bodyScreenUri", bodyScreenLocation);
@@ -366,7 +365,7 @@ public class EbayStoreAutoPreferences {
                             sendMap.put("sendBcc", productStoreEmail.get("bccAddress"));
                             sendMap.put("sendTo", item.getBuyerEmail());
 
-                            Map<String, Object> bodyParameters = FastMap.newInstance();
+                            Map<String, Object> bodyParameters = new HashMap<String, Object>();
                             bodyParameters.put("buyerUserId", item.getBuyerID());
                             sendMap.put("bodyParameters", bodyParameters);
 
@@ -394,7 +393,7 @@ public class EbayStoreAutoPreferences {
         String jobId = (String) context.get("jobId");
         try {
             GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne();
-            Map<String, Object> serviceMap = FastMap.newInstance();
+            Map<String, Object> serviceMap = new HashMap<String, Object>();
             serviceMap.put("userLogin", userLogin);
             //ProductStore
             List<GenericValue> productStores = EntityQuery.use(delegator).from("EbayProductStorePref").where("autoPrefJobId", jobId).queryList();
@@ -422,7 +421,7 @@ public class EbayStoreAutoPreferences {
                             if (UtilValidate.isNotEmpty(soldItemMap.get("itemId"))) {
                                 GenericValue productCheck = EntityQuery.use(delegator).from("Product").where("productId", soldItemMap.get("itemId")).queryOne();
                                 if (productCheck == null) {
-                                    Map<String, Object> inMap = FastMap.newInstance();
+                                    Map<String, Object> inMap = new HashMap<String, Object>();
                                     inMap.put("productId", soldItemMap.get("itemId"));
                                     inMap.put("productTypeId", "EBAY_ITEM");
                                     inMap.put("internalName", "eBay Item " + soldItemMap.get("title"));
@@ -431,7 +430,7 @@ public class EbayStoreAutoPreferences {
                                     // ProductRole (VENDOR)
                                     List<GenericValue> productRole = EntityQuery.use(delegator).from("ProductRole").where("partyId", partyId, "productId", soldItemMap.get("itemId"), "roleTypeId", "VENDOR").queryList();
                                     if (productRole.size() == 0) {
-                                        Map<String, Object> addRole = FastMap.newInstance();
+                                        Map<String, Object> addRole = new HashMap<String, Object>();
                                         addRole.put("productId", soldItemMap.get("itemId"));
                                         addRole.put("roleTypeId", "VENDOR");
                                         addRole.put("partyId", partyId);
@@ -444,12 +443,12 @@ public class EbayStoreAutoPreferences {
                         }
                     }
                     //check active items
-                    serviceMap = FastMap.newInstance();
+                    serviceMap = new HashMap<String, Object>();
                     serviceMap.put("userLogin", userLogin);
                     serviceMap.put("productStoreId", productStoreId);
                     resultService = dispatcher.runSync("getEbayActiveItems", serviceMap);
                     List<Map<String, Object>> activeItems = UtilGenerics.checkList(resultService.get("activeItems"));
-                    List<String> activeItemMaps = FastList.newInstance();
+                    List<String> activeItemMaps = new LinkedList<String>();
                     if (activeItems.size() != 0) {
                         for (int itemCount = 0; itemCount < activeItems.size(); itemCount++) {
                             Map<String, Object> activeItemMap = UtilGenerics.checkMap(activeItems.get(itemCount));
@@ -460,14 +459,14 @@ public class EbayStoreAutoPreferences {
                     }
                     //check product role
                     List<GenericValue> productRoles = EntityQuery.use(delegator).from("ProductRole").where("partyId", partyId, "roleTypeId", "VENDOR").queryList();
-                    List<String> productRoleIds = FastList.newInstance();
+                    List<String> productRoleIds = new LinkedList<String>();
                     if (productRoles.size() != 0) {
                         for (int itemCount = 0; itemCount < productRoles.size(); itemCount++) {
                             String productId = productRoles.get(itemCount).getString("productId");
                             productRoleIds.add(productId);
                         }
                     }
-                    List<EntityCondition> andExpr = FastList.newInstance();
+                    List<EntityCondition> andExpr = new LinkedList<EntityCondition>();
                     EntityCondition activeItemCond = EntityCondition.makeCondition("productId", EntityOperator.NOT_IN, activeItemMaps);
                     andExpr.add(activeItemCond);
                     EntityCondition productTypeCond = EntityCondition.makeCondition("productTypeId", EntityOperator.EQUALS, "EBAY_ITEM");
@@ -529,13 +528,13 @@ public class EbayStoreAutoPreferences {
                     disputeExplanation = DisputeExplanationCodeType.valueOf(condition3);
                 }
                 // get sold items
-                Map<String, Object> serviceMap = FastMap.newInstance();
+                Map<String, Object> serviceMap = new HashMap<String, Object>();
                 serviceMap.put("productStoreId", productStoreId);
                 serviceMap.put("userLogin", userLogin);
                 Map<String, Object> resultService = dispatcher.runSync("getEbaySoldItems", serviceMap);
                 List<Map<String, Object>> soldItems = UtilGenerics.checkList(resultService.get("soldItems"));
                 // check items to dispute
-                List<Map<String, Object>> itemsToDispute = FastList.newInstance();
+                List<Map<String, Object>> itemsToDispute = new LinkedList<Map<String,Object>>();
                 for (int itemCount = 0; itemCount < soldItems.size(); itemCount++) {
                     Map<String, Object> item = UtilGenerics.checkMap(soldItems.get(itemCount));
                     String checkoutStatus = (String) item.get("checkoutStatus");
@@ -600,13 +599,13 @@ public class EbayStoreAutoPreferences {
                     disputeExplanation = DisputeExplanationCodeType.valueOf(condition3);
                 }
                 // get sold items
-                Map<String, Object> serviceMap = FastMap.newInstance();
+                Map<String, Object> serviceMap = new HashMap<String, Object>();
                 serviceMap.put("productStoreId", productStoreId);
                 serviceMap.put("userLogin", userLogin);
                 Map<String, Object> resultService = dispatcher.runSync("getEbaySoldItems", serviceMap);
                 List<Map<String, Object>> soldItems = UtilGenerics.checkList(resultService.get("soldItems"));
                 // check items to dispute
-                List<Map<String, Object>> itemsToDispute = FastList.newInstance();
+                List<Map<String, Object>> itemsToDispute = new LinkedList<Map<String,Object>>();
                 for (int itemCount = 0; itemCount < soldItems.size(); itemCount++) {
                     Map<String, Object> item = UtilGenerics.checkMap(soldItems.get(itemCount));
                     String checkoutStatus = (String) item.get("checkoutStatus");
@@ -669,7 +668,7 @@ public class EbayStoreAutoPreferences {
                 if ("Y".equals(isAutoSendEmail) && jobId.equals(ebayProductStorePref.getString("autoPrefJobId"))) {
                     // start getting sold item list from ebay follow your site
                     GetSellingManagerSoldListingsCall sellingManagerSoldListings = new GetSellingManagerSoldListingsCall(apiContext);
-                    List<SellingManagerSoldOrderType> items = FastList.newInstance();
+                    List<SellingManagerSoldOrderType> items = new LinkedList<SellingManagerSoldOrderType>();
                     SellingManagerSoldOrderType[] sellingManagerSoldOrders = sellingManagerSoldListings.getSellingManagerSoldListings();
                     if (UtilValidate.isNotEmpty(sellingManagerSoldOrders)) {
                         for (SellingManagerSoldOrderType solditem : sellingManagerSoldOrders) {
@@ -686,7 +685,7 @@ public class EbayStoreAutoPreferences {
                         // call service send email (get template follow productStoreId)
                         for (SellingManagerSoldOrderType item : items) {
                             // call send
-                            Map<String, Object> sendMap = FastMap.newInstance();
+                            Map<String, Object> sendMap = new HashMap<String, Object>();
                             GenericValue productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", "EBAY_PAY_RECIEVED").queryOne();
                             String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation");
                             sendMap.put("bodyScreenUri", bodyScreenLocation);
@@ -699,7 +698,7 @@ public class EbayStoreAutoPreferences {
                             sendMap.put("sendBcc", productStoreEmail.get("bccAddress"));
                             sendMap.put("sendTo", item.getBuyerEmail());
 
-                            Map<String, Object> bodyParameters = FastMap.newInstance();
+                            Map<String, Object> bodyParameters = new HashMap<String, Object>();
                             bodyParameters.put("buyerUserId", item.getBuyerID());
                             sendMap.put("bodyParameters", bodyParameters);
 
@@ -722,7 +721,7 @@ public class EbayStoreAutoPreferences {
 
 
     public static Map<String, Object> runCombineOrders(DispatchContext dctx, Map<String, Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
@@ -744,8 +743,8 @@ public class EbayStoreAutoPreferences {
                     for (int i = 0; i < soldOrderLength; i++) {
                         SellingManagerSoldOrderType sellingManagerSoldOrder = sellingManagerSoldOrders[i];
                         String buyerId = sellingManagerSoldOrder.getBuyerID().toString();
-                        List<Map<String, Object>> soldGroupList = FastList.newInstance();
-                        Map<String, Object> mymap = FastMap.newInstance();
+                        List<Map<String, Object>> soldGroupList = new LinkedList<Map<String,Object>>();
+                        Map<String, Object> mymap = new HashMap<String, Object>();
                         mymap.put("group", "");
                         mymap.put("soldorder", sellingManagerSoldOrder);
                         if (h.size() > 0) {
@@ -799,7 +798,7 @@ public class EbayStoreAutoPreferences {
                                 buyerPayment[0] = BuyerPaymentMethodCodeType.CASH_ON_PICKUP;
                                 order.setPaymentMethods(buyerPayment);
                                 TransactionArrayType transactionArr = new TransactionArrayType();
-                                List<TransactionType> translist = FastList.newInstance();
+                                List<TransactionType> translist = new LinkedList<TransactionType>();
 
                                 AmountType total = new AmountType();
                                 double totalAmt = 0.0;
@@ -908,7 +907,7 @@ public class EbayStoreAutoPreferences {
     }
 
     public static Map<String, Object> autoSendWinningBuyerNotification(DispatchContext dctx, Map<String, Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
@@ -925,7 +924,7 @@ public class EbayStoreAutoPreferences {
                     Timestamp creationTime = UtilDateTime.toTimestamp(creationDate);
 
                     if (creationTime.equals(lastestTime) && (item.get("listingType").toString().equals("Chinese"))) {
-                        Map<String, Object> serviceMap = FastMap.newInstance();
+                        Map<String, Object> serviceMap = new HashMap<String, Object>();
                         serviceMap.put("userLogin", userLogin);
                         serviceMap.put("locale", locale);
                         serviceMap.put("productStoreId", productStoreId);
@@ -940,7 +939,7 @@ public class EbayStoreAutoPreferences {
                                 UserType user = (UserType) bidder.get("bidder");
                                 String buyerUserId = bidder.get("userId").toString();
 
-                                Map<String, Object> sendMap = FastMap.newInstance();
+                                Map<String, Object> sendMap = new HashMap<String, Object>();
                                 GenericValue productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", "EBAY_WIN_BUYER_NOTI").queryOne();
                                 String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation");
                                 sendMap.put("bodyScreenUri", bodyScreenLocation);
@@ -953,7 +952,7 @@ public class EbayStoreAutoPreferences {
                                 sendMap.put("sendBcc", productStoreEmail.get("bccAddress"));
                                 sendMap.put("sendTo", user.getEmail());
 
-                                Map<String, Object> bodyParameters = FastMap.newInstance();
+                                Map<String, Object> bodyParameters = new HashMap<String, Object>();
                                 bodyParameters.put("buyerUserId", buyerUserId);
                                 sendMap.put("bodyParameters", bodyParameters);
 
@@ -978,7 +977,7 @@ public class EbayStoreAutoPreferences {
     }
 
     public static Map<String, Object> autoSendItemDispatchedNotification(DispatchContext dctx, Map<String, Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
+        Map<String, Object> result = new HashMap<String, Object>();
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Delegator delegator = dctx.getDelegator();
         String productStoreId = (String) context.get("productStoreId");
@@ -1000,7 +999,7 @@ public class EbayStoreAutoPreferences {
                         String buyerUserId = item.get("buyerUserId").toString();
                         String buyerEmail = item.get("buyerEmail").toString();
 
-                         Map<String, Object> sendMap = FastMap.newInstance();
+                         Map<String, Object> sendMap = new HashMap<String, Object>();
                          GenericValue productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", "EBAY_ITEM_DISPATCH").queryOne();
                          String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation");
                          sendMap.put("bodyScreenUri", bodyScreenLocation);
@@ -1013,7 +1012,7 @@ public class EbayStoreAutoPreferences {
                          sendMap.put("sendBcc", productStoreEmail.get("bccAddress"));
                          sendMap.put("sendTo", buyerEmail);
 
-                         Map<String, Object> bodyParameters = FastMap.newInstance();
+                         Map<String, Object> bodyParameters = new HashMap<String, Object>();
                          bodyParameters.put("buyerUserId", buyerUserId);
                          sendMap.put("bodyParameters", bodyParameters);
 
@@ -1040,7 +1039,7 @@ public class EbayStoreAutoPreferences {
         Locale locale = (Locale) context.get("locale");
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Delegator delegator = dctx.getDelegator();
-        Map<String,Object> result = FastMap.newInstance();
+        Map<String,Object> result = new HashMap<String, Object>();
         GetSellingManagerInventoryRequestType req = new GetSellingManagerInventoryRequestType();
         GetSellingManagerInventoryResponseType resp =  null;
 
@@ -1098,7 +1097,7 @@ public class EbayStoreAutoPreferences {
     }
 
     public static Map<String, Object> autoRelistingItems(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> itemObject = FastMap.newInstance();
+        Map<String, Object> itemObject = new HashMap<String, Object>();
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Delegator delegator = dctx.getDelegator();
         Locale locale = (Locale) context.get("locale");
@@ -1107,14 +1106,14 @@ public class EbayStoreAutoPreferences {
             EntityCondition expression1 = EntityCondition.makeCondition("autoRelisting", EntityOperator.EQUALS, "Y");
             EntityCondition expression2 = EntityCondition.makeCondition("endDateTime", EntityOperator.LESS_THAN, UtilDateTime.nowTimestamp());
             EntityCondition expression3 = EntityCondition.makeCondition("itemId", EntityOperator.NOT_EQUAL, null);
-            List<EntityCondition> expressions = FastList.newInstance();
+            List<EntityCondition> expressions = new LinkedList<EntityCondition>();
             expressions.add(expression1);
             expressions.add(expression2);
             expressions.add(expression3);
             EntityCondition cond = EntityCondition.makeCondition(expressions, EntityOperator.AND);
             List<GenericValue> ebayProductListings = EntityQuery.use(delegator).from("EbayProductListing").where(expressions).queryList();
             for (int index = 0; index < ebayProductListings.size(); index++) {
-                Map<String, Object> inMap = FastMap.newInstance();
+                Map<String, Object> inMap = new HashMap<String, Object>();
                 AddItemCall addItemCall = new AddItemCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"), locale, delegator));
                 GenericValue ebayProductListing = ebayProductListings.get(index);
                 ItemType item = EbayStoreHelper.prepareAddItem(delegator, ebayProductListing);
@@ -1263,7 +1262,7 @@ public class EbayStoreAutoPreferences {
                         getBestOfferCall.setBestOfferStatus(BestOfferStatusCodeType.ALL);
                         getBestOfferCall.getBestOffers();
                         BestOfferType[] bestOffers = getBestOfferCall.getReturnedBestOffers();
-                        List<String> acceptBestOfferIndexId = FastList.newInstance();
+                        List<String> acceptBestOfferIndexId = new LinkedList<String>();
                         SortedMap<String, Object> acceptBestOfferIDs = new TreeMap<String, Object>();
                         //Loop for get data best offer from buyer
                         RespondToBestOfferCall respondToBestOfferCall = new RespondToBestOfferCall(apiContext);