svn commit: r576018 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java

[lektran]

Author: lektran
Date: Sat Sep 15 18:24:56 2007
New Revision: 576018

URL: http://svn.apache.org/viewvc?rev=576018&view=rev
Log:
Removed deprecated getOrderAdjustmentsTotal() and renamed getOrderAdjustmentsTotalBd()

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=576018&r1=576017&r2=576018&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Sat Sep 15 18:24:56 2007
@@ -1326,13 +1326,8 @@
         return getOrderHeaderStatuses(getOrderStatuses());
     }
 
-    public BigDecimal getOrderAdjustmentsTotalBd() {
-        return getOrderAdjustmentsTotalBd(getValidOrderItems(), getAdjustments());
-    }
-
-    /** @deprecated Use getOrderAdjustmentsTotalBd() instead */
-    public double getOrderAdjustmentsTotal() {
-        return getOrderAdjustmentsTotalBd().doubleValue();
+    public BigDecimal getOrderAdjustmentsTotal() {
+        return getOrderAdjustmentsTotal(getValidOrderItems(), getAdjustments());
     }
 
     public BigDecimal getOrderAdjustmentTotalBd(GenericValue adjustment) {
@@ -2382,7 +2377,7 @@
 
     public static BigDecimal getOrderGrandTotal(List orderItems, List adjustments) {
         BigDecimal total = getOrderItemsTotalBd(orderItems, adjustments);
-        BigDecimal adj = getOrderAdjustmentsTotalBd(orderItems, adjustments);
+        BigDecimal adj = getOrderAdjustmentsTotal(orderItems, adjustments);
         return total.add(adj).setScale(scale,rounding);
     }
 
@@ -2422,13 +2417,8 @@
         return newOrderStatuses;
     }
 
-    public static BigDecimal getOrderAdjustmentsTotalBd(List orderItems, List adjustments) {
+    public static BigDecimal getOrderAdjustmentsTotal(List orderItems, List adjustments) {
         return calcOrderAdjustmentsBd(getOrderHeaderAdjustments(adjustments, null), getOrderItemsSubTotalBd(orderItems, adjustments), true, true, true);
-    }
-
-    /** @deprecated */
-    public static double getOrderAdjustmentsTotal(List orderItems, List adjustments) {
-        return getOrderAdjustmentsTotalBd(orderItems, adjustments).doubleValue();
     }
 
     public static List getOrderSurveyResponses(GenericValue orderHeader) {