svn commit: r1672752 [10/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1672752 [10/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java Fri Apr 10 20:22:54 2015 @@ -18,16 +18,15 @@ *******************************************************************************/ package org.ofbiz.product.feature; +import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; +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 javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; @@ -44,7 +43,6 @@ import org.ofbiz.service.LocalDispatcher import org.ofbiz.service.ModelService; import org.ofbiz.service.ServiceUtil; - /** * Services for product features */ @@ -62,7 +60,7 @@ public class ProductFeatureServices { * The optional productFeatureApplTypeId causes results to be filtered by this parameter--only used in conjunction with productId. */ public static Map<String, Object> getProductFeaturesByType(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); @@ -99,7 +97,7 @@ public class ProductFeatureServices { if (entityToSearch.equals("ProductFeatureAndAppl") && productFeatureApplTypeId != null) allFeatures = EntityUtil.filterByAnd(allFeatures, UtilMisc.toMap("productFeatureApplTypeId", productFeatureApplTypeId)); - List<String> featureTypes = FastList.newInstance(); + List<String> featureTypes = new LinkedList<String>(); Map<String, List<GenericValue>> featuresByType = new LinkedHashMap<String, List<GenericValue>>(); for (GenericValue feature: allFeatures) { String featureType = feature.getString("productFeatureTypeId"); @@ -108,7 +106,7 @@ public class ProductFeatureServices { } List<GenericValue> features = featuresByType.get(featureType); if (features == null) { - features = FastList.newInstance(); + features = new LinkedList<GenericValue>(); featuresByType.put(featureType, features); } features.add(feature); @@ -129,12 +127,12 @@ public class ProductFeatureServices { * Result: variantProductIds: a List of productIds of variants with those features */ public static Map<String, Object> getAllExistingVariants(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); String productId = (String) context.get("productId"); List<String> curProductFeatureAndAppls = UtilGenerics.checkList(context.get("productFeatureAppls")); - List<String> existingVariantProductIds = FastList.newInstance(); + List<String> existingVariantProductIds = new LinkedList<String>(); try { /* @@ -184,7 +182,7 @@ public class ProductFeatureServices { * {defaultVariantProductId: id of this variant; curProductFeatureAndAppls: features applied to this variant; existingVariantProductIds: List of productIds which are already variants with these features } */ public static Map<String, Object> getVariantCombinations(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); LocalDispatcher dispatcher = dctx.getDispatcher(); String productId = (String) context.get("productId"); @@ -201,20 +199,20 @@ public class ProductFeatureServices { // need to keep 2 lists, oldCombinations and newCombinations, and keep swapping them after each looping. Otherwise, you'll get a // concurrent modification exception - List<Map<String, Object>> oldCombinations = FastList.newInstance(); + List<Map<String, Object>> oldCombinations = new LinkedList<Map<String,Object>>(); // loop through each feature type for (Map.Entry<String, List<GenericValue>> entry: features.entrySet()) { List<GenericValue> currentFeatures = entry.getValue(); - List<Map<String, Object>> newCombinations = FastList.newInstance(); + List<Map<String, Object>> newCombinations = new LinkedList<Map<String,Object>>(); List<Map<String, Object>> combinations; // start with either existing combinations or from scratch if (oldCombinations.size() > 0) { combinations = oldCombinations; } else { - combinations = FastList.newInstance(); + combinations = new LinkedList<Map<String,Object>>(); } // in both cases, use each feature of current feature type's idCode and @@ -224,9 +222,9 @@ public class ProductFeatureServices { if (combinations.size()==0) { for (GenericValue currentFeature: currentFeatures) { if (currentFeature.getString("productFeatureApplTypeId").equals("SELECTABLE_FEATURE")) { - Map<String, Object> newCombination = FastMap.newInstance(); - List<GenericValue> newFeatures = FastList.newInstance(); - List<String> newFeatureIds = FastList.newInstance(); + Map<String, Object> newCombination = new HashMap<String, Object>(); + List<GenericValue> newFeatures = new LinkedList<GenericValue>(); + List<String> newFeatureIds = new LinkedList<String>(); if (currentFeature.getString("idCode") != null) { newCombination.put("defaultVariantProductId", productId + currentFeature.getString("idCode")); } else { @@ -243,7 +241,7 @@ public class ProductFeatureServices { for (Map<String, Object> combination: combinations) { for (GenericValue currentFeature: currentFeatures) { if (currentFeature.getString("productFeatureApplTypeId").equals("SELECTABLE_FEATURE")) { - Map<String, Object> newCombination = FastMap.newInstance(); + Map<String, Object> newCombination = new HashMap<String, Object>(); // .clone() is important, or you'll keep adding to the same List for all the variants // have to cast twice: once from get() and once from clone() List<GenericValue> newFeatures = UtilMisc.makeListWritable(UtilGenerics.<GenericValue>checkList(combination.get("curProductFeatureAndAppls"))); @@ -268,7 +266,7 @@ public class ProductFeatureServices { } int defaultCodeCounter = 1; - Set<String> defaultVariantProductIds = FastSet.newInstance(); // this map will contain the codes already used (as keys) + Set<String> defaultVariantProductIds = new HashSet<String>(); // this map will contain the codes already used (as keys) defaultVariantProductIds.add(productId); // now figure out which of these combinations already have productIds associated with them @@ -298,7 +296,7 @@ public class ProductFeatureServices { * Result: products (a List of Product GenericValues) */ public static Map<String, Object> getCategoryVariantProducts(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); LocalDispatcher dispatcher = dctx.getDispatcher(); List<GenericValue> productFeatures = UtilGenerics.checkList(context.get("productFeatures")); @@ -317,12 +315,12 @@ public class ProductFeatureServices { List<GenericValue> memberProducts = UtilGenerics.checkList(result.get("categoryMembers")); if ((memberProducts != null) && (memberProducts.size() > 0)) { // construct a Map of productFeatureTypeId -> productFeatureId from the productFeatures List - Map<String, String> featuresByType = FastMap.newInstance(); + Map<String, String> featuresByType = new HashMap<String, String>(); for (GenericValue nextFeature: productFeatures) { featuresByType.put(nextFeature.getString("productFeatureTypeId"), nextFeature.getString("productFeatureId")); } - List<GenericValue> products = FastList.newInstance(); // final list of variant products + List<GenericValue> products = new LinkedList<GenericValue>(); // final list of variant products for (GenericValue memberProduct: memberProducts) { // find variants for each member product of the category Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java Fri Apr 10 20:22:54 2015 @@ -22,14 +22,13 @@ import java.awt.image.BufferedImage; import java.awt.image.ImagingOpException; import java.io.File; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import javax.imageio.ImageIO; -import javolution.util.FastMap; - import org.jdom.JDOMException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; @@ -80,14 +79,14 @@ public class ScaleImage { Locale locale = (Locale) context.get("locale"); int index; - Map<String, Map<String, String>> imgPropertyMap = FastMap.newInstance(); + Map<String, Map<String, String>> imgPropertyMap = new HashMap<String, Map<String,String>>(); BufferedImage bufImg, bufNewImg; double imgHeight, imgWidth; - Map<String, String> imgUrlMap = FastMap.newInstance(); - Map<String, Object> resultXMLMap = FastMap.newInstance(); - Map<String, Object> resultBufImgMap = FastMap.newInstance(); - Map<String, Object> resultScaleImgMap = FastMap.newInstance(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, String> imgUrlMap = new HashMap<String, String>(); + Map<String, Object> resultXMLMap = new HashMap<String, Object>(); + Map<String, Object> resultBufImgMap = new HashMap<String, Object>(); + Map<String, Object> resultScaleImgMap = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<String, Object>(); /* ImageProperties.xml */ String imgPropertyFullPath = System.getProperty("ofbiz.home") + "/applications/product/config/ImageProperties.xml"; @@ -107,7 +106,7 @@ public class ScaleImage { String imgExtension = filenameToUse.substring(index + 1); // paths - Map<String, Object>imageContext = FastMap.newInstance(); + Map<String, Object> imageContext = new HashMap<String, Object>(); imageContext.putAll(context); imageContext.put("tenantId",((Delegator)context.get("delegator")).getDelegatorTenantId()); String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), imageContext); @@ -260,14 +259,14 @@ public class ScaleImage { } int index; - Map<String, Map<String, String>> imgPropertyMap = FastMap.newInstance(); + Map<String, Map<String, String>> imgPropertyMap = new HashMap<String, Map<String, String>>(); BufferedImage bufImg, bufNewImg; double imgHeight, imgWidth; - Map<String, String> imgUrlMap = FastMap.newInstance(); - Map<String, Object> resultXMLMap = FastMap.newInstance(); - Map<String, Object> resultBufImgMap = FastMap.newInstance(); - Map<String, Object> resultScaleImgMap = FastMap.newInstance(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, String> imgUrlMap = new HashMap<String, String>(); + Map<String, Object> resultXMLMap = new HashMap<String, Object>(); + Map<String, Object> resultBufImgMap = new HashMap<String, Object>(); + Map<String, Object> resultScaleImgMap = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<String, Object>(); /* ImageProperties.xml */ String imgPropertyFullPath = System.getProperty("ofbiz.home") + "/applications/product/config/ImageProperties.xml"; @@ -287,7 +286,7 @@ public class ScaleImage { String imgName = filenameToUse.substring(0, index - 1); String imgExtension = filenameToUse.substring(index + 1); // paths - Map<String, Object>imageContext = FastMap.newInstance(); + Map<String, Object> imageContext = new HashMap<String, Object>(); imageContext.putAll(context); imageContext.put("tenantId",((Delegator)context.get("delegator")).getDelegatorTenantId()); String mainFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", (Delegator) context.get("delegator")); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java Fri Apr 10 20:22:54 2015 @@ -22,12 +22,11 @@ import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.io.File; import java.io.IOException; +import java.util.HashMap; import java.util.Map; import javax.imageio.ImageIO; -import javolution.util.FastMap; - import org.jdom.JDOMException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -62,10 +61,10 @@ public class CropImage { String imageH = (String) context.get("imageH"); if (UtilValidate.isNotEmpty(imageName)) { - Map<String, Object> contentCtx = FastMap.newInstance(); + Map<String, Object> contentCtx = new HashMap<String, Object>(); contentCtx.put("contentTypeId", "DOCUMENT"); contentCtx.put("userLogin", userLogin); - Map<String, Object> contentResult = FastMap.newInstance(); + Map<String, Object> contentResult = new HashMap<String, Object>(); try { contentResult = dispatcher.runSync("createContent", contentCtx); } catch (GenericServiceException e) { @@ -73,10 +72,10 @@ public class CropImage { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> contentThumb = FastMap.newInstance(); + Map<String, Object> contentThumb = new HashMap<String, Object>(); contentThumb.put("contentTypeId", "DOCUMENT"); contentThumb.put("userLogin", userLogin); - Map<String, Object> contentThumbResult = FastMap.newInstance(); + Map<String, Object> contentThumbResult = new HashMap<String, Object>(); try { contentThumbResult = dispatcher.runSync("createContent", contentThumb); } catch (GenericServiceException e) { @@ -114,7 +113,7 @@ public class CropImage { ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameToUse, imageUrlResource, contentId, "image/jpeg"); ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameTouseThumb, imageUrlThumb, contentIdThumb, "image/jpeg"); - Map<String, Object> createContentAssocMap = FastMap.newInstance(); + Map<String, Object> createContentAssocMap = new HashMap<String, Object>(); createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL"); createContentAssocMap.put("contentId", contentId); createContentAssocMap.put("contentIdTo", contentIdThumb); @@ -127,7 +126,7 @@ public class CropImage { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> productContentCtx = FastMap.newInstance(); + Map<String, Object> productContentCtx = new HashMap<String, Object>(); productContentCtx.put("productId", productId); productContentCtx.put("productContentTypeId", "IMAGE"); productContentCtx.put("fromDate", UtilDateTime.nowTimestamp()); @@ -141,7 +140,7 @@ public class CropImage { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> contentApprovalCtx = FastMap.newInstance(); + Map<String, Object> contentApprovalCtx = new HashMap<String, Object>(); contentApprovalCtx.put("contentId", contentId); contentApprovalCtx.put("userLogin", userLogin); try { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java Fri Apr 10 20:22:54 2015 @@ -31,6 +31,8 @@ import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import java.nio.ByteBuffer; +import java.util.HashMap; +import java.util.List; import java.util.Locale; import java.util.Map; @@ -40,8 +42,6 @@ import javax.servlet.http.HttpServletRes import javax.servlet.http.HttpSession; import javax.swing.ImageIcon; -import javolution.util.FastMap; - import org.jdom.JDOMException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -66,7 +66,7 @@ public class FrameImage { public static Map<String, Object> addImageFrame(DispatchContext dctx, Map<String, ? extends Object> context) throws IOException, JDOMException { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.path", delegator), context); @@ -120,10 +120,10 @@ public class FrameImage { int width = Integer.parseInt(imageWidth); int height= Integer.parseInt(imageHeight); - Map<String, Object> contentCtx = FastMap.newInstance(); + Map<String, Object> contentCtx = new HashMap<String, Object>(); contentCtx.put("contentTypeId", "DOCUMENT"); contentCtx.put("userLogin", userLogin); - Map<String, Object> contentResult = FastMap.newInstance(); + Map<String, Object> contentResult = new HashMap<String, Object>(); try { contentResult = dispatcher.runSync("createContent", contentCtx); } catch (GenericServiceException e) { @@ -132,10 +132,10 @@ public class FrameImage { result.putAll(context); } - Map<String, Object> contentThumb = FastMap.newInstance(); + Map<String, Object> contentThumb = new HashMap<String, Object>(); contentThumb.put("contentTypeId", "DOCUMENT"); contentThumb.put("userLogin", userLogin); - Map<String, Object> contentThumbResult = FastMap.newInstance(); + Map<String, Object> contentThumbResult = new HashMap<String, Object>(); try { contentThumbResult = dispatcher.runSync("createContent", contentThumb); } catch (GenericServiceException e) { @@ -167,7 +167,7 @@ public class FrameImage { ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameToUse, imageUrlResource, contentId, "image/jpeg"); ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameTouseThumb, imageUrlThumb, contentIdThumb, "image/jpeg"); - Map<String, Object> createContentAssocMap = FastMap.newInstance(); + Map<String, Object> createContentAssocMap = new HashMap<String, Object>(); createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL"); createContentAssocMap.put("contentId", contentId); createContentAssocMap.put("contentIdTo", contentIdThumb); @@ -181,7 +181,7 @@ public class FrameImage { result.putAll(context); } - Map<String, Object> productContentCtx = FastMap.newInstance(); + Map<String, Object> productContentCtx = new HashMap<String, Object>(); productContentCtx.put("productId", productId); productContentCtx.put("productContentTypeId", "IMAGE"); productContentCtx.put("fromDate", UtilDateTime.nowTimestamp()); @@ -196,7 +196,7 @@ public class FrameImage { result.putAll(context); } - Map<String, Object> contentApprovalCtx = FastMap.newInstance(); + Map<String, Object> contentApprovalCtx = new HashMap<String, Object>(); contentApprovalCtx.put("contentId", contentId); contentApprovalCtx.put("userLogin", userLogin); try { @@ -293,7 +293,7 @@ public class FrameImage { out.close(); //create dataResource - Map<String, Object> dataResourceCtx = FastMap.newInstance(); + Map<String, Object> dataResourceCtx = new HashMap<String, Object>(); dataResourceCtx.put("objectInfo", imageServerUrl + imagePath); dataResourceCtx.put("dataResourceName", imageName); dataResourceCtx.put("userLogin", userLogin); @@ -303,7 +303,7 @@ public class FrameImage { Map<String, Object> dataResourceResult = dispatcher.runSync("createDataResource", dataResourceCtx); dataResourceId = dataResourceResult.get("dataResourceId").toString(); //create content - Map<String, Object> contentCtx = FastMap.newInstance(); + Map<String, Object> contentCtx = new HashMap<String, Object>(); contentCtx.put("dataResourceId", dataResourceResult.get("dataResourceId").toString()); contentCtx.put("contentTypeId", "IMAGE_FRAME"); contentCtx.put("contentName", imageName); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java Fri Apr 10 20:22:54 2015 @@ -27,15 +27,14 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.RandomAccessFile; import java.nio.ByteBuffer; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import javax.imageio.ImageIO; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.jdom.JDOMException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -69,7 +68,7 @@ public class ImageManagementServices { public static Map<String, Object> addMultipleuploadForProduct(DispatchContext dctx, Map<String, ? extends Object> context) throws IOException, JDOMException { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -101,10 +100,10 @@ public class ImageManagementServices { sizeType = imageResize; } - Map<String, Object> contentCtx = FastMap.newInstance(); + Map<String, Object> contentCtx = new HashMap<String, Object>(); contentCtx.put("contentTypeId", "DOCUMENT"); contentCtx.put("userLogin", userLogin); - Map<String, Object> contentResult = FastMap.newInstance(); + Map<String, Object> contentResult = new HashMap<String, Object>(); try { contentResult = dispatcher.runSync("createContent", contentCtx); } catch (GenericServiceException e) { @@ -131,7 +130,7 @@ public class ImageManagementServices { fileContentType = "image/png"; } - List<GenericValue> fileExtension = FastList.newInstance(); + List<GenericValue> fileExtension = new LinkedList<GenericValue>(); try { fileExtension = EntityQuery.use(delegator).from("FileExtension").where("mimeTypeId", fileContentType).queryList(); } catch (GenericEntityException e) { @@ -201,7 +200,7 @@ public class ImageManagementServices { "ProductImageViewUnableWriteBinaryData", UtilMisc.toMap("fileName", fileOriginal.getAbsolutePath()), locale)); } - Map<String, Object> resultResize = FastMap.newInstance(); + Map<String, Object> resultResize = new HashMap<String, Object>(); try { resultResize.putAll(ImageManagementServices.scaleImageMangementInAllSize(context, imageName, sizeType, productId)); } catch (IOException e) { @@ -225,7 +224,7 @@ public class ImageManagementServices { createContentAndDataResource(dctx, userLogin, imageName, imageUrl, contentId, fileContentType); createContentAndDataResource(dctx, userLogin, filenameToUseThumb, imageUrlThumb, contentIdThumb, fileContentType); - Map<String, Object> createContentAssocMap = FastMap.newInstance(); + Map<String, Object> createContentAssocMap = new HashMap<String, Object>(); createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL"); createContentAssocMap.put("contentId", contentId); createContentAssocMap.put("contentIdTo", contentIdThumb); @@ -238,7 +237,7 @@ public class ImageManagementServices { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> productContentCtx = FastMap.newInstance(); + Map<String, Object> productContentCtx = new HashMap<String, Object>(); productContentCtx.put("productId", productId); productContentCtx.put("productContentTypeId", productContentTypeId); productContentCtx.put("fromDate", UtilDateTime.nowTimestamp()); @@ -252,7 +251,7 @@ public class ImageManagementServices { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> contentApprovalCtx = FastMap.newInstance(); + Map<String, Object> contentApprovalCtx = new HashMap<String, Object>(); contentApprovalCtx.put("contentId", contentId); contentApprovalCtx.put("userLogin", userLogin); try { @@ -264,7 +263,7 @@ public class ImageManagementServices { String autoApproveImage = EntityUtilProperties.getPropertyValue("catalog", "image.management.autoApproveImage", delegator); if (autoApproveImage.equals("Y")) { - Map<String, Object> autoApproveCtx = FastMap.newInstance(); + Map<String, Object> autoApproveCtx = new HashMap<String, Object>(); autoApproveCtx.put("contentId", contentId); autoApproveCtx.put("userLogin", userLogin); autoApproveCtx.put("checkStatusId", "IM_APPROVED"); @@ -310,14 +309,14 @@ public class ImageManagementServices { } int index; - Map<String, Map<String, String>> imgPropertyMap = FastMap.newInstance(); + Map<String, Map<String, String>> imgPropertyMap = new HashMap<String, Map<String, String>>(); BufferedImage bufImg, bufNewImg; double imgHeight, imgWidth; - Map<String, String> imgUrlMap = FastMap.newInstance(); - Map<String, Object> resultXMLMap = FastMap.newInstance(); - Map<String, Object> resultBufImgMap = FastMap.newInstance(); - Map<String, Object> resultScaleImgMap = FastMap.newInstance(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, String> imgUrlMap = new HashMap<String, String>(); + Map<String, Object> resultXMLMap = new HashMap<String, Object>(); + Map<String, Object> resultBufImgMap = new HashMap<String, Object>(); + Map<String, Object> resultScaleImgMap = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<String, Object>(); /* ImageProperties.xml */ String imgPropertyFullPath = System.getProperty("ofbiz.home") + "/applications/product/config/ImageProperties.xml"; @@ -416,11 +415,11 @@ public class ImageManagementServices { } public static Map<String, Object> createContentAndDataResource(DispatchContext dctx, GenericValue userLogin, String filenameToUse, String imageUrl, String contentId, String fileContentType){ - 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> dataResourceCtx = FastMap.newInstance(); + Map<String, Object> dataResourceCtx = new HashMap<String, Object>(); dataResourceCtx.put("objectInfo", imageUrl); dataResourceCtx.put("dataResourceName", filenameToUse); @@ -429,7 +428,7 @@ public class ImageManagementServices { dataResourceCtx.put("mimeTypeId", fileContentType); dataResourceCtx.put("isPublic", "Y"); - Map<String, Object> dataResourceResult = FastMap.newInstance(); + Map<String, Object> dataResourceResult = new HashMap<String, Object>(); try { dataResourceResult = dispatcher.runSync("createDataResource", dataResourceCtx); } catch (GenericServiceException e) { @@ -441,7 +440,7 @@ public class ImageManagementServices { result.put("dataResourceFrameId", dataResourceId); result.put("dataResourceId", dataResourceId); - Map<String, Object> contentUp = FastMap.newInstance(); + Map<String, Object> contentUp = new HashMap<String, Object>(); contentUp.put("contentId", contentId); contentUp.put("dataResourceId", dataResourceResult.get("dataResourceId")); contentUp.put("contentName", filenameToUse); @@ -484,7 +483,7 @@ public class ImageManagementServices { } public static Map<String, Object> createContentThumbnail(DispatchContext dctx, Map<String, ? extends Object> context, GenericValue userLogin, ByteBuffer imageData, String productId, String imageName){ - 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"); @@ -494,10 +493,10 @@ public class ImageManagementServices { String nameOfThumb = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.nameofthumbnail", delegator), context); // Create content for thumbnail - Map<String, Object> contentThumb = FastMap.newInstance(); + Map<String, Object> contentThumb = new HashMap<String, Object>(); contentThumb.put("contentTypeId", "DOCUMENT"); contentThumb.put("userLogin", userLogin); - Map<String, Object> contentThumbResult = FastMap.newInstance(); + Map<String, Object> contentThumbResult = new HashMap<String, Object>(); try { contentThumbResult = dispatcher.runSync("createContent", contentThumb); } catch (GenericServiceException e) { @@ -523,7 +522,7 @@ public class ImageManagementServices { fileContentType = "image/png"; } - List<GenericValue> fileExtensionThumb = FastList.newInstance(); + List<GenericValue> fileExtensionThumb = new LinkedList(); try { fileExtensionThumb = delegator.findByAnd("FileExtension", UtilMisc.toMap("mimeTypeId", fileContentType), null, false); } catch (GenericEntityException e) { @@ -544,7 +543,7 @@ public class ImageManagementServices { fileContentType = "image/png"; } - List<GenericValue> fileExtensionThumb = FastList.newInstance(); + List<GenericValue> fileExtensionThumb = new LinkedList<GenericValue>(); try { fileExtensionThumb = EntityQuery.use(delegator).from("FileExtension").where("mimeTypeId", fileContentType).queryList(); } catch (GenericEntityException e) { @@ -576,7 +575,7 @@ public class ImageManagementServices { UtilMisc.toMap("fileName", fileOriginalThumb.getAbsolutePath()), locale)); } - Map<String, Object> resultResizeThumb = FastMap.newInstance(); + Map<String, Object> resultResizeThumb = new HashMap<String, Object>(); try { resultResizeThumb.putAll(ImageManagementServices.scaleImageMangementInAllSize(context, filenameToUseThumb, "thumbnail", productId)); } catch (IOException e) { @@ -596,7 +595,7 @@ public class ImageManagementServices { /* VARIABLES */ BufferedImage bufNewImg; double defaultHeight, defaultWidth, scaleFactor; - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); /* DIMENSIONS from ImageProperties */ defaultHeight = 100; @@ -655,7 +654,7 @@ public class ImageManagementServices { /* VARIABLES */ BufferedImage bufNewImg; double defaultHeight, defaultWidth, scaleFactor; - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); /* DIMENSIONS from ImageProperties */ defaultHeight = resizeHeight; @@ -725,10 +724,10 @@ public class ImageManagementServices { Map<String, Object> resultResize = ImageManagementServices.resizeImage(bufImg, imgHeight, imgWidth, resizeHeight, resizeWidth); ImageIO.write((RenderedImage) resultResize.get("bufferedImage"), mimeType, new File(imageServerPath + "/" + productId + "/" + filenameToUse)); - Map<String, Object> contentThumb = FastMap.newInstance(); + Map<String, Object> contentThumb = new HashMap<String, Object>(); contentThumb.put("contentTypeId", "DOCUMENT"); contentThumb.put("userLogin", userLogin); - Map<String, Object> contentThumbResult = FastMap.newInstance(); + Map<String, Object> contentThumbResult = new HashMap<String, Object>(); try { contentThumbResult = dispatcher.runSync("createContent", contentThumb); } catch (GenericServiceException e) { @@ -740,7 +739,7 @@ public class ImageManagementServices { String imageUrlThumb = imageServerUrl + "/" + productId + "/" + filenameToUse; ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameToUse, imageUrlThumb, contentIdThumb, "image/jpeg"); - Map<String, Object> createContentAssocMap = FastMap.newInstance(); + Map<String, Object> createContentAssocMap = new HashMap<String, Object>(); createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL"); createContentAssocMap.put("contentId", contentId); createContentAssocMap.put("contentIdTo", contentIdThumb); @@ -811,7 +810,7 @@ public class ImageManagementServices { File file = new File(imageServerPath + "/" + productId + "/" + dataResourceName); file.delete(); - Map<String, Object> contentUp = FastMap.newInstance(); + Map<String, Object> contentUp = new HashMap<String, Object>(); contentUp.put("contentId", contentId); contentUp.put("contentName", filenameToUse); contentUp.put("userLogin", userLogin); @@ -838,7 +837,7 @@ public class ImageManagementServices { } if (dataResource != null) { - Map<String, Object> dataResourceCtx = FastMap.newInstance(); + Map<String, Object> dataResourceCtx = new HashMap<String, Object>(); dataResourceCtx.put("dataResourceId", dataResource.getString("dataResourceId")); dataResourceCtx.put("objectInfo", imageUrl); dataResourceCtx.put("dataResourceName", filenameToUse); @@ -870,7 +869,7 @@ public class ImageManagementServices { File fileAssoc = new File(imageServerPath + "/" + productId + "/" + drDataResourceNameAssoc); fileAssoc.delete(); - Map<String, Object> contentAssocMap = FastMap.newInstance(); + Map<String, Object> contentAssocMap = new HashMap<String, Object>(); contentAssocMap.put("contentId", contentAssoc.get("contentIdTo")); contentAssocMap.put("contentName", filenameToUseAssoc); contentAssocMap.put("userLogin", userLogin); @@ -897,7 +896,7 @@ public class ImageManagementServices { } if (dataResourceAssocUp != null) { - Map<String, Object> dataResourceAssocMap = FastMap.newInstance(); + Map<String, Object> dataResourceAssocMap = new HashMap<String, Object>(); dataResourceAssocMap.put("dataResourceId", dataResourceAssocUp.getString("dataResourceId")); dataResourceAssocMap.put("objectInfo", imageUrlAssoc); dataResourceAssocMap.put("dataResourceName", filenameToUseAssoc); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java Fri Apr 10 20:22:54 2015 @@ -19,6 +19,7 @@ package org.ofbiz.product.imagemanagement; import java.io.IOException; +import java.util.LinkedList; import java.util.List; import javax.servlet.RequestDispatcher; @@ -28,8 +29,6 @@ import javax.servlet.http.HttpServlet; 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.entity.Delegator; @@ -75,7 +74,7 @@ public class ImageUrlServlet extends Htt String pathInfo = request.getPathInfo(); List<String> pathElements = StringUtil.split(pathInfo, "/"); - List<String> tagElements = FastList.newInstance(); + List<String> tagElements = new LinkedList<String>(); for (String pathElement : pathElements) { tagElements.addAll(StringUtil.split(pathElement, "-")); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java Fri Apr 10 20:22:54 2015 @@ -20,13 +20,12 @@ package org.ofbiz.product.imagemanagemen import java.awt.image.BufferedImage; import java.io.File; +import java.util.HashMap; import java.util.List; import java.util.Map; import javax.imageio.ImageIO; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -103,7 +102,7 @@ public class ReplaceImage{ GenericValue productContent = EntityQuery.use(delegator).from("ProductContent").where("productId", productId, "contentId", contentIdReplace, "productContentTypeId", "IMAGE").queryFirst(); if (productContent != null) { - Map<String, Object> productContentCtx = FastMap.newInstance(); + Map<String, Object> productContentCtx = new HashMap<String, Object>(); productContentCtx.put("productId", productId); productContentCtx.put("contentId", contentIdReplace); productContentCtx.put("productContentTypeId", "IMAGE"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java Fri Apr 10 20:22:54 2015 @@ -23,12 +23,11 @@ import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.io.File; import java.io.IOException; +import java.util.HashMap; import java.util.Map; import javax.imageio.ImageIO; -import javolution.util.FastMap; - import org.jdom.JDOMException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -60,10 +59,10 @@ public class RotateImage { String angle = (String) context.get("angle"); if (UtilValidate.isNotEmpty(imageName)) { - Map<String, Object> contentCtx = FastMap.newInstance(); + Map<String, Object> contentCtx = new HashMap<String, Object>(); contentCtx.put("contentTypeId", "DOCUMENT"); contentCtx.put("userLogin", userLogin); - Map<String, Object> contentResult = FastMap.newInstance(); + Map<String, Object> contentResult = new HashMap<String, Object>(); try { contentResult = dispatcher.runSync("createContent", contentCtx); } catch (GenericServiceException e) { @@ -71,10 +70,10 @@ public class RotateImage { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> contentThumb = FastMap.newInstance(); + Map<String, Object> contentThumb = new HashMap<String, Object>(); contentThumb.put("contentTypeId", "DOCUMENT"); contentThumb.put("userLogin", userLogin); - Map<String, Object> contentThumbResult = FastMap.newInstance(); + Map<String, Object> contentThumbResult = new HashMap<String, Object>(); try { contentThumbResult = dispatcher.runSync("createContent", contentThumb); } catch (GenericServiceException e) { @@ -121,7 +120,7 @@ public class RotateImage { ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameToUse, imageUrlResource, contentId, "image/jpeg"); ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameTouseThumb, imageUrlThumb, contentIdThumb, "image/jpeg"); - Map<String, Object> createContentAssocMap = FastMap.newInstance(); + Map<String, Object> createContentAssocMap = new HashMap<String, Object>(); createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL"); createContentAssocMap.put("contentId", contentId); createContentAssocMap.put("contentIdTo", contentIdThumb); @@ -134,7 +133,7 @@ public class RotateImage { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> productContentCtx = FastMap.newInstance(); + Map<String, Object> productContentCtx = new HashMap<String, Object>(); productContentCtx.put("productId", productId); productContentCtx.put("productContentTypeId", "IMAGE"); productContentCtx.put("fromDate", UtilDateTime.nowTimestamp()); @@ -148,7 +147,7 @@ public class RotateImage { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> contentApprovalCtx = FastMap.newInstance(); + Map<String, Object> contentApprovalCtx = new HashMap<String, Object>(); contentApprovalCtx.put("contentId", contentId); contentApprovalCtx.put("userLogin", userLogin); try { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java Fri Apr 10 20:22:54 2015 @@ -30,14 +30,13 @@ import java.io.OutputStream; import java.math.BigDecimal; import java.net.URL; import java.text.DecimalFormat; +import java.util.HashMap; import java.util.Map; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; @@ -148,10 +147,10 @@ public class WatermarkImage{ if (UtilValidate.isNotEmpty(imageUrl)) { - Map<String, Object> contentCtx = FastMap.newInstance(); + Map<String, Object> contentCtx = new HashMap<String, Object>(); contentCtx.put("contentTypeId", "DOCUMENT"); contentCtx.put("userLogin", userLogin); - Map<String, Object> contentResult = FastMap.newInstance(); + Map<String, Object> contentResult = new HashMap<String, Object>(); try { contentResult = dispatcher.runSync("createContent", contentCtx); } catch (GenericServiceException e) { @@ -160,10 +159,10 @@ public class WatermarkImage{ return "error"; } - Map<String, Object> contentThumb = FastMap.newInstance(); + Map<String, Object> contentThumb = new HashMap<String, Object>(); contentThumb.put("contentTypeId", "DOCUMENT"); contentThumb.put("userLogin", userLogin); - Map<String, Object> contentThumbResult = FastMap.newInstance(); + Map<String, Object> contentThumbResult = new HashMap<String, Object>(); try { contentThumbResult = dispatcher.runSync("createContent", contentThumb); } catch (GenericServiceException e) { @@ -197,7 +196,7 @@ public class WatermarkImage{ createContentAndDataResourceWaterMark(request, userLogin, filenameToUse, imageUrlResource, contentId, "image/jpeg"); createContentAndDataResourceWaterMark(request, userLogin, filenameTouseThumb, imageUrlThumb, contentIdThumb, "image/jpeg"); - Map<String, Object> createContentAssocMap = FastMap.newInstance(); + Map<String, Object> createContentAssocMap = new HashMap<String, Object>(); createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL"); createContentAssocMap.put("contentId", contentId); createContentAssocMap.put("contentIdTo", contentIdThumb); @@ -210,7 +209,7 @@ public class WatermarkImage{ return e.getMessage(); } - Map<String, Object> productContentCtx = FastMap.newInstance(); + Map<String, Object> productContentCtx = new HashMap<String, Object>(); productContentCtx.put("productId", productId); productContentCtx.put("productContentTypeId", "IMAGE"); productContentCtx.put("fromDate", UtilDateTime.nowTimestamp()); @@ -224,7 +223,7 @@ public class WatermarkImage{ request.setAttribute("_ERROR_MESSAGE_", e.getMessage());return "error"; } - Map<String, Object> contentApprovalCtx = FastMap.newInstance(); + Map<String, Object> contentApprovalCtx = new HashMap<String, Object>(); contentApprovalCtx.put("contentId", contentId); contentApprovalCtx.put("userLogin", userLogin); try { @@ -246,11 +245,11 @@ public class WatermarkImage{ } public static Map<String, Object> createContentAndDataResourceWaterMark(HttpServletRequest request, GenericValue userLogin, String filenameToUse, String imageUrl, String contentId, String mimeTypeId){ - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Delegator delegator = (Delegator) request.getAttribute("delegator"); - Map<String, Object> dataResourceCtx = FastMap.newInstance(); + Map<String, Object> dataResourceCtx = new HashMap<String, Object>(); dataResourceCtx.put("objectInfo", imageUrl); dataResourceCtx.put("dataResourceName", filenameToUse); @@ -259,7 +258,7 @@ public class WatermarkImage{ dataResourceCtx.put("mimeTypeId", mimeTypeId); dataResourceCtx.put("isPublic", "Y"); - Map<String, Object> dataResourceResult = FastMap.newInstance(); + Map<String, Object> dataResourceResult = new HashMap<String, Object>(); try { dataResourceResult = dispatcher.runSync("createDataResource", dataResourceCtx); } catch (GenericServiceException e) { @@ -267,7 +266,7 @@ public class WatermarkImage{ return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> contentUp = FastMap.newInstance(); + Map<String, Object> contentUp = new HashMap<String, Object>(); contentUp.put("contentId", contentId); contentUp.put("dataResourceId", dataResourceResult.get("dataResourceId")); contentUp.put("contentName", filenameToUse); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Fri Apr 10 20:22:54 2015 @@ -22,14 +22,13 @@ import java.math.BigDecimal; import java.math.MathContext; import java.sql.Timestamp; import java.util.ArrayList; +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.UtilGenerics; @@ -420,8 +419,8 @@ public class InventoryServices { } */ - Map<String, Map<String, Timestamp>> ordersToUpdate = FastMap.newInstance(); - Map<String, Map<String, Timestamp>> ordersToCancel = FastMap.newInstance(); + Map<String, Map<String, Timestamp>> ordersToUpdate = new HashMap<String, Map<String,Timestamp>>(); + Map<String, Map<String, Timestamp>> ordersToCancel = new HashMap<String, Map<String,Timestamp>>(); // find all inventory items w/ a negative ATP List<GenericValue> inventoryItems = null; @@ -528,7 +527,7 @@ public class InventoryServices { Debug.logInfo("We won't ship on time, getting notification info", module); Map<String, Timestamp> notifyItems = ordersToUpdate.get(orderId); if (notifyItems == null) { - notifyItems = FastMap.newInstance(); + notifyItems = new HashMap<String, Timestamp>(); } notifyItems.put(orderItemSeqId, nextShipDate); ordersToUpdate.put(orderId, notifyItems); @@ -556,7 +555,7 @@ public class InventoryServices { Debug.logInfo("Flagging the item to auto-cancel", module); Map<String, Timestamp> cancelItems = ordersToCancel.get(orderId); if (cancelItems == null) { - cancelItems = FastMap.newInstance(); + cancelItems = new HashMap<String, Timestamp>(); } cancelItems.put(orderItemSeqId, farPastPromised); ordersToCancel.put(orderId, cancelItems); @@ -578,7 +577,7 @@ public class InventoryServices { } // all items to cancel will also be in the notify list so start with that - List<String> ordersToNotify = FastList.newInstance(); + List<String> ordersToNotify = new LinkedList<String>(); for (Map.Entry<String, Map<String, Timestamp>> entry: ordersToUpdate.entrySet()) { String orderId = entry.getKey(); Map<String, Timestamp> backOrderedItems = entry.getValue(); @@ -594,7 +593,7 @@ public class InventoryServices { } for (GenericValue orderItemShipGroup: orderItemShipGroups) { - List<GenericValue> orderItems = FastList.newInstance(); + List<GenericValue> orderItems = new LinkedList<GenericValue>(); List<GenericValue> orderItemShipGroupAssoc = null; try { orderItemShipGroupAssoc = EntityQuery.use(delegator).from("OrderItemShipGroupAssoc").where("shipGroupSeqId", orderItemShipGroup.get("shipGroupSeqId"), "orderId", orderId).queryList(); @@ -625,11 +624,11 @@ public class InventoryServices { // if there are none to cancel just create an empty map if (cancelItems == null) { - cancelItems = FastMap.newInstance(); + cancelItems = new HashMap<String, Timestamp>(); } if (orderItems != null) { - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); for (GenericValue orderItem: orderItems) { String orderItemSeqId = orderItem.getString("orderItemSeqId"); Timestamp shipDate = backOrderedItems.get(orderItemSeqId); @@ -763,10 +762,10 @@ public class InventoryServices { List<GenericValue> orderItems = UtilGenerics.checkList(context.get("orderItems")); String facilityId = (String) context.get("facilityId"); Locale locale = (Locale) context.get(""); - Map<String, BigDecimal> atpMap = FastMap.newInstance(); - Map<String, BigDecimal> qohMap = FastMap.newInstance(); - Map<String, BigDecimal> mktgPkgAtpMap = FastMap.newInstance(); - Map<String, BigDecimal> mktgPkgQohMap = FastMap.newInstance(); + Map<String, BigDecimal> atpMap = new HashMap<String, BigDecimal>(); + Map<String, BigDecimal> qohMap = new HashMap<String, BigDecimal>(); + Map<String, BigDecimal> mktgPkgAtpMap = new HashMap<String, BigDecimal>(); + Map<String, BigDecimal> mktgPkgQohMap = new HashMap<String, BigDecimal>(); Map<String, Object> results = ServiceUtil.returnSuccess(); // get a list of all available facilities for looping @@ -859,8 +858,8 @@ public class InventoryServices { BigDecimal minimumStock = (BigDecimal)context.get("minimumStock"); String statusId = (String)context.get("statusId"); - Map<String, Object> result = FastMap.newInstance(); - Map<String, Object> resultOutput = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> resultOutput = new HashMap<String, Object>(); Map<String, String> contextInput = UtilMisc.toMap("productId", productId, "facilityId", facilityId, "statusId", statusId); GenericValue product = null; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java Fri Apr 10 20:22:54 2015 @@ -21,12 +21,11 @@ package org.ofbiz.product.inventory; import java.math.BigDecimal; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; @@ -124,7 +123,7 @@ public class InventoryWorker { condList.add(EntityCondition.makeCondition("orderItemStatusId", EntityOperator.NOT_EQUAL, "ITEM_CANCELLED")); EntityConditionList<EntityCondition> conditions = EntityCondition.makeCondition(condList, EntityOperator.AND); - Map<String, BigDecimal> results = FastMap.newInstance(); + Map<String, BigDecimal> results = new HashMap<String, BigDecimal>(); try { List<GenericValue> orderedProducts = EntityQuery.use(delegator).select(fieldsToSelect).from("OrderItemQuantityReportGroupByProduct").where(conditions).queryList(); for (GenericValue value: orderedProducts) { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Fri Apr 10 20:22:54 2015 @@ -21,14 +21,13 @@ package org.ofbiz.product.price; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.TreeSet; -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; @@ -86,7 +85,7 @@ public class PriceServices { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); GenericValue product = (GenericValue) context.get("product"); @@ -201,7 +200,7 @@ public class PriceServices { BigDecimal amount = (BigDecimal) context.get("amount"); - List<EntityCondition> productPriceEcList = FastList.newInstance(); + List<EntityCondition> productPriceEcList = new LinkedList<EntityCondition>(); productPriceEcList.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); // this funny statement is for backward compatibility purposes; the productPricePurposeId is a new pk field on the ProductPrice entity and in order databases may not be populated, until the pk is updated and such; this will ease the transition somewhat if ("PURCHASE".equals(productPricePurposeId)) { @@ -342,7 +341,7 @@ public class PriceServices { boolean validPriceFound = false; BigDecimal defaultPrice = BigDecimal.ZERO; - List<GenericValue> orderItemPriceInfos = FastList.newInstance(); + List<GenericValue> orderItemPriceInfos = new LinkedList<GenericValue>(); if (defaultPriceValue != null) { // If a price calc formula (service) is specified, then use it to get the unit price if ("ProductPrice".equals(defaultPriceValue.getEntityName()) && UtilValidate.isNotEmpty(defaultPriceValue.getString("customPriceCalcService"))) { @@ -426,8 +425,8 @@ public class PriceServices { List<GenericValue> nonQuantityProductPriceRules = null; if (findAllQuantityPrices) { // split into list with quantity conditions and list without, then iterate through each quantity cond one - quantityProductPriceRules = FastList.newInstance(); - nonQuantityProductPriceRules = FastList.newInstance(); + quantityProductPriceRules = new LinkedList<GenericValue>(); + nonQuantityProductPriceRules = new LinkedList<GenericValue>(); for (GenericValue productPriceRule: allProductPriceRules) { List<GenericValue> productPriceCondList = EntityQuery.use(delegator).from("ProductPriceCond").where("productPriceRuleId", productPriceRule.get("productPriceRuleId")).cache(true).queryList(); @@ -453,12 +452,12 @@ public class PriceServices { } if (findAllQuantityPrices) { - List<Map<String, Object>> allQuantityPrices = FastList.newInstance(); + List<Map<String, Object>> allQuantityPrices = new LinkedList<Map<String,Object>>(); // if findAllQuantityPrices then iterate through quantityProductPriceRules // foreach create an entry in the out list and eval that rule and all nonQuantityProductPriceRules rather than a single rule for (GenericValue quantityProductPriceRule: quantityProductPriceRules) { - List<GenericValue> ruleListToUse = FastList.newInstance(); + List<GenericValue> ruleListToUse = new LinkedList<GenericValue>(); ruleListToUse.add(quantityProductPriceRule); ruleListToUse.addAll(nonQuantityProductPriceRules); @@ -525,7 +524,7 @@ public class PriceServices { if ("true".equals(EntityUtilProperties.getPropertyValue("catalog.properties", "convertProductPriceCurrency", delegator))) { if (UtilValidate.isNotEmpty(currencyDefaultUomId) && UtilValidate.isNotEmpty(currencyUomIdTo) && !currencyDefaultUomId.equals(currencyUomIdTo)) { if (UtilValidate.isNotEmpty(result)) { - Map<String, Object> convertPriceMap = FastMap.newInstance(); + Map<String, Object> convertPriceMap = new HashMap<String, Object>(); for (Map.Entry<String, Object> entry : result.entrySet()) { BigDecimal tempPrice = BigDecimal.ZERO; if(entry.getKey() == "basePrice") @@ -546,7 +545,7 @@ public class PriceServices { tempPrice = (BigDecimal) entry.getValue(); if (tempPrice != null && tempPrice != BigDecimal.ZERO) { - Map<String, Object> priceResults = FastMap.newInstance(); + Map<String, Object> priceResults = new HashMap<String, Object>(); try { priceResults = dispatcher.runSync("convertUom", UtilMisc.<String, Object> toMap("uomId", currencyDefaultUomId, "uomIdTo", currencyUomIdTo, "originalValue", tempPrice, "defaultDecimalScale", Long.valueOf(2), "defaultRoundingMode", "HalfUp")); @@ -767,7 +766,7 @@ public class PriceServices { } } - productPriceRules = FastList.newInstance(); + productPriceRules = new LinkedList<GenericValue>(); for (String productPriceRuleId: productPriceRuleIds) { GenericValue productPriceRule = EntityQuery.use(delegator).from("ProductPriceRule").where("productPriceRuleId", productPriceRuleId).cache().queryOne(); if (productPriceRule == null) continue; @@ -780,7 +779,7 @@ public class PriceServices { // productPriceRules = delegator.findByOr("ProductPriceRule", pprExprs); productPriceRules = EntityQuery.use(delegator).from("ProductPriceRule").cache(true).queryList(); - if (productPriceRules == null) productPriceRules = FastList.newInstance(); + if (productPriceRules == null) productPriceRules = new LinkedList<GenericValue>(); } return productPriceRules; @@ -792,9 +791,9 @@ public class PriceServices { String webSiteId, String partyId, BigDecimal quantity, String currencyUomId, Delegator delegator, Timestamp nowTimestamp, Locale locale) throws GenericEntityException { - Map<String, Object> calcResults = FastMap.newInstance(); + Map<String, Object> calcResults = new HashMap<String, Object>(); - List<GenericValue> orderItemPriceInfos = FastList.newInstance(); + List<GenericValue> orderItemPriceInfos = new LinkedList<GenericValue>(); boolean isSale = false; // ========= go through each price rule by id and eval all conditions ========= @@ -1224,9 +1223,9 @@ public class PriceServices { public static Map<String, Object> calculatePurchasePrice(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); - List<GenericValue> orderItemPriceInfos = FastList.newInstance(); + List<GenericValue> orderItemPriceInfos = new LinkedList<GenericValue>(); boolean validPriceFound = false; BigDecimal price = BigDecimal.ZERO; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java Fri Apr 10 20:22:54 2015 @@ -20,13 +20,12 @@ package org.ofbiz.product.product; import java.io.IOException; import java.sql.Timestamp; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -85,7 +84,7 @@ public class KeywordIndex { Set<String> stemSet = KeywordSearchUtil.getStemSet(); Map<String, Long> keywords = new TreeMap<String, Long>(); - List<String> strings = FastList.newInstance(); + List<String> strings = new LinkedList<String>(); int pidWeight = 1; try { @@ -189,7 +188,7 @@ public class KeywordIndex { } } - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); int keywordMaxLength = Integer.parseInt(EntityUtilProperties.getPropertyValue("prodsearch", "product.keyword.max.length", delegator)); for (Map.Entry<String, Long> entry: keywords.entrySet()) { if (entry.getKey().length() <= keywordMaxLength) { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java Fri Apr 10 20:22:54 2015 @@ -21,14 +21,13 @@ package org.ofbiz.product.product; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.StringUtil; @@ -187,7 +186,7 @@ public class ProductContentWrapper imple GenericValue productContent = EntityUtil.getFirst(productContentList); if (productContent != null) { // when rendering the product content, always include the Product and ProductContent records that this comes from - Map<String, Object> inContext = FastMap.newInstance(); + Map<String, Object> inContext = new HashMap<String, Object>(); inContext.put("product", product); inContext.put("productContent", productContent); ContentWorker.renderContentAsText(dispatcher, delegator, productContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, partyId, roleTypeId, true); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java Fri Apr 10 20:22:54 2015 @@ -20,7 +20,10 @@ package org.ofbiz.product.product; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.HashSet; import java.util.Iterator; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -31,10 +34,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 javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilDateTime; @@ -97,7 +96,7 @@ public class ProductEvents { EntityCondition condition = null; if (!"Y".equals(doAll)) { - List<EntityCondition> condList = FastList.newInstance(); + List<EntityCondition> condList = new LinkedList<EntityCondition>(); condList.add(EntityCondition.makeCondition(EntityCondition.makeCondition("autoCreateKeywords", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("autoCreateKeywords", EntityOperator.NOT_EQUAL, "N"))); if ("true".equals(EntityUtilProperties.getPropertyValue("prodsearch", "index.ignore.variants", delegator))) { condList.add(EntityCondition.makeCondition(EntityCondition.makeCondition("isVariant", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("isVariant", EntityOperator.NOT_EQUAL, "Y"))); @@ -204,7 +203,7 @@ public class ProductEvents { */ public static String updateProductAssoc(HttpServletRequest request, HttpServletResponse response) { String errMsg = ""; - List<Object> errMsgList = FastList.newInstance(); + List<Object> errMsgList = new LinkedList<Object>(); Delegator delegator = (Delegator) request.getAttribute("delegator"); Security security = (Security) request.getAttribute("security"); @@ -397,7 +396,7 @@ public class ProductEvents { // just store a new empty list in the session HttpSession session = request.getSession(); if (session != null) { - session.setAttribute("lastViewedCategories", FastList.newInstance()); + session.setAttribute("lastViewedCategories", new LinkedList()); } return "success"; } @@ -407,7 +406,7 @@ public class ProductEvents { // just store a new empty list in the session HttpSession session = request.getSession(); if (session != null) { - session.setAttribute("lastViewedProducts", FastList.newInstance()); + session.setAttribute("lastViewedProducts", new LinkedList()); } return "success"; } @@ -627,7 +626,7 @@ public class ProductEvents { description = null; } - Set<String> variantDescRemoveToRemoveOnVirtual = FastSet.newInstance(); + Set<String> variantDescRemoveToRemoveOnVirtual = new HashSet<String>(); checkUpdateFeatureApplByDescription(variantProductId, variantProduct, description, productFeatureTypeId, productFeatureType, "STANDARD_FEATURE", nowTimestamp, delegator, null, variantDescRemoveToRemoveOnVirtual); checkUpdateFeatureApplByDescription(productId, product, description, productFeatureTypeId, productFeatureType, "SELECTABLE_FEATURE", nowTimestamp, delegator, variantDescRemoveToRemoveOnVirtual, null); @@ -670,7 +669,7 @@ public class ProductEvents { GenericValue productFeatureAndAppl = null; - Set<String> descriptionsForThisType = FastSet.newInstance(); + Set<String> descriptionsForThisType = new HashSet<String>(); List<GenericValue> productFeatureAndApplList = EntityQuery.use(delegator).from("ProductFeatureAndAppl").where("productId", productId, "productFeatureApplTypeId", productFeatureApplTypeId, "productFeatureTypeId", productFeatureTypeId).filterByDate().queryList(); if (productFeatureAndApplList.size() > 0) { Iterator<GenericValue> productFeatureAndApplIter = productFeatureAndApplList.iterator(); @@ -1015,7 +1014,7 @@ public class ProductEvents { paramMap.put("locale", UtilHttp.getLocale(request)); paramMap.put("userLogin", session.getAttribute("userLogin")); - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); context.put("bodyScreenUri", bodyScreenLocation); context.put("bodyParameters", paramMap); context.put("sendTo", paramMap.get("sendTo")); @@ -1055,10 +1054,10 @@ public class ProductEvents { Object compareListObj = session.getAttribute("productCompareList"); List<GenericValue> compareList = null; if (compareListObj == null) { - compareList = FastList.newInstance(); + compareList = new LinkedList<GenericValue>(); } else if (!(compareListObj instanceof List<?>)) { Debug.logWarning("Session attribute productCompareList contains something other than the expected product list, overwriting.", module); - compareList = FastList.newInstance(); + compareList = new LinkedList<GenericValue>(); } else { compareList = UtilGenerics.cast(compareListObj); } @@ -1142,7 +1141,7 @@ public class ProductEvents { public static String clearProductComparisonList(HttpServletRequest request, HttpServletResponse response) { HttpSession session = request.getSession(); - session.setAttribute("productCompareList", FastList.newInstance()); + session.setAttribute("productCompareList", new LinkedList()); String eventMsg = UtilProperties.getMessage("ProductUiLabels", "ProductClearCompareListSuccess", UtilHttp.getLocale(request)); request.setAttribute("_EVENT_MESSAGE_", eventMsg); return "success"; @@ -1174,7 +1173,7 @@ public class ProductEvents { String productTags = request.getParameter("productTags"); String statusId = request.getParameter("statusId"); if (UtilValidate.isNotEmpty(productId) && UtilValidate.isNotEmpty(productTags)) { - List<String> matchList = FastList.newInstance(); + List<String> matchList = new LinkedList<String>(); Pattern regex = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'"); Matcher regexMatcher = regex.matcher(productTags); while (regexMatcher.find()) { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java Fri Apr 10 20:22:54 2015 @@ -22,14 +22,13 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.GeneralRuntimeException; @@ -180,7 +179,7 @@ public class ProductPromoContentWrapper if (UtilValidate.isNotEmpty(productPromoContent)) { // when rendering the product promo content, always include the ProductPromo and ProductPromoContent records that this comes from - Map<String, Object> inContext = FastMap.newInstance(); + Map<String, Object> inContext = new HashMap<String, Object>(); inContext.put("productPromo", productPromo); inContext.put("productPromoContent", productPromoContent); ContentWorker.renderContentAsText(dispatcher, delegator, productPromoContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, partyId, roleTypeId, true); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |