svn commit: r585854 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/ applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/ applications/order/src/org/ofbiz/order/shoppingcart/ applications/product/s...

[doogie-3]

Author: doogie
Date: Wed Oct 17 21:11:26 2007
New Revision: 585854

URL: http://svn.apache.org/viewvc?rev=585854&view=rev
Log:
Remove most uses of LinkedMap, and replace with LinkedHashMap.

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
    ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Wed Oct 17 21:11:26 2007
@@ -27,6 +27,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -54,8 +55,6 @@
 import org.ofbiz.service.ModelService;
 import org.ofbiz.service.LocalDispatcher;
 
-import org.apache.commons.collections.map.LinkedMap;
-
 
 public class PayPalEvents {
     
@@ -129,7 +128,7 @@
         String payPalAccount = UtilProperties.getPropertyValue(configString, "payment.paypal.business");
                 
         // create the redirect string
-        Map parameters = new LinkedMap();
+        Map parameters = new LinkedHashMap();
         parameters.put("cmd", "_xclick");
         parameters.put("business", payPalAccount);
         parameters.put("item_name", itemName);

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Wed Oct 17 21:11:26 2007
@@ -24,7 +24,6 @@
 
 import com.Verisign.payment.PFProAPI;
 
-import org.apache.commons.collections.map.LinkedMap;
 import org.ofbiz.accounting.payment.PaymentGatewayServices;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.StringUtil;
@@ -340,7 +339,7 @@
 
     private static void parseAuthResponse(String resp, Map result, String resource, boolean isReAuth) {
         Debug.logInfo("Verisign response string: " + resp, module);
-        Map parameters = new LinkedMap();
+        Map parameters = new HashMap();
         List params = StringUtil.split(resp, "&");
         Iterator i = params.iterator();
 
@@ -428,7 +427,7 @@
     }
 
     private static void parseCaptureResponse(String resp, Map result) {
-        Map parameters = new LinkedMap();
+        Map parameters = new HashMap();
         List params = StringUtil.split(resp, "&");
         Iterator i = params.iterator();
 
@@ -470,7 +469,7 @@
     }
 
     private static void parseVoidResponse(String resp, Map result) {
-        Map parameters = new LinkedMap();
+        Map parameters = new HashMap();
         List params = StringUtil.split(resp, "&");
         Iterator i = params.iterator();
 
@@ -512,7 +511,7 @@
     }
 
     private static void parseRefundResponse(String resp, Map result) {
-        Map parameters = new LinkedMap();
+        Map parameters = new HashMap();
         List params = StringUtil.split(resp, "&");
         Iterator i = params.iterator();
 

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Wed Oct 17 21:11:26 2007
@@ -26,7 +26,6 @@
 import javolution.util.FastList;
 import javolution.util.FastMap;
 
-import org.apache.commons.collections.map.LinkedMap;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilDateTime;
@@ -1878,7 +1877,7 @@
     }
 
     public Map getShipGroups(ShoppingCartItem item) {
-        Map shipGroups = new LinkedMap();
+        Map shipGroups = new LinkedHashMap();
         if (item != null) {
             for (int i = 0; i < this.shipInfo.size(); i++) {
                 CartShipInfo csi = (CartShipInfo) shipInfo.get(i);
@@ -4051,7 +4050,7 @@
     }
 
     public static class CartShipInfo implements Serializable {
-        public LinkedMap shipItemInfo = new LinkedMap();
+        public Map shipItemInfo = new LinkedHashMap();
         public List shipTaxAdj = new LinkedList();
         public String orderTypeId = null;
         private String internalContactMechId = null;

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Wed Oct 17 21:11:26 2007
@@ -21,8 +21,6 @@
 import java.sql.Timestamp;
 import java.util.*;
 
-import org.apache.commons.collections.map.LinkedMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
@@ -503,7 +501,7 @@
         throws IllegalArgumentException, IllegalStateException {
         //List featureKey = new ArrayList();
         Map tempGroup = new HashMap();
-        Map group = new LinkedMap();
+        Map group = new LinkedHashMap();
         String orderKey = (String) order.get(index);
 
         if (featureList == null) {
@@ -611,7 +609,7 @@
     // builds a variant sample (a single sku for a featureType)
     private static Map makeVariantSample(GenericDelegator delegator, Map featureList, List items, String feature) {
         Map tempSample = new HashMap();
-        Map sample = new LinkedMap();
+        Map sample = new LinkedHashMap();
         Iterator itemIt = items.iterator();
 
         while (itemIt.hasNext()) {

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Wed Oct 17 21:11:26 2007
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -30,8 +31,6 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.jsp.PageContext;
 
-import org.apache.commons.collections.map.LinkedMap;
-
 import org.ofbiz.base.util.*;
 import org.ofbiz.common.geo.GeoWorker;
 import org.ofbiz.entity.GenericDelegator;
@@ -443,7 +442,7 @@
     }
 
     public static Map getOptionalProductFeatures(GenericDelegator delegator, String productId) {
-        Map featureMap = new LinkedMap();
+        Map featureMap = new LinkedHashMap();
 
         List productFeatureAppls = null;
         try {

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java Wed Oct 17 21:11:26 2007
@@ -19,6 +19,7 @@
 package org.ofbiz.service.mail;
 
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -43,8 +44,6 @@
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.GenericServiceException;
 
-import org.apache.commons.collections.map.LinkedMap;
-
 public class JavaMailContainer implements Container {
 
     public static final String module = JavaMailContainer.class.getName();
@@ -71,7 +70,7 @@
      */
     public void init(String[] args, String configFile) throws ContainerException {
         this.configFile = configFile;      
-        this.stores = new LinkedMap();
+        this.stores = new LinkedHashMap();
         this.pollTimer = new Timer();
     }
 

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/expression/BaseEntityCondExprBldr.java Wed Oct 17 21:11:26 2007
@@ -22,10 +22,10 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.map.LinkedMap;
 import org.enhydra.shark.api.common.ExpressionBuilder;
 import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilMisc;
@@ -44,8 +44,8 @@
     public static final String module = BaseEntityCondExprBldr.class.getName();
 
     protected EntityCondition condition = null;
-    protected Map entityNames = new LinkedMap();
-    protected Map fieldNames = new LinkedMap();
+    protected Map entityNames = new LinkedHashMap();
+    protected Map fieldNames = new LinkedHashMap();
     protected List autoFields = new ArrayList();
     protected List viewLinks = new ArrayList();
 

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java Wed Oct 17 21:11:26 2007
@@ -23,6 +23,7 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -30,8 +31,6 @@
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilProperties;
 
-import org.apache.commons.collections.map.LinkedMap;
-
 
 /**
  * KeyboardAdaptor - Handles reading keyboard input
@@ -51,7 +50,7 @@
     public static final int ALL_DATA = 999;
 
     protected static List loadedComponents = new LinkedList();
-    protected static Map receivers = new LinkedMap();
+    protected static Map receivers = new LinkedHashMap();
     protected static KeyboardAdaptor adaptor = null;
     protected static boolean running = true;
 

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java?rev=585854&r1=585853&r2=585854&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java Wed Oct 17 21:11:26 2007
@@ -43,8 +43,6 @@
 import org.ofbiz.pos.screen.PosDialog;
 import org.ofbiz.pos.screen.PosScreen;
 
-import org.apache.commons.collections.map.LinkedMap;
-
 public class Receipt extends GenericDevice implements DialogCallback {
 
     public static final String module = Receipt.class.getName();
@@ -64,7 +62,7 @@
     protected SimpleDateFormat[] dateFormat = null;
     protected String[] storeReceiptTmpl = null;
     protected String[] custReceiptTmpl = null;
-    protected LinkedMap reportTmpl = new LinkedMap();
+    protected Map reportTmpl = new HashMap();
 
     protected String[] dateFmtStr = { "EEE, d MMM yyyy HH:mm:ss z", "EEE, d MMM yyyy HH:mm:ss z", "EEE, d MMM yyyy HH:mm:ss z" };
     protected int[] priceLength = { 7, 7, 7 };