[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset Auditor.java,1.2,1.3

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3563/src/java/org/neuclear/asset

Modified Files:
	Auditor.java 
Log Message:
API changes in Ledger to support Auditor and CurrencyController in Pay

Index: Auditor.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/Auditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Auditor.java	5 Apr 2004 22:08:23 -0000	1.2
--- Auditor.java	5 Apr 2004 22:54:05 -0000	1.3
***************
*** 32,35 ****
--- 32,38 ----
  $Id$
  $Log$
+ Revision 1.3  2004/04/05 22:54:05  pelle
+ API changes in Ledger to support Auditor and CurrencyController in Pay
+ 
  Revision 1.2  2004/04/05 22:08:23  pelle
  CurrencyController and AuditController now now pass all unit tests in CurrencyTests.
***************
*** 145,148 ****
--- 148,157 ----
              if (contract instanceof ExchangeCompletedReceipt)
                  process((ExchangeCompletedReceipt) contract);
+             if (contract instanceof TransferOrder)
+                 process((TransferOrder) contract);
+             if (contract instanceof ExchangeOrder)
+                 process((ExchangeOrder) contract);
+             if (contract instanceof ExchangeCompletionOrder)
+                 process((ExchangeCompletionOrder) contract);
              if (contract instanceof CancelExchangeReceipt)
                  process((CancelExchangeReceipt) contract);
***************
*** 163,175 ****
  
      public final void process(final TransferReceipt receipt) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
- 
          try {
              final TransferOrder req = receipt.getOrder();
!             final PostedTransaction posted = ledger.verifiedTransfer(req.getDigest(), req.getSignatory().getName(), req.getRecipient(), req.getAmount().getAmount(), req.getComment());
              ledger.setReceiptId(req.getDigest(), receipt.getDigest());
          } catch (LowlevelLedgerException e) {
              throw new LowLevelPaymentException(e);
-         } catch (InvalidTransactionException e) {
-             throw new InvalidTransferException(e.getSubMessage());
          } catch (UnknownTransactionException e) {
              throw new LowLevelPaymentException(e);
--- 172,182 ----
  
      public final void process(final TransferReceipt receipt) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              final TransferOrder req = receipt.getOrder();
!             if (!ledger.transactionExists(req.getDigest()))
!                 process(req);
              ledger.setReceiptId(req.getDigest(), receipt.getDigest());
          } catch (LowlevelLedgerException e) {
              throw new LowLevelPaymentException(e);
          } catch (UnknownTransactionException e) {
              throw new LowLevelPaymentException(e);
***************
*** 177,190 ****
      }
  
  
!     public final void process(final ExchangeOrderReceipt receipt) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              final ExchangeOrder req = receipt.getOrder();
!             final PostedHeldTransaction posted = ledger.hold(req.getDigest(), req.getSignatory().getName(), req.getAgent().getSignatory().getName(), req.getExpiry(), req.getAmount().getAmount(), req.getComment());
              ledger.setHeldReceiptId(req.getDigest(), receipt.getDigest());
          } catch (LowlevelLedgerException e) {
              throw new LowLevelPaymentException(e);
-         } catch (InvalidTransactionException e) {
-             throw new InvalidTransferException(e.getSubMessage());
          } catch (UnknownTransactionException e) {
              throw new LowLevelPaymentException(e);
--- 184,205 ----
      }
  
+     public final void process(final TransferOrder req) throws InvalidTransferException, LowLevelPaymentException {
+         try {
+             ledger.transfer(req.getDigest(), req.getSignatory().getName(), req.getRecipient(), req.getAmount().getAmount(), req.getComment());
+         } catch (LowlevelLedgerException e) {
+             throw new LowLevelPaymentException(e);
+         } catch (InvalidTransactionException e) {
+             throw new InvalidTransferException(e.getSubMessage());
+         }
+     }
  
!     public final void process(final ExchangeOrderReceipt receipt) throws LowLevelPaymentException, InvalidTransferException {
          try {
              final ExchangeOrder req = receipt.getOrder();
!             if (!ledger.heldTransactionExists(req.getDigest()))
!                 process(req);
              ledger.setHeldReceiptId(req.getDigest(), receipt.getDigest());
          } catch (LowlevelLedgerException e) {
              throw new LowLevelPaymentException(e);
          } catch (UnknownTransactionException e) {
              throw new LowLevelPaymentException(e);
***************
*** 192,200 ****
      }
  
!     public final void process(final ExchangeCompletedReceipt receipt) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
          try {
!             ExchangeCompletionOrder complete = receipt.getOrder();
!             PostedTransaction tran = ledger.complete(complete.getReceipt().getOrder().getDigest(), complete.getAmount().getAmount(), complete.getComment());
!             ledger.setReceiptId(complete.getReceipt().getOrder().getDigest(), receipt.getDigest());
          } catch (LowlevelLedgerException e) {
              throw new LowLevelPaymentException(e);
--- 207,223 ----
      }
  
!     public final void process(final ExchangeOrder req) throws InvalidTransferException, LowLevelPaymentException {
          try {
!             ledger.hold(req.getDigest(), req.getSignatory().getName(), req.getAgent().getSignatory().getName(), req.getExpiry(), req.getAmount().getAmount(), req.getComment());
!         } catch (LowlevelLedgerException e) {
!             throw new LowLevelPaymentException(e);
!         } catch (InvalidTransactionException e) {
!             throw new InvalidTransferException(e.getSubMessage());
!         }
!     }
! 
!     public final void process(final ExchangeCompletionOrder complete) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
!         try {
!             ledger.complete(complete.getReceipt().getOrder().getDigest(), complete.getAmount().getAmount(), complete.getComment());
          } catch (LowlevelLedgerException e) {
              throw new LowLevelPaymentException(e);
***************
*** 208,211 ****
--- 231,247 ----
      }
  
+     public final void process(final ExchangeCompletedReceipt receipt) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
+         try {
+             ExchangeCompletionOrder order = receipt.getOrder();
+             if (!ledger.transactionExists(order.getReceipt().getOrder().getDigest()))
+                 process(order);
+             ledger.setReceiptId(order.getReceipt().getOrder().getDigest(), receipt.getDigest());
+         } catch (LowlevelLedgerException e) {
+             throw new LowLevelPaymentException(e);
+         } catch (UnknownTransactionException e) {
+             throw new InvalidTransferException(e.getLocalizedMessage());
+         }
+     }
+ 
      public final void process(final CancelExchangeReceipt receipt) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
***************
*** 220,224 ****
      }
  
- 
      private final Ledger ledger;
      private final Service asset;
--- 256,259 ----