[Comxe-cvslog] Trifon-HG-ERP/src/name/trifon/erp/model/tax ImportTax.java, 1.2, 1.3 BasicSalesTax.j
Brought to you by:
trifonnt
From: Trifon N. T. <tri...@us...> - 2008-11-27 11:59:13
|
Update of /cvsroot/comxe/Trifon-HG-ERP/src/name/trifon/erp/model/tax In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27001/src/name/trifon/erp/model/tax Modified Files: ImportTax.java BasicSalesTax.java Tax.java Log Message: added more interfaces. Index: ImportTax.java =================================================================== RCS file: /cvsroot/comxe/Trifon-HG-ERP/src/name/trifon/erp/model/tax/ImportTax.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImportTax.java 30 Apr 2008 07:05:28 -0000 1.2 --- ImportTax.java 27 Nov 2008 11:59:08 -0000 1.3 *************** *** 19,23 **** import java.math.BigDecimal; ! import name.trifon.erp.model.order.OrderLine; public class ImportTax extends Tax { --- 19,23 ---- import java.math.BigDecimal; ! import name.trifon.erp.model.order.IOrderLineItem; public class ImportTax extends Tax { *************** *** 41,45 **** } ! public boolean isTaxApplicable(OrderLine line) { return true; } --- 41,45 ---- } ! public boolean isTaxApplicable(IOrderLineItem line) { return true; } Index: Tax.java =================================================================== RCS file: /cvsroot/comxe/Trifon-HG-ERP/src/name/trifon/erp/model/tax/Tax.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Tax.java 6 Sep 2008 12:29:05 -0000 1.4 --- Tax.java 27 Nov 2008 11:59:08 -0000 1.5 *************** *** 20,24 **** import java.util.logging.Logger; ! import name.trifon.erp.model.order.OrderLine; import name.trifon.erp.model.tax.calculation.FiveCentRoundingTaxCalculationAlgorithm; import name.trifon.erp.model.tax.calculation.ITaxCalculationAlgorithm; --- 20,24 ---- import java.util.logging.Logger; ! import name.trifon.erp.model.order.IOrderLineItem; import name.trifon.erp.model.tax.calculation.FiveCentRoundingTaxCalculationAlgorithm; import name.trifon.erp.model.tax.calculation.ITaxCalculationAlgorithm; *************** *** 67,71 **** * @return tax rate */ ! public BigDecimal getTaxRate(OrderLine line) { return rate; } --- 67,71 ---- * @return tax rate */ ! public BigDecimal getTaxRate(IOrderLineItem line) { return rate; } *************** *** 77,81 **** * @return tax for given OrderLine */ ! public BigDecimal calculateTax(OrderLine line) { if (line == null) { throw new IllegalArgumentException("Order Line MUST not be null!"); --- 77,81 ---- * @return tax for given OrderLine */ ! public BigDecimal calculateTax(IOrderLineItem line) { if (line == null) { throw new IllegalArgumentException("Order Line MUST not be null!"); *************** *** 100,104 **** * @return true if tax have to be applied */ ! public abstract boolean isTaxApplicable(OrderLine line); /** --- 100,104 ---- * @return true if tax have to be applied */ ! public abstract boolean isTaxApplicable(IOrderLineItem line); /** Index: BasicSalesTax.java =================================================================== RCS file: /cvsroot/comxe/Trifon-HG-ERP/src/name/trifon/erp/model/tax/BasicSalesTax.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BasicSalesTax.java 6 Sep 2008 12:29:05 -0000 1.3 --- BasicSalesTax.java 27 Nov 2008 11:59:08 -0000 1.4 *************** *** 19,24 **** import java.math.BigDecimal; ! import name.trifon.erp.model.order.OrderLine; ! import name.trifon.erp.model.product.ProductGroup; public class BasicSalesTax extends Tax { --- 19,24 ---- import java.math.BigDecimal; ! import name.trifon.erp.model.order.IOrderLineItem; ! import name.trifon.erp.model.product.impl.ProductGroup; public class BasicSalesTax extends Tax { *************** *** 38,42 **** } ! public boolean isTaxApplicable(OrderLine line) { boolean result = true; --- 38,42 ---- } ! public boolean isTaxApplicable(IOrderLineItem line) { boolean result = true; |