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 [16/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/EbayStoreCategoryFacade.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java Fri Apr 10 20:22:54 2015
@@ -19,12 +19,11 @@
package org.ofbiz.ebaystore;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
@@ -130,7 +129,7 @@ public class EbayStoreCategoryFacade {
//get listing durations
ListingDurationDefinitionsType listDuration = featureDefinition.getListingDurations();
ListingDurationDefinitionType[] durationArray = listDuration.getListingDuration();
- listingDurationMap = FastMap.newInstance();
+ listingDurationMap = new HashMap<Integer, String[]>();
for (int i = 0; i < durationArray.length; i++) {
listingDurationMap.put(durationArray[i].getDurationSetID(), durationArray[i].getDuration());
}
@@ -140,7 +139,7 @@ public class EbayStoreCategoryFacade {
if (listingDuration == null || listingDuration.length == 0) {
listingDuration = siteDefaults.getListingDuration();
}
- listingDurationReferenceMap = FastMap.newInstance();
+ listingDurationReferenceMap = new HashMap<String, Integer>();
for (int i = 0; i < listingDuration.length; i++) {
listingDurationReferenceMap.put(listingDuration[i].getType().value(),listingDuration[i].getValue());
}
@@ -222,7 +221,7 @@ public class EbayStoreCategoryFacade {
public List<Map<String,Object>> syncAdItemTemplates() throws ApiException, SdkSoapException, SdkException {
GetDescriptionTemplatesRequestType req = null;
GetDescriptionTemplatesResponseType resp = null;
- List<Map<String,Object>> temGroupList = FastList.newInstance();
+ List<Map<String,Object>> temGroupList = new LinkedList<Map<String,Object>>();
GetDescriptionTemplatesCall call = new GetDescriptionTemplatesCall(this.apiContext);
req = new GetDescriptionTemplatesRequestType();
@@ -235,7 +234,7 @@ public class EbayStoreCategoryFacade {
List<Map<String,Object>> templateList = null;
Map<String,Object> templateGroup = null;
if ("THEME".equals(String.valueOf(descTemplateType.getType()))) {
- Map<String,Object> template = FastMap.newInstance();
+ Map<String,Object> template = new HashMap<String, Object>();
template.put("TemplateId", String.valueOf(descTemplateType.getID()));
template.put("TemplateImageURL", descTemplateType.getImageURL());
template.put("TemplateName", descTemplateType.getName());
@@ -249,8 +248,8 @@ public class EbayStoreCategoryFacade {
}
}
if (templateGroup == null) {
- templateGroup = FastMap.newInstance();
- templateList = FastList.newInstance();
+ templateGroup = new HashMap<String, Object>();
+ templateList = new LinkedList<Map<String,Object>>();
templateGroup.put("TemplateGroupId", descTemplateType.getGroupID().toString());
templateList.add(template);
templateGroup.put("Templates", templateList);
@@ -282,7 +281,7 @@ public class EbayStoreCategoryFacade {
}
public List<Map<String,Object>> getAdItemTemplates(String temGroupId) {
- List<Map<String,Object>> themes = FastList.newInstance();
+ List<Map<String,Object>> themes = new LinkedList<Map<String,Object>>();
for (Map<String,Object> temp : this.adItemTemplates) {
if (temp.get("TemplateGroupId").equals(temGroupId)) {
themes = UtilGenerics.checkList(temp.get("Templates"));
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java Fri Apr 10 20:22:54 2015
@@ -18,11 +18,10 @@
*/
package org.ofbiz.ebaystore;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
@@ -53,7 +52,7 @@ public class EbayStoreCustomerService {
if (UtilValidate.isEmpty(context.get("userId")) || UtilValidate.isEmpty(context.get("itemId"))) {
return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredUserIdAndItemId", locale));
}
- Map <String, Object> result = FastMap.newInstance();
+ Map <String, Object> result = new HashMap<String, Object>();
try {
String itemId = (String) context.get("itemId");
String bestOfferId = (String) context.get("bestOfferId");
@@ -112,7 +111,7 @@ public class EbayStoreCustomerService {
String price = (String) context.get("price");
String email = (String) context.get("email");
String quantity = (String) context.get("quantity");
- Map <String, Object> result = FastMap.newInstance();
+ Map <String, Object> result = new HashMap<String, Object>();
try {
ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
String[] bestOfferIDs = {offerId};
@@ -148,11 +147,12 @@ public class EbayStoreCustomerService {
}
return result;
}
+
public static Map<String, Object> deleteContactAlert(DispatchContext dctx, Map<String, ? extends Object> context) {
Delegator delegator = dctx.getDelegator();
String productStoreId = (String) context.get("productStoreId");
Locale locale = (Locale) context.get("locale");
- Map <String, Object> result = FastMap.newInstance();
+ Map <String, Object> result = new HashMap<String, Object>();
if (UtilValidate.isEmpty(context.get("itemId")) || UtilValidate.isEmpty(context.get("userId"))) {
return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredUserIdAndItemId", locale));
}
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java Fri Apr 10 20:22:54 2015
@@ -30,8 +30,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import javolution.util.FastMap;
-
import org.ofbiz.base.config.GenericConfigException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
@@ -97,7 +95,7 @@ public class EbayStoreHelper {
public static final String resource = "EbayStoreUiLabels";
public static ApiContext getApiContext(String productStoreId,Locale locale, Delegator delegator) {
- Map<String, Object> context = FastMap.newInstance();
+ Map<String, Object> context = new HashMap<String, Object>();
context.put("locale", locale);
context.put("productStoreId", productStoreId);
Map<String, Object> config = EbayHelper.buildEbayConfig(context, delegator);
@@ -131,7 +129,7 @@ public class EbayStoreHelper {
}
public static SiteCodeType getSiteCodeType(String productStoreId, Locale locale, Delegator delegator) {
- Map<String, Object> context = FastMap.newInstance();
+ Map<String, Object> context = new HashMap<String, Object>();
context.put("locale", locale);
context.put("productStoreId", productStoreId);
Map<String, Object> config = EbayHelper.buildEbayConfig(context, delegator);
@@ -264,7 +262,7 @@ public class EbayStoreHelper {
}
public static Map<String, Object> startEbayAutoPreference(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();
@@ -278,7 +276,7 @@ public class EbayStoreHelper {
if (UtilValidate.isNotEmpty(jobId)) {
List<GenericValue> jobs = EntityQuery.use(delegator).from("JobSandbox").where("parentJobId", jobId, "statusId", "SERVICE_PENDING").queryList();
if (jobs.size() == 0) {
- Map<String, Object>inMap = FastMap.newInstance();
+ Map<String, Object>inMap = new HashMap<String, Object>();
inMap.put("jobId", jobId);
inMap.put("userLogin", userLogin);
dispatcher.runSync("resetScheduledJob", inMap);
@@ -325,7 +323,7 @@ public class EbayStoreHelper {
ebayProductPref.set("autoPrefJobId", jobSandbox.getString("jobId"));
ebayProductPref.store();
- Map<String, Object>infoData = FastMap.newInstance();
+ Map<String, Object>infoData = new HashMap<String, Object>();
infoData.put("jobId", jobSandbox.getString("jobId"));
infoData.put("productStoreId", ebayProductPref.getString("productStoreId"));
runtimeData.set("runtimeInfo", XmlSerializer.serialize(infoData));
@@ -348,7 +346,7 @@ public class EbayStoreHelper {
}
public static Map<String, Object> stopEbayAutoPreference(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();
@@ -359,7 +357,7 @@ public class EbayStoreHelper {
String jobId = ebayProductPref.getString("autoPrefJobId");
List<GenericValue> jobs = EntityQuery.use(delegator).from("JobSandbox").where("parentJobId", jobId ,"statusId", "SERVICE_PENDING").queryList();
- Map<String, Object>inMap = FastMap.newInstance();
+ Map<String, Object>inMap = new HashMap<String, Object>();
inMap.put("userLogin", userLogin);
for (int index = 0; index < jobs.size(); index++) {
inMap.put("jobId", jobs.get(index).getString("jobId"));
@@ -429,7 +427,7 @@ public class EbayStoreHelper {
}
public static Map<String, Object> exportProductEachItem(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();
Map<String, Object> itemObject = UtilGenerics.checkMap(context.get("itemObject"));
@@ -445,7 +443,7 @@ public class EbayStoreHelper {
if (resp != null && "SUCCESS".equals(resp.getAck().toString()) || "WARNING".equals(resp.getAck().toString())) {
String itemId = resp.getItemID();
String listingXml = addItemCall.getRequestXml().toString();
- Map<String, Object> updateItemMap = FastMap.newInstance();
+ Map<String, Object> updateItemMap = new HashMap<String, Object>();
updateItemMap.put("productListingId", productListingId);
updateItemMap.put("itemId", itemId);
updateItemMap.put("listingXml", listingXml);
@@ -700,7 +698,7 @@ public class EbayStoreHelper {
public static void createErrorLogMessage(GenericValue userLogin, LocalDispatcher dispatcher, String productStoreId, String ack, String fuction, String errorMessage) {
if (!"".equals(productStoreId) && (!"".equals(errorMessage))) {
try {
- Map<String, Object> newMap = FastMap.newInstance();
+ Map<String, Object> newMap = new HashMap<String, Object>();
newMap.put("productStoreId", productStoreId);
newMap.put("logAck", ack.toLowerCase());
newMap.put("functionName", fuction);
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java Fri Apr 10 20:22:54 2015
@@ -19,10 +19,11 @@
package org.ofbiz.ebaystore;
import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
+
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
@@ -34,6 +35,7 @@ import org.ofbiz.service.DispatchContext
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ServiceUtil;
+
import com.ebay.sdk.ApiException;
import com.ebay.sdk.SdkException;
import com.ebay.sdk.SdkSoapException;
@@ -67,7 +69,7 @@ public class EbayStoreInventoryServices
}
/*update inventory on ebay site*/
public static Map<String,Object> updateEbayStoreInventory(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();
@@ -239,7 +241,7 @@ public class EbayStoreInventoryServices
}
public static Map<String,Object> getFolderInEbayStoreInventory(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();
@@ -322,7 +324,7 @@ public class EbayStoreInventoryServices
public static Map<String,Object> updateEbayInventoryStatusByProductId(DispatchContext dctx, Map<String,Object> context) {
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
- Map<String,Object> result = FastMap.newInstance();
+ Map<String,Object> result = new HashMap<String, Object>();
Delegator delegator = dctx.getDelegator();
String productStoreId = (String)context.get("productStoreId");
String facilityId = (String)context.get("facilityId");
@@ -380,7 +382,7 @@ public class EbayStoreInventoryServices
public static Map<String,Object> updateEbayInventoryStatus(DispatchContext dctx, Map<String,Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- Map<String,Object> result = FastMap.newInstance();
+ Map<String,Object> result = new HashMap<String, Object>();
Delegator delegator = dctx.getDelegator();
List<GenericValue> ebayProductStoreInventoryList = null;
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java Fri Apr 10 20:22:54 2015
@@ -18,6 +18,8 @@
*/
package org.ofbiz.ebaystore;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -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.UtilHttp;
import org.ofbiz.base.util.UtilValidate;
@@ -85,7 +84,7 @@ public class EbayStoreOptions {
String colorSchemeId = themeId.substring(themeId.indexOf("-")+1);
themeId = themeId.substring(0,themeId.indexOf("-"));
- Map<String,Object> storeColorSchemeMap = FastMap.newInstance();
+ Map<String,Object> storeColorSchemeMap = new HashMap<String, Object>();
while (i < storeBasicTheme.length) {
StoreThemeType storeThemeType = storeBasicTheme[i];
@@ -178,9 +177,9 @@ public class EbayStoreOptions {
request.setAttribute("categoryId", ebayCategoryId);
results = EbayEvents.getChildCategories(request);
if (UtilValidate.isNotEmpty(results)) {
- List<Map<String,Object>> categories = FastList.newInstance();
+ List<Map<String,Object>> categories = new LinkedList<Map<String,Object>>();
for (CategoryType category : results) {
- Map<String,Object> context = FastMap.newInstance();
+ Map<String,Object> context = new HashMap<String, Object>();
context.put("CategoryCode", category.getCategoryID());
context.put("CategoryName", category.getCategoryName());
String isLeaf = String.valueOf(category.isLeafCategory()!= null ? category.isLeafCategory() : "false");
@@ -229,9 +228,9 @@ public class EbayStoreOptions {
request.setAttribute("categoryId", ebayStoreCategory);
results = EbayEvents.getStoreChildCategories(request);
if (UtilValidate.isNotEmpty(results)) {
- List<Map<String,Object>> categories = FastList.newInstance();
+ List<Map<String,Object>> categories = new LinkedList<Map<String,Object>>();
for (StoreCustomCategoryType category : results) {
- Map<String,Object> context = FastMap.newInstance();
+ Map<String,Object> context = new HashMap<String, Object>();
context.put("CategoryCode", category.getCategoryID());
context.put("CategoryName", category.getName());
String isLeaf = "false";
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java Fri Apr 10 20:22:54 2015
@@ -29,8 +29,6 @@ import java.util.List;
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.UtilDateTime;
@@ -57,7 +55,7 @@ public class EbayStoreOrder {
private static final String module = EbayStoreOrder.class.getName();
public static Map<String, Object> EbayStoreImportTransaction(DispatchContext dctx, Map<String, Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
LocalDispatcher dispatcher = dctx.getDispatcher();
try {
if ("Complete".equals(context.get("checkoutStatus").toString()) && "NOT_IMPORT".equals(context.get("importStatus").toString())) {
@@ -75,7 +73,7 @@ public class EbayStoreOrder {
}
public static Map<String, Object> EbayStoreImportOrder(DispatchContext dctx, Map<String, Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
if (UtilValidate.isEmpty(context.get("orderId"))) {
try {
result = dispatcher.runSync("EbayStoreCreateOrderShoppingCart", context);
@@ -93,7 +91,7 @@ public class EbayStoreOrder {
LocalDispatcher dispatcher = dctx.getDispatcher();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
String productStoreId = context.get("productStoreId").toString();
String defaultCurrencyUomId = "";
@@ -305,7 +303,7 @@ public class EbayStoreOrder {
LocalDispatcher dispatcher = dctx.getDispatcher();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
- Map <String, Object> result = FastMap.newInstance();
+ Map <String, Object> result = new HashMap<String, Object>();
String productStoreId = context.get("productStoreId").toString();
String defaultCurrencyUomId = null;
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java Fri Apr 10 20:22:54 2015
@@ -19,11 +19,10 @@
package org.ofbiz.ebaystore;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javolution.util.FastList;
-
import com.ebay.sdk.ApiContext;
import com.ebay.sdk.ApiException;
import com.ebay.sdk.SdkException;
@@ -149,7 +148,7 @@ public class EbayStoreSiteFacade {
}
//convert the map to list
- List<CategoryType> catsList = FastList.newInstance();
+ List<CategoryType> catsList = new LinkedList<CategoryType>();
for (CategoryType cat : csCatsMap.values()) {
catsList.add(cat);
}
@@ -180,7 +179,7 @@ public class EbayStoreSiteFacade {
//get all categories from ebay store depend on siteId
private List<StoreCustomCategoryType> getEbayStoreCategories() {
Map<String, StoreCustomCategoryType> catsMap = new HashMap<String, StoreCustomCategoryType>(30000);
- List<StoreCustomCategoryType> catsList = FastList.newInstance();
+ List<StoreCustomCategoryType> catsList = new LinkedList<StoreCustomCategoryType>();
try {
GetStoreCall call = new GetStoreCall(this.apiContext);
GetStoreRequestType req = new GetStoreRequestType();
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetDisputeInfo.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetDisputeInfo.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetDisputeInfo.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetDisputeInfo.groovy Fri Apr 10 20:22:54 2015
@@ -21,8 +21,6 @@ import org.ofbiz.base.util.*;
import com.ebay.soap.eBLBaseComponents.DisputeReasonCodeType;
import com.ebay.soap.eBLBaseComponents.DisputeExplanationCodeType;
-import javolution.util.FastList;
-import javolution.util.FastMap;
public static String makeSpace(String text){
String result = "";
@@ -39,59 +37,59 @@ public static String makeSpace(String te
}
return result;
}
-reasons = FastList.newInstance();
-explanations = FastList.newInstance();
+reasons = [];
+explanations = [];
-entry = FastMap.newInstance();
+entry = [:];
entry.put("reasonCode", DisputeReasonCodeType.BUYER_HAS_NOT_PAID.toString());
entry.put("value", makeSpace(DisputeReasonCodeType.BUYER_HAS_NOT_PAID.value()));
reasons.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("reasonCode", DisputeReasonCodeType.TRANSACTION_MUTUALLY_CANCELED.toString());
entry.put("value", makeSpace(DisputeReasonCodeType.TRANSACTION_MUTUALLY_CANCELED.value()));
reasons.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.BUYER_HAS_NOT_RESPONDED.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_HAS_NOT_RESPONDED.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.BUYER_REFUSED_TO_PAY.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_REFUSED_TO_PAY.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.BUYER_RETURNED_ITEM_FOR_REFUND.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_RETURNED_ITEM_FOR_REFUND.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.UNABLE_TO_RESOLVE_TERMS.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.UNABLE_TO_RESOLVE_TERMS.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.BUYER_PURCHASING_MISTAKE.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_PURCHASING_MISTAKE.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.SHIP_COUNTRY_NOT_SUPPORTED.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.SHIP_COUNTRY_NOT_SUPPORTED.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.SHIPPING_ADDRESS_NOT_CONFIRMED.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.SHIPPING_ADDRESS_NOT_CONFIRMED.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.PAYMENT_METHOD_NOT_SUPPORTED.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.PAYMENT_METHOD_NOT_SUPPORTED.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.BUYER_NO_LONGER_REGISTERED.value()));
explanations.add(entry);
-entry = FastMap.newInstance();
+entry = [:];
entry.put("explanationCode", DisputeExplanationCodeType.OTHER_EXPLANATION.toString());
entry.put("value", makeSpace(DisputeExplanationCodeType.OTHER_EXPLANATION.value()));
explanations.add(entry);
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy Fri Apr 10 20:22:54 2015
@@ -22,8 +22,6 @@ import org.ofbiz.entity.condition.*;
import java.sql.Timestamp;
import java.util.Map;
-import javolution.util.FastMap;
-
partyId = null
resultUser = runService('getEbayStoreUser', ["productStoreId": parameters.productStoreId, "userLogin": context.get("userLogin")]);
ownerUser = resultUser.get("userLoginId");
@@ -31,7 +29,7 @@ userLogin = from("UserLogin").where("use
if (userLogin) {
partyId = userLogin.get("partyId");
}
-expr = []
+expr = [];
cond = null;
contentId = request.getParameter("contentId");
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy Fri Apr 10 20:22:54 2015
@@ -19,11 +19,9 @@
import org.ofbiz.entity.util.EntityUtil;
-import javolution.util.FastList;
-import javolution.util.FastMap;
import org.ofbiz.entity.util.EntityUtil;
-orderLists = FastList.newInstance();
+orderLists = [];
if (orderList) {
for (orderCount = 0; orderCount < orderList.size(); orderCount++) {
orderItem = orderList[orderCount];
@@ -47,7 +45,7 @@ if (orderList) {
product = from("Product").where("productId", item.get("productId")).cache(true).queryOne();
title = product.get("internalName");
}
- orderMap = FastMap.newInstance();
+ orderMap = [:];
orderMap.put("orderId", orderId);
orderMap.put("externalId", orderItem.get("externalId"));
orderMap.put("amountPaid", orderItem.get("amountPaid"));
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/SoldAction.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/SoldAction.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/SoldAction.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/SoldAction.groovy Fri Apr 10 20:22:54 2015
@@ -18,21 +18,19 @@
*/
import org.ofbiz.base.util.*;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-actionList = FastList.newInstance();
+actionList = [];
hasAction = false;
//Unpaid Item Dispute
if (unpaidItemStatus == null && paidTime == null && checkoutStatus != "CheckoutComplete") {
- inMap = FastMap.newInstance();
+ inMap = [:];
inMap.put("action","openUnpaid");
inMap.put("actionName","Open Unpaid");
actionList.add(inMap);
hasAction = true;
}
//Second Chance Offer
-inMap = FastMap.newInstance();
+inMap = [:];
inMap.put("action","makeSecondChanceOffer");
inMap.put("actionName","Make Second Chance Offer");
actionList.add(inMap);
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy Fri Apr 10 20:22:54 2015
@@ -18,10 +18,8 @@
*/
import org.ofbiz.base.util.*;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-results = FastList.newInstance();
+results = [];
ebayAccountList = from("PartyRoleAndPartyDetail").where("roleTypeId", "EBAY_ACCOUNT").queryList();
productStoreRoles = from("ProductStoreRole").where("roleTypeId", "EBAY_ACCOUNT").queryList();
@@ -30,7 +28,7 @@ if (productStoreRoles != null && ebayAcc
partyId = ebayAccount.partyId;
productStoreRoles.each{productStoreRole ->
if(partyId.equals(productStoreRole.partyId)){
- storeMap = FastMap.newInstance();
+ storeMap = [:];
storeMap.partyId = ebayAccount.partyId;
storeMap.firstName = ebayAccount.firstName;
storeMap.lastName = ebayAccount.lastName;
Modified: ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java Fri Apr 10 20:22:54 2015
@@ -41,8 +41,6 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilProperties;
@@ -218,7 +216,7 @@ public class JanrainHelper {
return "error";
}
- Map<String, String> result = FastMap.newInstance();
+ Map<String, String> result = new HashMap<String, String>();
result.put("displayName", displayName);
result.put("email", email);
result.put("identifier", identifier);
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/BestSellingCategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/BestSellingCategory.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/BestSellingCategory.groovy (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/BestSellingCategory.groovy Fri Apr 10 20:22:54 2015
@@ -21,10 +21,9 @@ import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.category.*;
-import javolution.util.FastList;
catalogId = CatalogWorker.getCurrentCatalogId(request);
-bestSellerCates = FastList.newInstance();
+bestSellerCates = [];
if (UtilValidate.isNotEmpty(catalogId)) {
prodCatalogCategoryList = CatalogWorker.getProdCatalogCategories(request, catalogId, "PCCT_BEST_SELL");
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy Fri Apr 10 20:22:54 2015
@@ -26,19 +26,16 @@ import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.base.util.*;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.category.*;
-import javolution.util.FastMap;
-import javolution.util.FastList;
-import javolution.util.FastList.*;
import org.ofbiz.entity.*;
List fillTree(rootCat ,CatLvl, parentCategoryId) {
if(rootCat) {
rootCat.sort{ it.productCategoryId }
- def listTree = FastList.newInstance();
+ def listTree = [];
for(root in rootCat) {
preCatChilds = from("ProductCategoryRollup").where("parentProductCategoryId", root.productCategoryId).queryList();
catChilds = EntityUtil.getRelated("CurrentProductCategory",null,preCatChilds,false);
- def childList = FastList.newInstance();
+ def childList = [];
// CatLvl uses for identify the Category level for display different css class
if(catChilds) {
@@ -55,7 +52,7 @@ List fillTree(rootCat ,CatLvl, parentCat
// Display the category if this category containing products or contain the category that's containing products
if(productsInCat || childList) {
- def rootMap = FastMap.newInstance();
+ def rootMap = [:];
category = from("ProductCategory").where("productCategoryId", root.productCategoryId).queryOne();
categoryContentWrapper = new CategoryContentWrapper(category, request);
context.title = categoryContentWrapper.CATEGORY_NAME;
@@ -89,9 +86,9 @@ CategoryWorker.setTrail(request, curCate
categoryList = request.getAttribute("topLevelList");
if (categoryList) {
- catContentWrappers = FastMap.newInstance();
+ catContentWrappers = [:];
CategoryWorker.getCategoryContentWrappers(catContentWrappers, categoryList, request);
context.catContentWrappers = catContentWrappers;
- completedTree = fillTree(categoryList,1,"");
+ completedTree = fillTree(categoryList, 1, "");
context.completedTree = completedTree;
}
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy Fri Apr 10 20:22:54 2015
@@ -18,17 +18,15 @@
*/
import org.ofbiz.product.product.ProductContentWrapper;
import org.ofbiz.product.category.*;
-import javolution.util.FastMap;
-import javolution.util.FastList;
import org.ofbiz.base.util.UtilValidate;
parentCategoryStr = parameters.parentCategoryStr;
if(!UtilValidate.isEmpty(parentCategoryStr)) {
pathList = parentCategoryStr.split('/');
- cateList = FastList.newInstance();
+ cateList = [];
pathTemp = '';
for(path in pathList) {
- cateMap = FastMap.newInstance();
+ cateMap = [:];
category = from("ProductCategory").where("productCategoryId", path).queryOne();
categoryContentWrapper = new CategoryContentWrapper(category, request);
Modified: ofbiz/trunk/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java (original)
+++ ofbiz/trunk/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java Fri Apr 10 20:22:54 2015
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
+import java.util.HashMap;
import java.util.Map;
import javax.print.Doc;
@@ -39,8 +40,6 @@ import javax.print.attribute.standard.Si
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.stream.StreamSource;
-import javolution.util.FastMap;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.MimeConstants;
@@ -61,7 +60,7 @@ public class ExamplePrintServices {
public static Map<String, Object> printReportPdf(DispatchContext dctx, Map<String, ? extends Object> context) {
String screenLocation = "component://example/widget/example/ExampleReportScreens.xml";
String reportScreenName = "ExampleReport";
- Map<String, Object> workContext = FastMap.newInstance();
+ Map<String, Object> workContext = new HashMap<String, Object>();
workContext.putAll(context);
// render a screen to get the XML document
Modified: ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java (original)
+++ ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java Fri Apr 10 20:22:54 2015
@@ -18,6 +18,7 @@
*******************************************************************************/
package org.ofbiz.googlebase;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -25,8 +26,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javolution.util.FastList;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilGenerics;
@@ -56,7 +55,7 @@ public class GoogleBaseSearchEvents {
Locale locale = UtilHttp.getLocale(request);
GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
String selectResult = request.getParameter("selectResult");
- List<String> productExportList = FastList.newInstance();
+ List<String> productExportList = new LinkedList<String>();
String errMsg = null;
try {
@@ -84,7 +83,7 @@ public class GoogleBaseSearchEvents {
if(!selectResult.startsWith("{")){
productExportList.add(selectResult);
}else {
- List<String> listTemp = FastList.newInstance();
+ List<String> listTemp = new LinkedList<String>();
String temp = selectResult.substring(1, selectResult.length()-1);
String arrayTemp[] = temp.split(",");
for (int i=0; i<arrayTemp.length; i++){
Modified: ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java (original)
+++ ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java Fri Apr 10 20:22:54 2015
@@ -28,15 +28,14 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.sql.Timestamp;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilFormatOut;
import org.ofbiz.base.util.UtilGenerics;
@@ -117,7 +116,7 @@ public class ProductsExportToGoogle {
try {
if (UtilValidate.isNotEmpty(productCategoryId)) {
- List<String> productsList = FastList.newInstance();
+ List<String> productsList = new LinkedList<String>();
Map<String, Object> result = dispatcher.runSync("getProductCategoryMembers", UtilMisc.toMap("categoryId", productCategoryId));
if (result.get("categoryMembers") != null) {
@@ -142,7 +141,7 @@ public class ProductsExportToGoogle {
if (productsList.size() == 0) {
return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToGoogle.noProductsAvailableInProductCategory", locale));
} else {
- Map<String, Object> paramIn = FastMap.newInstance();
+ Map<String, Object> paramIn = new HashMap<String, Object>();
paramIn.put("selectResult", productsList);
paramIn.put("webSiteUrl", webSiteUrl);
paramIn.put("imageUrl", imageUrl);
@@ -276,7 +275,7 @@ public class ProductsExportToGoogle {
int responseCode = connection.getResponseCode();
InputStream inputStream;
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
String response = "";
if (responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_OK) {
inputStream = connection.getInputStream();
@@ -304,8 +303,8 @@ public class ProductsExportToGoogle {
private static Map<String, Object> buildDataItemsXml(DispatchContext dctx, Map<String, Object> context, StringBuffer dataItemsXml) {
Locale locale = (Locale)context.get("locale");
- List<String> newProductsInGoogle = FastList.newInstance();
- List<String> productsRemovedFromGoogle = FastList.newInstance();
+ List<String> newProductsInGoogle = new LinkedList<String>();
+ List<String> productsRemovedFromGoogle = new LinkedList<String>();
String localeString = null;
String productStoreId = (String) context.get("productStoreId");
@@ -641,7 +640,7 @@ public class ProductsExportToGoogle {
private static String getProductPrice(LocalDispatcher dispatcher, GenericValue product) {
String priceString = null;
- Map<String, Object> map = FastMap.newInstance();
+ Map<String, Object> map = new HashMap<String, Object>();
try {
map = dispatcher.runSync("calculateProductPrice", UtilMisc.toMap("product", product));
boolean validPriceFound = ((Boolean)map.get("validPriceFound")).booleanValue();
@@ -656,7 +655,7 @@ public class ProductsExportToGoogle {
private static Map<String, Object> readResponseFromGoogle(String msg, List<String> newProductsInGoogle, List<String> productsRemovedFromGoogle,
LocalDispatcher dispatcher, Delegator delegator, Locale locale, String localeString) {
- List<String> message = FastList.newInstance();
+ List<String> message = new LinkedList<String>();
// Debug.logInfo("====get xml response from google: " + msg, module);
try {
Document docResponse = UtilXml.readXmlDocument(msg, true);
@@ -721,7 +720,7 @@ public class ProductsExportToGoogle {
private static Map<String, Object> buildGoogleBaseConfig(Map<String, Object> context, Delegator delegator) {
String productStoreId = (String) context.get("productStoreId");
- Map<String, Object> buildGoogleBaseConfigContext = FastMap.newInstance();
+ Map<String, Object> buildGoogleBaseConfigContext = new HashMap<String, Object>();
if (UtilValidate.isNotEmpty(productStoreId)) {
GenericValue googleBaseConfig = null;
Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy (original)
+++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy Fri Apr 10 20:22:54 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import javolution.util.FastList;
+
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.base.util.UtilValidate;
@@ -33,7 +33,7 @@ if (parameters.productStoreId) {
active = parameters.ACTIVE_PRODUCT;
notSynced = parameters.GOOGLE_SYNCED;
-productList = FastList.newInstance();
+productList = [];
if (UtilValidate.isNotEmpty(productIds) && ("Y".equals(active) || "Y".equals(notSynced))) {
for (int i = 0; i < productIds.size(); i++) {
productId = productIds[i];
Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy (original)
+++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy Fri Apr 10 20:22:54 2015
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-import javolution.util.FastList
import org.ofbiz.entity.util.EntityUtilProperties
configList = []
Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Fri Apr 10 20:22:54 2015
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
@@ -383,14 +382,14 @@ public class GoogleCheckoutHelper {
// handle shipping
Shipping shipping = adjustment.getShipping();
BigDecimal shipAmount = new BigDecimal(shipping.getShippingCost());
- GenericValue shipAdj = delegator.makeValue("OrderAdjustment", FastMap.newInstance());
+ GenericValue shipAdj = delegator.makeValue("OrderAdjustment");
shipAdj.set("orderAdjustmentTypeId", "SHIPPING_CHARGES");
shipAdj.set("amount", shipAmount);
cart.addAdjustment(shipAdj);
// handle tax
BigDecimal taxAmount = new BigDecimal(adjustment.getTotalTax());
- GenericValue taxAdj = delegator.makeValue("OrderAdjustment", FastMap.newInstance());
+ GenericValue taxAdj = delegator.makeValue("OrderAdjustment");
taxAdj.set("orderAdjustmentTypeId", "SALES_TAX");
taxAdj.set("amount", taxAmount);
cart.addAdjustment(taxAdj);
@@ -398,7 +397,7 @@ public class GoogleCheckoutHelper {
// handle promotions
Collection<MerchantCodes> merchantCodes = UtilGenerics.checkCollection(adjustment.getMerchantCodes());
for (MerchantCodes codes : merchantCodes) {
- GenericValue promoAdj = delegator.makeValue("OrderAdjustment", FastMap.newInstance());
+ GenericValue promoAdj = delegator.makeValue("OrderAdjustment");
promoAdj.set("orderAdjustmentTypeId", "PROMOTION_ADJUSTMENT");
promoAdj.set("description", "Promotion Code: " + codes.getCode());
promoAdj.set("comments", "Google Promotion: " + codes.getMessage());
@@ -500,7 +499,7 @@ public class GoogleCheckoutHelper {
}
protected String createPerson(StructuredName name) throws GeneralException {
- Map<String, Object> personMap = FastMap.newInstance();
+ Map<String, Object> personMap = new HashMap<String, Object>();
personMap.put("firstName", name.getFirstName());
personMap.put("lastName", name.getLastName());
personMap.put("userLogin", system);
@@ -526,7 +525,7 @@ public class GoogleCheckoutHelper {
}
// prepare the create address map
- Map<String, Object> addrMap = FastMap.newInstance();
+ Map<String, Object> addrMap = new HashMap<String, Object>();
addrMap.put("partyId", partyId);
addrMap.put("toName", addr.getContactName());
addrMap.put("address1", addr.getAddress1());
@@ -563,7 +562,7 @@ public class GoogleCheckoutHelper {
.queryList();
if (UtilValidate.isEmpty(values)) {
- Map<String, Object> addPurposeMap = FastMap.newInstance();
+ Map<String, Object> addPurposeMap = new HashMap<String, Object>();
addPurposeMap.put("contactMechId", contactMechId);
addPurposeMap.put("partyId", partyId);
addPurposeMap.put("contactMechPurposeTypeId", contactMechPurposeTypeId);
@@ -590,7 +589,7 @@ public class GoogleCheckoutHelper {
}
protected void setContactInfo(ShoppingCart cart, String contactMechPurposeTypeId, String infoString) throws GeneralException {
- Map<String, Object> lookupMap = FastMap.newInstance();
+ Map<String, Object> lookupMap = new HashMap<String, Object>();
String cmId = null;
String entityName = "PartyAndContactMech";
Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Fri Apr 10 20:22:54 2015
@@ -20,13 +20,12 @@ under the License.
package org.ofbiz.googlecheckout;
import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-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.UtilNumber;
@@ -297,8 +296,8 @@ public class GoogleRequestServices {
String returnId = (String) context.get("returnId");
// sort by order
- Map<String, BigDecimal> toRefund = FastMap.newInstance();
- Map<String, List<String>> toReturn = FastMap.newInstance();
+ Map<String, BigDecimal> toRefund = new HashMap<String, BigDecimal>();
+ Map<String, List<String>> toReturn = new HashMap<String, List<String>>();
BigDecimal refundTotal = new BigDecimal(0.0);
List<GenericValue> returnItems = null;
@@ -321,7 +320,7 @@ public class GoogleRequestServices {
}
List<String> items = toReturn.get(orderId);
if (items == null) {
- items = FastList.newInstance();
+ items = new LinkedList<String>();
}
// get the values from the return item
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy Fri Apr 10 20:22:54 2015
@@ -19,7 +19,6 @@
import org.ofbiz.entity.*;
import org.ofbiz.entity.condition.*;
-import javolution.util.FastMap;
productId = request.getParameter("productId");
if (!productId) {
@@ -32,7 +31,7 @@ if (productId) {
facilityId = request.getParameter("facilityId");
resultOutput = runService('getInventoryAvailableByFacility', [productId : productId, facilityId : facilityId]);
- quantitySummary = FastMap.newInstance();
+ quantitySummary = [:];
quantitySummary.facilityId = facilityId;
quantitySummary.atp_qoh = ((Double)resultOutput.availableToPromiseTotal).intValue() + " / " +
((Double)resultOutput.quantityOnHandTotal).intValue();
@@ -56,7 +55,7 @@ if (productId) {
// todo: change this to a select from inv_items where productId and facilityId matches distinct (locationSeqId).
invItemList = from("InventoryItem").where("productId", productId, "facilityId", facilityId).queryList();
- locations = FastMap.newInstance();
+ locations = [:];
boolean negativeQOH = false;
invItemList.each { invItem ->
@@ -79,7 +78,7 @@ if (productId) {
while (locationsIter.hasNext()) {
location = locationsIter.next();
resultOutput = runService('getInventoryAvailableByLocation', [productId : productId, facilityId : facilityId, locationSeqId : location]);
- quantitySummary = FastMap.newInstance();
+ quantitySummary = [:];
quantitySummary.productId = productId;
quantitySummary.facilityId = facilityId;
if ("nullField".equals( location ) == true) {
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Fri Apr 10 20:22:54 2015
@@ -20,14 +20,13 @@ package org.ofbiz.oagis;
import java.io.IOException;
import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-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.UtilFormatOut;
@@ -67,8 +66,8 @@ public class OagisInventoryServices {
Delegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
Locale locale = (Locale) context.get("locale");
- List<Map<String, String>> errorMapList = FastList.newInstance();
- List<Map<String, Object>> inventoryMapList = FastList.newInstance();
+ List<Map<String, String>> errorMapList = new LinkedList<Map<String,String>>();
+ List<Map<String, Object>> inventoryMapList = new LinkedList<Map<String,Object>>();
final String syncInventoryFacilityId = EntityUtilProperties.getPropertyValue("oagis.properties", "Oagis.Warehouse.SyncInventoryFacilityId", delegator);
GenericValue userLogin = null;
try {
@@ -97,7 +96,7 @@ public class OagisInventoryServices {
String authId = UtilXml.childElementValue(docSenderElement, "of:AUTHID");
// create oagis message info
- Map<String, Object> comiCtx = FastMap.newInstance();
+ Map<String, Object> comiCtx = new HashMap<String, Object>();
comiCtx.put("logicalId", logicalId);
comiCtx.put("component", component);
comiCtx.put("task", task);
@@ -218,7 +217,7 @@ public class OagisInventoryServices {
if (errorMapList.size() == 0 && inventoryMapList.size() > 0) {
try {
// prepare information to send mail
- Map<String, Object> sendMap = FastMap.newInstance();
+ Map<String, Object> sendMap = new HashMap<String, Object>();
String sendToEmail = EntityUtilProperties.getPropertyValue("oagis.properties", "oagis.notification.email.sendTo", delegator);
@@ -291,7 +290,7 @@ public class OagisInventoryServices {
}
}
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.put("logicalId", logicalId);
result.put("component", component);
result.put("task", task);
@@ -308,7 +307,7 @@ public class OagisInventoryServices {
}
// call services createOagisMsgErrInfosFromErrMapList and for incoming messages oagisSendConfirmBod
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.put("logicalId", logicalId);
saveErrorMapListCtx.put("component", component);
saveErrorMapListCtx.put("task", task);
@@ -323,7 +322,7 @@ public class OagisInventoryServices {
}
try {
- Map<String, Object> sendConfirmBodCtx = FastMap.newInstance();
+ Map<String, Object> sendConfirmBodCtx = new HashMap<String, Object>();
sendConfirmBodCtx.putAll(saveErrorMapListCtx);
// NOTE: this is different for each service, should be shipmentId or returnId or PO orderId or etc
// for sync inventory no such ID: sendConfirmBodCtx.put("origRefId", shipmentId);
@@ -359,8 +358,8 @@ public class OagisInventoryServices {
Locale locale = (Locale) context.get("locale");
LocalDispatcher dispatcher = ctx.getDispatcher();
Delegator delegator = ctx.getDelegator();
- List<Map<String, String>> errorMapList = FastList.newInstance();
- Map<String, Object> comiCtx = FastMap.newInstance();
+ List<Map<String, String>> errorMapList = new LinkedList<Map<String,String>>();
+ Map<String, Object> comiCtx = new HashMap<String, Object>();
GenericValue userLogin = null;
try {
@@ -459,7 +458,7 @@ public class OagisInventoryServices {
if (UtilValidate.isNotEmpty(acknowledgeElementList)) {
try {
for (Element receiptLnElement : acknowledgeElementList) {
- Map<String, Object> ripCtx = FastMap.newInstance();
+ Map<String, Object> ripCtx = new HashMap<String, Object>();
Element qtyElement = UtilXml.firstChildElement(receiptLnElement, "os:QUANTITY");
String itemQtyStr = UtilXml.childElementValue(qtyElement, "of:VALUE");
@@ -490,7 +489,7 @@ public class OagisInventoryServices {
// Check reference to PO number, if exists
GenericValue orderHeader = null;
if (orderId != null) {
- List<GenericValue> toStore = FastList.newInstance();
+ List<GenericValue> toStore = new LinkedList<GenericValue>();
orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
if (orderHeader != null) {
// Case : update the record
@@ -556,7 +555,7 @@ public class OagisInventoryServices {
comiCtx.put("processingStatusId", "OAGMP_SYS_ERROR");
dispatcher.runSync("updateOagisMessageInfo", comiCtx, 60, true);
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.putAll(omiPkMap);
saveErrorMapListCtx.put("errorMapList", errorMapList);
saveErrorMapListCtx.put("userLogin", userLogin);
@@ -572,7 +571,7 @@ public class OagisInventoryServices {
}
}
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.put("logicalId", logicalId);
result.put("component", component);
result.put("task", task);
@@ -589,7 +588,7 @@ public class OagisInventoryServices {
}
// call services createOagisMsgErrInfosFromErrMapList and for incoming messages oagisSendConfirmBod
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.put("logicalId", logicalId);
saveErrorMapListCtx.put("component", component);
saveErrorMapListCtx.put("task", task);
@@ -604,7 +603,7 @@ public class OagisInventoryServices {
}
try {
- Map<String, Object> sendConfirmBodCtx = FastMap.newInstance();
+ Map<String, Object> sendConfirmBodCtx = new HashMap<String, Object>();
sendConfirmBodCtx.putAll(saveErrorMapListCtx);
// NOTE: this is different for each service, should be shipmentId or returnId or PO orderId or etc
sendConfirmBodCtx.put("origRefId", orderId);
@@ -649,7 +648,7 @@ public class OagisInventoryServices {
Locale locale = (Locale) context.get("locale");
LocalDispatcher dispatcher = ctx.getDispatcher();
Delegator delegator = ctx.getDelegator();
- List<Map<String, String>> errorMapList = FastList.newInstance();
+ List<Map<String, String>> errorMapList = new LinkedList<Map<String,String>>();
GenericValue userLogin = null;
try {
@@ -691,7 +690,7 @@ public class OagisInventoryServices {
String locationSeqId = EntityUtilProperties.getPropertyValue("oagis.properties", "Oagis.Warehouse.ReturnReceiptLocationSeqId", delegator);
Timestamp timestamp = UtilDateTime.nowTimestamp();
- Map<String, Object> comiCtx = FastMap.newInstance();
+ Map<String, Object> comiCtx = new HashMap<String, Object>();
Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId);
@@ -752,15 +751,15 @@ public class OagisInventoryServices {
String lastReturnId = null;
//String inventoryItemId = null;
- List<String> invItemIds = FastList.newInstance();
+ List<String> invItemIds = new LinkedList<String>();
// get RECEIPTLN elements from message
List<? extends Element> receiptLineElementList = UtilXml.childElementList(acknowledgeDeliveryElement, "ns:RECEIPTLN");
if (UtilValidate.isNotEmpty(receiptLineElementList)) {
try {
- Map<String, String> processedStatusIdByReturnIdMap = FastMap.newInstance();
+ Map<String, String> processedStatusIdByReturnIdMap = new HashMap<String, String>();
for (Element receiptLnElement : receiptLineElementList) {
- Map<String, Object> ripCtx = FastMap.newInstance();
+ Map<String, Object> ripCtx = new HashMap<String, Object>();
Element qtyElement = UtilXml.firstChildElement(receiptLnElement, "os:QUANTITY");
String itemQtyStr = UtilXml.childElementValue(qtyElement, "of:VALUE");
@@ -840,7 +839,7 @@ public class OagisInventoryServices {
processedStatusIdByReturnIdMap.put(returnId, statusId);
// getting the serial number(s)
- List<String> serialNumsList = FastList.newInstance();
+ List<String> serialNumsList = new LinkedList<String>();
List<? extends Element> invDetailList = UtilXml.childElementList(receiptLnElement, "ns:INVDETAIL");
if (UtilValidate.isNotEmpty(invDetailList)) {
for (Element invDetailElement : invDetailList) {
@@ -922,7 +921,7 @@ public class OagisInventoryServices {
// TODOLATER: another fun thing to check: see if the serial number matches a serial number attached to the original return (if possible!)
//clone the context as it may be changed in the call
- Map<String, Object> localRipCtx = FastMap.newInstance();
+ Map<String, Object> localRipCtx = new HashMap<String, Object>();
localRipCtx.putAll(ripCtx);
localRipCtx.put("quantityAccepted", new Double(1.0));
// always set this to 0, if needed we'll handle the rejected quantity separately
@@ -950,7 +949,7 @@ public class OagisInventoryServices {
// no serial numbers, just receive the quantity
// clone the context as it may be changted in the call
- Map<String, Object> localRipCtx = FastMap.newInstance();
+ Map<String, Object> localRipCtx = new HashMap<String, Object>();
localRipCtx.putAll(ripCtx);
localRipCtx.put("quantityAccepted", new Double(quantityAccepted));
// always set this to 0, if needed we'll handle the rejected quantity separately
@@ -969,7 +968,7 @@ public class OagisInventoryServices {
invItemIds.add(inventoryItemId);
if (("INV_ON_HOLD").equals(invItemStatusId)) {
- Map<String, Object> createPhysicalInvAndVarCtx = FastMap.newInstance();
+ Map<String, Object> createPhysicalInvAndVarCtx = new HashMap<String, Object>();
createPhysicalInvAndVarCtx.put("inventoryItemId", inventoryItemId);
createPhysicalInvAndVarCtx.put("physicalInventoryDate", UtilDateTime.nowTimestamp());
// NOTE DEJ20070815: calling damaged for now as the only option so that all will feed into a check/repair process and go into the ON_HOLD status; we should at some point change OFBiz so these can go into the ON_HOLD status without having to call them damaged
@@ -1010,7 +1009,7 @@ public class OagisInventoryServices {
//so we _could_ possibly move to that method if needed
// loop through ReturnItem records, get totals for each productId
- Map<String, Double> returnQuantityByProductIdMap = FastMap.newInstance();
+ Map<String, Double> returnQuantityByProductIdMap = new HashMap<String, Double>();
List<GenericValue> returnItemList = delegator.findByAnd("ReturnItem", UtilMisc.toMap("returnId", returnId), null, false);
for (GenericValue returnItem : returnItemList) {
String productId = returnItem.getString("productId");
@@ -1068,7 +1067,7 @@ public class OagisInventoryServices {
comiCtx.put("processingStatusId", "OAGMP_SYS_ERROR");
dispatcher.runSync("updateOagisMessageInfo", comiCtx, 60, true);
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.putAll(omiPkMap);
saveErrorMapListCtx.put("errorMapList", errorMapList);
saveErrorMapListCtx.put("userLogin", userLogin);
@@ -1084,7 +1083,7 @@ public class OagisInventoryServices {
}
}
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.put("logicalId", logicalId);
result.put("component", component);
result.put("task", task);
@@ -1101,7 +1100,7 @@ public class OagisInventoryServices {
}
// call services createOagisMsgErrInfosFromErrMapList and for incoming messages oagisSendConfirmBod
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.put("logicalId", logicalId);
saveErrorMapListCtx.put("component", component);
saveErrorMapListCtx.put("task", task);
@@ -1116,7 +1115,7 @@ public class OagisInventoryServices {
}
try {
- Map<String, Object> sendConfirmBodCtx = FastMap.newInstance();
+ Map<String, Object> sendConfirmBodCtx = new HashMap<String, Object>();
sendConfirmBodCtx.putAll(saveErrorMapListCtx);
// NOTE: this is different for each service, should be shipmentId or returnId or PO orderId or etc
// TODO: unfortunately there could be multiple returnIds for the message, so what to do...?
@@ -1163,7 +1162,7 @@ public class OagisInventoryServices {
Locale locale = (Locale) context.get("locale");
LocalDispatcher dispatcher = ctx.getDispatcher();
Delegator delegator = ctx.getDelegator();
- List<Map<String, String>> errorMapList = FastList.newInstance();
+ List<Map<String, String>> errorMapList = new LinkedList<Map<String,String>>();
GenericValue userLogin = null;
try {
@@ -1201,7 +1200,7 @@ public class OagisInventoryServices {
String locationSeqId = EntityUtilProperties.getPropertyValue("oagis.properties", "Oagis.Warehouse.ReturnReceiptLocationSeqId", delegator);
Timestamp timestamp = UtilDateTime.nowTimestamp();
- Map<String, Object> comiCtx = FastMap.newInstance();
+ Map<String, Object> comiCtx = new HashMap<String, Object>();
Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId);
@@ -1260,13 +1259,13 @@ public class OagisInventoryServices {
}
//String inventoryItemId = null;
- List<String> invItemIds = FastList.newInstance();
+ List<String> invItemIds = new LinkedList<String>();
// get RECEIPTLN elements from message
List<? extends Element> receiptLineElementList = UtilXml.childElementList(acknowledgeDeliveryElement, "ns:RECEIPTLN");
if (UtilValidate.isNotEmpty(receiptLineElementList)) {
try {
for (Element receiptLnElement : receiptLineElementList) {
- Map<String, Object> uiiCtx = FastMap.newInstance();
+ Map<String, Object> uiiCtx = new HashMap<String, Object>();
Element qtyElement = UtilXml.firstChildElement(receiptLnElement, "os:QUANTITY");
String itemQtyStr = UtilXml.childElementValue(qtyElement, "of:VALUE");
@@ -1311,7 +1310,7 @@ public class OagisInventoryServices {
uiiCtx.put("statusId", invItemStatusId);
// geting the serial number(s)
- List<String> serialNumsList = FastList.newInstance();
+ List<String> serialNumsList = new LinkedList<String>();
List<? extends Element> invDetailList = UtilXml.childElementList(receiptLnElement, "ns:INVDETAIL");
if (UtilValidate.isNotEmpty(invDetailList)) {
for (Element invDetailElement : invDetailList) {
@@ -1371,7 +1370,7 @@ public class OagisInventoryServices {
continue;
}
- Map<String, Object> updateInvItmMap = FastMap.newInstance();
+ Map<String, Object> updateInvItmMap = new HashMap<String, Object>();
updateInvItmMap.put("inventoryItemId", inventoryItem.getString("inventoryItemId"));
updateInvItmMap.put("userLogin", userLogin);
updateInvItmMap.put("statusId", invItemStatusId);
@@ -1402,7 +1401,7 @@ public class OagisInventoryServices {
comiCtx.put("processingStatusId", "OAGMP_SYS_ERROR");
dispatcher.runSync("updateOagisMessageInfo", comiCtx, 60, true);
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.putAll(omiPkMap);
saveErrorMapListCtx.put("errorMapList", errorMapList);
saveErrorMapListCtx.put("userLogin", userLogin);
@@ -1418,7 +1417,7 @@ public class OagisInventoryServices {
}
}
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.putAll(omiPkMap);
result.put("userLogin", userLogin);
@@ -1432,7 +1431,7 @@ public class OagisInventoryServices {
}
// call services createOagisMsgErrInfosFromErrMapList and for incoming messages oagisSendConfirmBod
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.putAll(omiPkMap);
saveErrorMapListCtx.put("errorMapList", errorMapList);
saveErrorMapListCtx.put("userLogin", userLogin);
@@ -1444,7 +1443,7 @@ public class OagisInventoryServices {
}
try {
- Map<String, Object> sendConfirmBodCtx = FastMap.newInstance();
+ Map<String, Object> sendConfirmBodCtx = new HashMap<String, Object>();
sendConfirmBodCtx.putAll(saveErrorMapListCtx);
// run async because this will send a message back to the other server and may take some time, and/or fail
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java Fri Apr 10 20:22:54 2015
@@ -35,15 +35,14 @@ import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.HttpClient;
import org.ofbiz.base.util.SSLUtil;
@@ -145,13 +144,13 @@ public class OagisServices {
String sentDate = isoDateFormat.format(timestamp);
bodyParameters.put("sentDate", sentDate);
- Map<String, Object> omiPkMap = FastMap.newInstance();
+ Map<String, Object> omiPkMap = new HashMap<String, Object>();
omiPkMap.put("logicalId", logicalId);
omiPkMap.put("component", "EXCEPTION");
omiPkMap.put("task", "RECIEPT");
omiPkMap.put("referenceId", referenceId);
- Map<String, Object> oagisMsgInfoContext = FastMap.newInstance();
+ Map<String, Object> oagisMsgInfoContext = new HashMap<String, Object>();
oagisMsgInfoContext.putAll(omiPkMap);
oagisMsgInfoContext.put("authId", authId);
oagisMsgInfoContext.put("sentDate", timestamp);
@@ -170,7 +169,7 @@ public class OagisServices {
try {
// call services createOagisMsgErrInfosFromErrMapList and for incoming messages oagisSendConfirmBod
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.putAll(omiPkMap);
saveErrorMapListCtx.put("errorMapList", errorMapList);
saveErrorMapListCtx.put("userLogin", userLogin);
@@ -235,7 +234,7 @@ public class OagisServices {
Delegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
Document doc = (Document) context.get("document");
- List<Map<String, String>> errorMapList = FastList.newInstance();
+ List<Map<String, String>> errorMapList = new LinkedList<Map<String,String>>();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = null;
try {
@@ -281,7 +280,7 @@ public class OagisServices {
Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId);
- Map<String, Object> oagisMsgInfoCtx = FastMap.newInstance();
+ Map<String, Object> oagisMsgInfoCtx = new HashMap<String, Object>();
oagisMsgInfoCtx.putAll(omiPkMap);
oagisMsgInfoCtx.put("authId", authId);
oagisMsgInfoCtx.put("receivedDate", receivedTimestamp);
@@ -328,7 +327,7 @@ public class OagisServices {
String description = UtilXml.childElementValue(dataAreaConfirmMsgElement, "of:DESCRIPTN");
String reasonCode = UtilXml.childElementValue(dataAreaConfirmMsgElement, "of:REASONCODE");
- Map<String, Object> createOagisMessageErrorInfoForOriginal = FastMap.newInstance();
+ Map<String, Object> createOagisMessageErrorInfoForOriginal = new HashMap<String, Object>();
createOagisMessageErrorInfoForOriginal.putAll(originalOmiPkMap);
createOagisMessageErrorInfoForOriginal.put("reasonCode", reasonCode);
createOagisMessageErrorInfoForOriginal.put("description", description);
@@ -353,7 +352,7 @@ public class OagisServices {
String description = UtilXml.childElementValue(dataAreaConfirmMsgElement, "of:DESCRIPTN");
String reasonCode = UtilXml.childElementValue(dataAreaConfirmMsgElement, "of:REASONCODE");
- Map<String, Object> createOagisMessageErrorInfoForCbod = FastMap.newInstance();
+ Map<String, Object> createOagisMessageErrorInfoForCbod = new HashMap<String, Object>();
createOagisMessageErrorInfoForCbod.putAll(omiPkMap);
createOagisMessageErrorInfoForCbod.put("reasonCode", reasonCode);
createOagisMessageErrorInfoForCbod.put("description", description);
@@ -372,7 +371,7 @@ public class OagisServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "OagisErrorProcessingConfirmBOD", UtilMisc.toMap("errorString", t.toString()), locale));
}
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.put("logicalId", logicalId);
result.put("component", component);
result.put("task", task);
@@ -381,7 +380,7 @@ public class OagisServices {
if (errorMapList.size() > 0) {
// call services createOagisMsgErrInfosFromErrMapList and for incoming messages oagisSendConfirmBod
- Map<String, Object> saveErrorMapListCtx = FastMap.newInstance();
+ Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>();
saveErrorMapListCtx.put("logicalId", logicalId);
saveErrorMapListCtx.put("component", component);
saveErrorMapListCtx.put("task", task);
@@ -397,7 +396,7 @@ public class OagisServices {
// TODO and NOTE DEJ20070813: should we really send back a Confirm BOD if there is an error with the Confirm BOD they send us? probably so... will do for now...
try {
- Map<String, Object> sendConfirmBodCtx = FastMap.newInstance();
+ Map<String, Object> sendConfirmBodCtx = new HashMap<String, Object>();
sendConfirmBodCtx.putAll(saveErrorMapListCtx);
// NOTE: this is different for each service, should be shipmentId or returnId or PO orderId or etc
// no such thing for confirm bod: sendConfirmBodCtx.put("origRefId", shipmentId);
@@ -479,7 +478,7 @@ public class OagisServices {
Delegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
InputStream in = (InputStream) context.get("inputStream");
- List<Map<String, String>> errorList = FastList.newInstance();
+ List<Map<String, String>> errorList = new LinkedList<Map<String,String>>();
Boolean isErrorRetry = (Boolean) context.get("isErrorRetry");
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = null;
@@ -552,7 +551,7 @@ public class OagisServices {
Map<String, Object> messageProcessContext = UtilMisc.toMap("document", doc, "userLogin", userLogin);
- // call async, no additional results to return: Map subServiceResult = FastMap.newInstance();
+ // call async, no additional results to return: Map subServiceResult = new HashMap<String, Object>();
if (UtilValidate.isNotEmpty(oagisMessageInfo)) {
if (Boolean.TRUE.equals(isErrorRetry) || "OAGMP_SYS_ERROR".equals(oagisMessageInfo.getString("processingStatusId"))) {
// there was an error last time, tell the service this is a retry
@@ -563,7 +562,7 @@ public class OagisServices {
List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.<String, String>toMap("reasonCode", "MessageAlreadyReceived", "description", responseMsg));
- Map<String, Object> sendConfirmBodCtx = FastMap.newInstance();
+ Map<String, Object> sendConfirmBodCtx = new HashMap<String, Object>();
sendConfirmBodCtx.put("logicalId", logicalId);
sendConfirmBodCtx.put("component", component);
sendConfirmBodCtx.put("task", task);