|
From: Pelle B. <pe...@us...> - 2004-03-25 19:14:13
|
Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/src/java/org/neuclear/ledger Modified Files: PostedHeldTransaction.java PostedTransaction.java UnBalancedTransactionException.java Log Message: PostedTransaction and friend now verify the unpostedtransaction is balanced. Updated schema for HHeld to include a cancelled field and a completed field. (The latter doesnt yet work right). Need to read more Hibernate docs to find out why. Index: PostedHeldTransaction.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/PostedHeldTransaction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PostedHeldTransaction.java 21 Mar 2004 00:48:36 -0000 1.6 --- PostedHeldTransaction.java 25 Mar 2004 19:03:23 -0000 1.7 *************** *** 9,13 **** */ public final class PostedHeldTransaction extends PostedTransaction implements HeldTransaction { ! public PostedHeldTransaction(final UnPostedHeldTransaction orig, Date time) throws InvalidTransactionException { super(orig, time); this.expiryTime = orig.getExpiryTime(); --- 9,13 ---- */ public final class PostedHeldTransaction extends PostedTransaction implements HeldTransaction { ! public PostedHeldTransaction(final UnPostedHeldTransaction orig, Date time) throws InvalidTransactionException, UnBalancedTransactionException { super(orig, time); this.expiryTime = orig.getExpiryTime(); Index: PostedTransaction.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/PostedTransaction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PostedTransaction.java 23 Mar 2004 22:01:43 -0000 1.7 --- PostedTransaction.java 25 Mar 2004 19:03:23 -0000 1.8 *************** *** 8,11 **** --- 8,15 ---- * $Id$ * $Log$ + * Revision 1.8 2004/03/25 19:03:23 pelle + * PostedTransaction and friend now verify the unpostedtransaction is balanced. + * Updated schema for HHeld to include a cancelled field and a completed field. (The latter doesnt yet work right). Need to read more Hibernate docs to find out why. + * * Revision 1.7 2004/03/23 22:01:43 pelle * Bumped version numbers for commons and xmlsig througout. *************** *** 75,81 **** * @param orig */ ! public PostedTransaction(final UnPostedTransaction orig, final Date time) throws InvalidTransactionException { super(orig.getRequestId(), orig.getId(), orig.getComment(), orig.getItemList()); this.transactionTime = time; } --- 79,88 ---- * @param orig */ ! public PostedTransaction(final UnPostedTransaction orig, final Date time) throws InvalidTransactionException, UnBalancedTransactionException { super(orig.getRequestId(), orig.getId(), orig.getComment(), orig.getItemList()); + if (!orig.isBalanced()) + throw new UnBalancedTransactionException(null, orig); this.transactionTime = time; + } Index: UnBalancedTransactionException.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/UnBalancedTransactionException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UnBalancedTransactionException.java 21 Nov 2003 04:43:20 -0000 1.2 --- UnBalancedTransactionException.java 25 Mar 2004 19:03:23 -0000 1.3 *************** *** 8,16 **** * To change this template use Options | File Templates. */ ! public final class UnBalancedTransactionException extends LedgerException { ! public UnBalancedTransactionException(final Ledger ledger,final UnPostedTransaction tran) { ! super(ledger); ! transaction=tran; } private final UnPostedTransaction transaction; --- 8,17 ---- * To change this template use Options | File Templates. */ ! public final class UnBalancedTransactionException extends InvalidTransactionException { ! public UnBalancedTransactionException(final Ledger ledger, final UnPostedTransaction tran) { ! super(ledger, "Transaction was Unbalanced by: " + tran.getBalance()); ! transaction = tran; } + private final UnPostedTransaction transaction; *************** *** 19,24 **** } - public final String getSubMessage() { - return "Transaction was Unbalanced by: "+transaction.getBalance(); - } } --- 20,22 ---- |