svn commit: r576289 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: lektran
Date: Mon Sep 17 00:50:25 2007 New Revision: 576289 URL: http://svn.apache.org/viewvc?rev=576289&view=rev Log: Removed the following deprecated double methods and renamed their BigDecimal equivalents: getOrderItemsTotal getOrderItemTotal getOrderItemTax getOrderItemShipping getOrderItemAdjustmentsTotal Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.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=576289&r1=576288&r2=576289&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 Mon Sep 17 00:50:25 2007 @@ -1877,8 +1877,8 @@ } BigDecimal itemQuantity = itemQuantityDbl; BigDecimal itemSubTotal = this.getOrderItemSubTotal(orderItem); - BigDecimal itemTaxes = this.getOrderItemTaxBd(orderItem); - BigDecimal itemShipping = this.getOrderItemShippingBd(orderItem); + BigDecimal itemTaxes = this.getOrderItemTax(orderItem); + BigDecimal itemShipping = this.getOrderItemShipping(orderItem); BigDecimal quantityReturnedDouble = (BigDecimal) itemReturnedQuantities.get(orderItem.get("orderItemSeqId")); BigDecimal quantityReturned = ZERO; @@ -2120,58 +2120,28 @@ return getOrderItemSubTotal(orderItem, getAdjustments()); } - public BigDecimal getOrderItemsTotalBd() { - return getOrderItemsTotalBd(getValidOrderItems(), getAdjustments()); + public BigDecimal getOrderItemsTotal() { + return getOrderItemsTotal(getValidOrderItems(), getAdjustments()); } - /** @deprecated */ - public double getOrderItemsTotal() { - return getOrderItemsTotalBd().doubleValue(); - } - - public BigDecimal getOrderItemTotalBd(GenericValue orderItem) { - return getOrderItemTotalBd(orderItem, getAdjustments()); - } - - /** @deprecated */ - public double getOrderItemTotal(GenericValue orderItem) { - return getOrderItemTotalBd(orderItem).doubleValue(); - } - - public BigDecimal getOrderItemTaxBd(GenericValue orderItem) { - return getOrderItemAdjustmentsTotalBd(orderItem, false, true, false); - } - - /** @deprecated */ - public double getOrderItemTax(GenericValue orderItem) { - return getOrderItemTaxBd(orderItem).doubleValue(); - } - - public BigDecimal getOrderItemShippingBd(GenericValue orderItem) { - return getOrderItemAdjustmentsTotalBd(orderItem, false, false, true); - } - - /** @deprecated */ - public double getOrderItemShipping(GenericValue orderItem) { - return getOrderItemShippingBd(orderItem).doubleValue(); + public BigDecimal getOrderItemTotal(GenericValue orderItem) { + return getOrderItemTotal(orderItem, getAdjustments()); } - public BigDecimal getOrderItemAdjustmentsTotalBd(GenericValue orderItem, boolean includeOther, boolean includeTax, boolean includeShipping) { - return getOrderItemAdjustmentsTotalBd(orderItem, getAdjustments(), includeOther, includeTax, includeShipping); + public BigDecimal getOrderItemTax(GenericValue orderItem) { + return getOrderItemAdjustmentsTotal(orderItem, false, true, false); } - /** @deprecated */ - public double getOrderItemAdjustmentsTotal(GenericValue orderItem, boolean includeOther, boolean includeTax, boolean includeShipping) { - return getOrderItemAdjustmentsTotalBd(orderItem, getAdjustments(), includeOther, includeTax, includeShipping).doubleValue(); + public BigDecimal getOrderItemShipping(GenericValue orderItem) { + return getOrderItemAdjustmentsTotal(orderItem, false, false, true); } - public BigDecimal getOrderItemAdjustmentsTotalBd(GenericValue orderItem) { - return getOrderItemAdjustmentsTotalBd(orderItem, true, false, false); + public BigDecimal getOrderItemAdjustmentsTotal(GenericValue orderItem, boolean includeOther, boolean includeTax, boolean includeShipping) { + return getOrderItemAdjustmentsTotal(orderItem, getAdjustments(), includeOther, includeTax, includeShipping); } - /** @deprecated */ - public double getOrderItemAdjustmentsTotal(GenericValue orderItem) { - return getOrderItemAdjustmentsTotalBd(orderItem, true, false, false).doubleValue(); + public BigDecimal getOrderItemAdjustmentsTotal(GenericValue orderItem) { + return getOrderItemAdjustmentsTotal(orderItem, true, false, false); } public BigDecimal getOrderItemAdjustmentTotalBd(GenericValue orderItem, GenericValue adjustment) { @@ -2306,7 +2276,7 @@ } public static BigDecimal getOrderGrandTotal(List orderItems, List adjustments) { - BigDecimal total = getOrderItemsTotalBd(orderItems, adjustments); + BigDecimal total = getOrderItemsTotal(orderItems, adjustments); BigDecimal adj = getOrderAdjustmentsTotal(orderItems, adjustments); return total.add(adj).setScale(scale,rounding); } @@ -2496,34 +2466,24 @@ } // subtotal also includes non tax and shipping adjustments; tax and shipping will be calculated using this adjusted value - result =result.add(getOrderItemAdjustmentsTotalBd(orderItem, adjustments, true, false, false, forTax, forShipping)); + result = result.add(getOrderItemAdjustmentsTotal(orderItem, adjustments, true, false, false, forTax, forShipping)); return result.setScale(scale, rounding); } - public static BigDecimal getOrderItemsTotalBd(List orderItems, List adjustments) { + public static BigDecimal getOrderItemsTotal(List orderItems, List adjustments) { BigDecimal result = ZERO; Iterator itemIter = UtilMisc.toIterator(orderItems); while (itemIter != null && itemIter.hasNext()) { - result = result.add(getOrderItemTotalBd((GenericValue) itemIter.next(), adjustments)); + result = result.add(getOrderItemTotal((GenericValue) itemIter.next(), adjustments)); } return result.setScale(scale, rounding); } - /** @deprecated */ - public static double getOrderItemsTotal(List orderItems, List adjustments) { - return getOrderItemsTotalBd(orderItems, adjustments).doubleValue(); - } - - public static BigDecimal getOrderItemTotalBd(GenericValue orderItem, List adjustments) { + public static BigDecimal getOrderItemTotal(GenericValue orderItem, List adjustments) { // add tax and shipping to subtotal - return getOrderItemSubTotal(orderItem, adjustments).add(getOrderItemAdjustmentsTotalBd(orderItem, adjustments, false, true, true)); - } - - /** @deprecated */ - public static double getOrderItemTotal(GenericValue orderItem, List adjustments) { - return getOrderItemTotalBd(orderItem, adjustments).doubleValue(); + return getOrderItemSubTotal(orderItem, adjustments).add(getOrderItemAdjustmentsTotal(orderItem, adjustments, false, true, true)); } public static Double getWorkEffortRentalLenght(GenericValue workEffort){ @@ -2577,7 +2537,7 @@ Iterator itemIter = UtilMisc.toIterator(orderItems); while (itemIter != null && itemIter.hasNext()) { - result = result.add(getOrderItemAdjustmentsTotalBd((GenericValue) itemIter.next(), adjustments, includeOther, includeTax, includeShipping)).setScale(scale, rounding); + result = result.add(getOrderItemAdjustmentsTotal((GenericValue) itemIter.next(), adjustments, includeOther, includeTax, includeShipping)).setScale(scale, rounding); } return result; } @@ -2588,25 +2548,15 @@ } /** The passed adjustments can be all adjustments for the order, ie for all line items */ - public static BigDecimal getOrderItemAdjustmentsTotalBd(GenericValue orderItem, List adjustments, boolean includeOther, boolean includeTax, boolean includeShipping) { - return getOrderItemAdjustmentsTotalBd(orderItem, adjustments, includeOther, includeTax, includeShipping, false, false); - } - - /** @deprecated */ - public static double getOrderItemAdjustmentsTotal(GenericValue orderItem, List adjustments, boolean includeOther, boolean includeTax, boolean includeShipping) { - return getOrderItemAdjustmentsTotalBd(orderItem, adjustments, includeOther, includeTax, includeShipping, false, false).doubleValue(); + public static BigDecimal getOrderItemAdjustmentsTotal(GenericValue orderItem, List adjustments, boolean includeOther, boolean includeTax, boolean includeShipping) { + return getOrderItemAdjustmentsTotal(orderItem, adjustments, includeOther, includeTax, includeShipping, false, false); } /** The passed adjustments can be all adjustments for the order, ie for all line items */ - public static BigDecimal getOrderItemAdjustmentsTotalBd(GenericValue orderItem, List adjustments, boolean includeOther, boolean includeTax, boolean includeShipping, boolean forTax, boolean forShipping) { + public static BigDecimal getOrderItemAdjustmentsTotal(GenericValue orderItem, List adjustments, boolean includeOther, boolean includeTax, boolean includeShipping, boolean forTax, boolean forShipping) { return calcItemAdjustmentsBd(getOrderItemQuantityBd(orderItem), orderItem.getBigDecimal("unitPrice"), getOrderItemAdjustmentList(orderItem, adjustments), includeOther, includeTax, includeShipping, forTax, forShipping); - } - - /** @deprecated */ - public double getOrderItemAdjustmentsTotal(GenericValue orderItem, List adjustments, boolean includeOther, boolean includeTax, boolean includeShipping, boolean forTax, boolean forShipping) { - return getOrderItemAdjustmentsTotalBd(orderItem, adjustments, includeOther, includeTax, includeShipping, forTax, forShipping).doubleValue(); } public static List getOrderItemAdjustmentList(GenericValue orderItem, List adjustments) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=576289&r1=576288&r2=576289&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Mon Sep 17 00:50:25 2007 @@ -1347,7 +1347,7 @@ try { products.add(i, delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId))); // get the product entity amounts.add(i, OrderReadHelper.getOrderItemSubTotal(orderItem, allAdjustments, true, false)); // get the item amount - shipAmts.add(i, OrderReadHelper.getOrderItemAdjustmentsTotalBd(orderItem, allAdjustments, false, false, true)); // get the shipping amount + shipAmts.add(i, OrderReadHelper.getOrderItemAdjustmentsTotal(orderItem, allAdjustments, false, false, true)); // get the shipping amount itPrices.add(i, orderItem.getBigDecimal("unitPrice")); } catch (GenericEntityException e) { Debug.logError(e, "Cannot read order item entity : " + orderItem, module); |
Re: svn commit: r576289 - in /ofbiz/trunk/applications/orde
|
|
Please verify this.
Other methods which are not deprecated are deleted as well. On 9/17/07, [hidden email] <[hidden email]> wrote: > > Author: lektran > Date: Mon Sep 17 00:50:25 2007 > New Revision: 576289 > > URL: http://svn.apache.org/viewvc?rev=576289&view=rev > Log: > Removed the following deprecated double methods and renamed their > BigDecimal equivalents: > getOrderItemsTotal > getOrderItemTotal > getOrderItemTax > getOrderItemShipping > getOrderItemAdjustmentsTotal > > Modified: > > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java > > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.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=576289&r1=576288&r2=576289&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 > Mon Sep 17 00:50:25 2007 > @@ -1877,8 +1877,8 @@ > } > BigDecimal itemQuantity = itemQuantityDbl; > BigDecimal itemSubTotal = this.getOrderItemSubTotal > (orderItem); > - BigDecimal itemTaxes = this.getOrderItemTaxBd(orderItem); > - BigDecimal itemShipping = this.getOrderItemShippingBd > (orderItem); > + BigDecimal itemTaxes = this.getOrderItemTax(orderItem); > + BigDecimal itemShipping = this.getOrderItemShipping > (orderItem); > > BigDecimal quantityReturnedDouble = (BigDecimal) > itemReturnedQuantities.get(orderItem.get("orderItemSeqId")); > BigDecimal quantityReturned = ZERO; > @@ -2120,58 +2120,28 @@ > return getOrderItemSubTotal(orderItem, getAdjustments()); > } > > - public BigDecimal getOrderItemsTotalBd() { > - return getOrderItemsTotalBd(getValidOrderItems(), > getAdjustments()); > + public BigDecimal getOrderItemsTotal() { > + return getOrderItemsTotal(getValidOrderItems(), > getAdjustments()); > } > > - /** @deprecated */ > - public double getOrderItemsTotal() { > - return getOrderItemsTotalBd().doubleValue(); > - } > - > - public BigDecimal getOrderItemTotalBd(GenericValue orderItem) { > - return getOrderItemTotalBd(orderItem, getAdjustments()); > - } > - > - /** @deprecated */ > - public double getOrderItemTotal(GenericValue orderItem) { > - return getOrderItemTotalBd(orderItem).doubleValue(); > - } > - > - public BigDecimal getOrderItemTaxBd(GenericValue orderItem) { > - return getOrderItemAdjustmentsTotalBd(orderItem, false, true, > false); > - } > - > - /** @deprecated */ > - public double getOrderItemTax(GenericValue orderItem) { > - return getOrderItemTaxBd(orderItem).doubleValue(); > - } > - > - public BigDecimal getOrderItemShippingBd(GenericValue orderItem) { > - return getOrderItemAdjustmentsTotalBd(orderItem, false, false, > true); > - } > - > - /** @deprecated */ > - public double getOrderItemShipping(GenericValue orderItem) { > - return getOrderItemShippingBd(orderItem).doubleValue(); > + public BigDecimal getOrderItemTotal(GenericValue orderItem) { > + return getOrderItemTotal(orderItem, getAdjustments()); > } > > - public BigDecimal getOrderItemAdjustmentsTotalBd(GenericValue > orderItem, boolean includeOther, boolean includeTax, boolean > includeShipping) { > - return getOrderItemAdjustmentsTotalBd(orderItem, > getAdjustments(), includeOther, includeTax, includeShipping); > + public BigDecimal getOrderItemTax(GenericValue orderItem) { > + return getOrderItemAdjustmentsTotal(orderItem, false, true, > false); > } > > - /** @deprecated */ > - public double getOrderItemAdjustmentsTotal(GenericValue orderItem, > boolean includeOther, boolean includeTax, boolean includeShipping) { > - return getOrderItemAdjustmentsTotalBd(orderItem, > getAdjustments(), includeOther, includeTax, includeShipping).doubleValue(); > + public BigDecimal getOrderItemShipping(GenericValue orderItem) { > + return getOrderItemAdjustmentsTotal(orderItem, false, false, > true); > } > > - public BigDecimal getOrderItemAdjustmentsTotalBd(GenericValue > orderItem) { > - return getOrderItemAdjustmentsTotalBd(orderItem, true, false, > false); > + public BigDecimal getOrderItemAdjustmentsTotal(GenericValue > orderItem, boolean includeOther, boolean includeTax, boolean > includeShipping) { > + return getOrderItemAdjustmentsTotal(orderItem, getAdjustments(), > includeOther, includeTax, includeShipping); > } > > - /** @deprecated */ > - public double getOrderItemAdjustmentsTotal(GenericValue orderItem) { > - return getOrderItemAdjustmentsTotalBd(orderItem, true, false, > false).doubleValue(); > + public BigDecimal getOrderItemAdjustmentsTotal(GenericValue > orderItem) { > + return getOrderItemAdjustmentsTotal(orderItem, true, false, > false); > } > > public BigDecimal getOrderItemAdjustmentTotalBd(GenericValue > orderItem, GenericValue adjustment) { > @@ -2306,7 +2276,7 @@ > } > > public static BigDecimal getOrderGrandTotal(List orderItems, List > adjustments) { > - BigDecimal total = getOrderItemsTotalBd(orderItems, adjustments); > + BigDecimal total = getOrderItemsTotal(orderItems, adjustments); > BigDecimal adj = getOrderAdjustmentsTotal(orderItems, > adjustments); > return total.add(adj).setScale(scale,rounding); > } > @@ -2496,34 +2466,24 @@ > } > > // subtotal also includes non tax and shipping adjustments; tax > and shipping will be calculated using this adjusted value > - result =result.add(getOrderItemAdjustmentsTotalBd(orderItem, > adjustments, true, false, false, forTax, forShipping)); > + result = result.add(getOrderItemAdjustmentsTotal(orderItem, > adjustments, true, false, false, forTax, forShipping)); > > return result.setScale(scale, rounding); > } > > - public static BigDecimal getOrderItemsTotalBd(List orderItems, List > adjustments) { > + public static BigDecimal getOrderItemsTotal(List orderItems, List > adjustments) { > BigDecimal result = ZERO; > Iterator itemIter = UtilMisc.toIterator(orderItems); > > while (itemIter != null && itemIter.hasNext()) { > - result = result.add(getOrderItemTotalBd((GenericValue) > itemIter.next(), adjustments)); > + result = result.add(getOrderItemTotal((GenericValue) > itemIter.next(), adjustments)); > } > return result.setScale(scale, rounding); > } > > - /** @deprecated */ > - public static double getOrderItemsTotal(List orderItems, List > adjustments) { > - return getOrderItemsTotalBd(orderItems, > adjustments).doubleValue(); > - } > - > - public static BigDecimal getOrderItemTotalBd(GenericValue orderItem, > List adjustments) { > + public static BigDecimal getOrderItemTotal(GenericValue orderItem, > List adjustments) { > // add tax and shipping to subtotal > - return getOrderItemSubTotal(orderItem, > adjustments).add(getOrderItemAdjustmentsTotalBd(orderItem, adjustments, > false, true, true)); > - } > - > - /** @deprecated */ > - public static double getOrderItemTotal(GenericValue orderItem, List > adjustments) { > - return getOrderItemTotalBd(orderItem, adjustments).doubleValue(); > + return getOrderItemSubTotal(orderItem, > adjustments).add(getOrderItemAdjustmentsTotal(orderItem, adjustments, false, > true, true)); > } > > public static Double getWorkEffortRentalLenght(GenericValue > workEffort){ > @@ -2577,7 +2537,7 @@ > Iterator itemIter = UtilMisc.toIterator(orderItems); > > while (itemIter != null && itemIter.hasNext()) { > - result = result.add(getOrderItemAdjustmentsTotalBd((GenericValue) > itemIter.next(), adjustments, includeOther, includeTax, > includeShipping)).setScale(scale, rounding); > + result = result.add(getOrderItemAdjustmentsTotal((GenericValue) > itemIter.next(), adjustments, includeOther, includeTax, > includeShipping)).setScale(scale, rounding); > } > return result; > } > @@ -2588,25 +2548,15 @@ > } > > /** The passed adjustments can be all adjustments for the order, ie > for all line items */ > - public static BigDecimal getOrderItemAdjustmentsTotalBd(GenericValue > orderItem, List adjustments, boolean includeOther, boolean includeTax, > boolean includeShipping) { > - return getOrderItemAdjustmentsTotalBd(orderItem, adjustments, > includeOther, includeTax, includeShipping, false, false); > - } > - > - /** @deprecated */ > - public static double getOrderItemAdjustmentsTotal(GenericValue > orderItem, List adjustments, boolean includeOther, boolean includeTax, > boolean includeShipping) { > - return getOrderItemAdjustmentsTotalBd(orderItem, adjustments, > includeOther, includeTax, includeShipping, false, false).doubleValue(); > + public static BigDecimal getOrderItemAdjustmentsTotal(GenericValue > orderItem, List adjustments, boolean includeOther, boolean includeTax, > boolean includeShipping) { > + return getOrderItemAdjustmentsTotal(orderItem, adjustments, > includeOther, includeTax, includeShipping, false, false); > } > > /** The passed adjustments can be all adjustments for the order, ie > for all line items */ > - public static BigDecimal getOrderItemAdjustmentsTotalBd(GenericValue > orderItem, List adjustments, boolean includeOther, boolean includeTax, > boolean includeShipping, boolean forTax, boolean forShipping) { > + public static BigDecimal getOrderItemAdjustmentsTotal(GenericValue > orderItem, List adjustments, boolean includeOther, boolean includeTax, > boolean includeShipping, boolean forTax, boolean forShipping) { > return calcItemAdjustmentsBd(getOrderItemQuantityBd(orderItem), > orderItem.getBigDecimal("unitPrice"), > getOrderItemAdjustmentList(orderItem, adjustments), > includeOther, includeTax, includeShipping, forTax, > forShipping); > - } > - > - /** @deprecated */ > - public double getOrderItemAdjustmentsTotal(GenericValue orderItem, > List adjustments, boolean includeOther, boolean includeTax, boolean > includeShipping, boolean forTax, boolean forShipping) { > - return getOrderItemAdjustmentsTotalBd(orderItem, adjustments, > includeOther, includeTax, includeShipping, forTax, > forShipping).doubleValue(); > } > > public static List getOrderItemAdjustmentList(GenericValue orderItem, > List adjustments) { > > Modified: > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=576289&r1=576288&r2=576289&view=diff > > ============================================================================== > --- > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java > (original) > +++ > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java > Mon Sep 17 00:50:25 2007 > @@ -1347,7 +1347,7 @@ > try { > products.add(i, delegator.findByPrimaryKey("Product", > UtilMisc.toMap("productId", productId))); // get the product entity > amounts.add(i, > OrderReadHelper.getOrderItemSubTotal(orderItem, allAdjustments, true, > false)); // get the item amount > - shipAmts.add(i, > OrderReadHelper.getOrderItemAdjustmentsTotalBd(orderItem, allAdjustments, > false, false, true)); // get the shipping amount > + shipAmts.add(i, > OrderReadHelper.getOrderItemAdjustmentsTotal(orderItem, allAdjustments, > false, false, true)); // get the shipping amount > itPrices.add(i, orderItem.getBigDecimal > ("unitPrice")); > } catch (GenericEntityException e) { > Debug.logError(e, "Cannot read order item > entity : " + orderItem, module); > > > -- Vikas Mayur |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |