svn commit: r1833214 - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java

[jleroux]

Author: jleroux
Date: Fri Jun  8 20:41:18 2018
New Revision: 1833214

URL: http://svn.apache.org/viewvc?rev=1833214&view=rev
Log:
Improved: no functional change, fixes formatting found by chance

Modified:
    
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java

Modified: 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java?rev=1833214&r1=1833213&r2=1833214&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
 Fri Jun  8 20:41:18 2018
@@ -102,34 +102,32 @@ public class OrderEvents {
         String  orderId = request.getParameter("orderId");
         String[] selectedItems = request.getParameterValues("selectedItem");
 
-
-
         if (selectedItems != null) {
             for (String selectedItem : selectedItems) {
                 String [] orderItemSeqIdAndOrderItemShipGrpId = 
selectedItem.split(":");
                 String orderItemSeqId = orderItemSeqIdAndOrderItemShipGrpId[0];
                 String shipGroupSeqId = orderItemSeqIdAndOrderItemShipGrpId[1];
-                        BigDecimal cancelQuantity = new 
BigDecimal(request.getParameter("iqm_"+orderItemSeqId+":"+shipGroupSeqId));
-                        Map<String, Object> contextMap = new HashMap<>();
-                        contextMap.put("orderId", orderId);
-                        contextMap.put("orderItemSeqId", orderItemSeqId);
-                        contextMap.put("shipGroupSeqId", shipGroupSeqId);
-                        contextMap.put("cancelQuantity", cancelQuantity);
-                        contextMap.put("userLogin", userLogin);
-                        contextMap.put("locale", locale);
-                        try {
-                            resultMap = dispatcher.runSync("cancelOrderItem", 
contextMap);
-                            if (ServiceUtil.isError(resultMap)) {
-                                String errorMessage = 
ServiceUtil.getErrorMessage(resultMap);
-                                request.setAttribute("_ERROR_MESSAGE_", 
errorMessage);
-                                Debug.logError(errorMessage, module);
-                                return "error";
-                            }
-                        } catch (GenericServiceException e) {
-                            Debug.logError(e, module);
-                            request.setAttribute("_ERROR_MESSAGE_", 
e.getMessage());
-                            return "error";
-                        }
+                BigDecimal cancelQuantity = new 
BigDecimal(request.getParameter("iqm_"+orderItemSeqId+":"+shipGroupSeqId));
+                Map<String, Object> contextMap = new HashMap<>();
+                contextMap.put("orderId", orderId);
+                contextMap.put("orderItemSeqId", orderItemSeqId);
+                contextMap.put("shipGroupSeqId", shipGroupSeqId);
+                contextMap.put("cancelQuantity", cancelQuantity);
+                contextMap.put("userLogin", userLogin);
+                contextMap.put("locale", locale);
+                try {
+                    resultMap = dispatcher.runSync("cancelOrderItem", 
contextMap);
+                    if (ServiceUtil.isError(resultMap)) {
+                        String errorMessage = 
ServiceUtil.getErrorMessage(resultMap);
+                        request.setAttribute("_ERROR_MESSAGE_", errorMessage);
+                        Debug.logError(errorMessage, module);
+                        return "error";
+                    }
+                } catch (GenericServiceException e) {
+                    Debug.logError(e, module);
+                    request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
+                    return "error";
+                }
             }
             return "success";
         }