[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/controllers/currency CurrencyController.java,1.13,1.14

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency
In directory sc8-pr-cvs1:/tmp/cvs-serv28986/src/java/org/neuclear/asset/controllers/currency

Modified Files:
	CurrencyController.java 
Log Message:
Now builds.
Now need to do unit tests

Index: CurrencyController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CurrencyController.java	12 Jan 2004 22:39:14 -0000	1.13
--- CurrencyController.java	13 Jan 2004 15:11:17 -0000	1.14
***************
*** 12,15 ****
--- 12,16 ----
  import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
  import org.neuclear.exchange.orders.builders.ExchangeOrderReceiptBuilder;
+ import org.neuclear.exchange.orders.builders.ExchangeCompletedReceiptBuilder;
  import org.neuclear.id.Identity;
  import org.neuclear.id.resolver.NSResolver;
***************
*** 56,60 ****
  
              final Timestamp valuetime =TimeTools.now();
!             final PostedTransaction posted = from.transfer(to, req.getAmount(), req.getComment(), valuetime);
              return (TransferReceipt) new TransferReceiptBuilder(req, valuetime).convert(asset.getName(),signer);
          } catch (UnknownBookException e) {
--- 57,61 ----
  
              final Timestamp valuetime =TimeTools.now();
!             final PostedTransaction posted = from.transfer(to, req.getAmount().getAmount(), req.getComment(), valuetime);
              return (TransferReceipt) new TransferReceiptBuilder(req, valuetime).convert(asset.getName(),signer);
          } catch (UnknownBookException e) {
***************
*** 103,107 ****
              final Timestamp valuetime = TimeTools.now();
  
!             final PostedHeldTransaction posted = from.hold(to, req.getAmount(), req.getComment(), valuetime,req.getExpiry());
  
              return (ExchangeOrderReceipt) new ExchangeOrderReceiptBuilder(req, valuetime).convert(asset.getName(),signer);
--- 104,108 ----
              final Timestamp valuetime = TimeTools.now();
  
!             final PostedHeldTransaction posted = from.hold(to, req.getAmount().getAmount(), req.getComment(), valuetime,req.getExpiry());
  
              return (ExchangeOrderReceipt) new ExchangeOrderReceiptBuilder(req, valuetime).convert(asset.getName(),signer);
***************
*** 126,140 ****
                  throw new InvalidTransferException("holdid");
              final double amount = getTransactionAmount(heldTran);
!             if (amount > complete.getAmount())
                  throw new TransferLargerThanHeldException(complete, amount);
!             if (complete.getAmount() < 0)
                  throw new NegativeTransferException(complete.getAmount());
!             if (heldTran.getExpiryTime().before(complete.getValueTime()) || heldTran.getTransactionTime().after(complete.getValueTime()))
                  throw new ExpiredHeldTransferException(complete);
  
!             final PostedTransaction tran = heldTran.complete(complete.getAmount(), complete.getValueTime(), complete.getComment());
!             return new ExchangeCompletedReceiptBuilder(complete, tran.getXid());
          } catch (UnknownTransactionException e) {
!             throw new NonExistantHoldException(complete.getHoldId());
          } catch (TransactionExpiredException e) {
              throw new ExpiredHeldTransferException(complete);
--- 127,141 ----
                  throw new InvalidTransferException("holdid");
              final double amount = getTransactionAmount(heldTran);
!             if (amount > complete.getAmount().getAmount())
                  throw new TransferLargerThanHeldException(complete, amount);
!             if (complete.getAmount().getAmount() < 0)
                  throw new NegativeTransferException(complete.getAmount());
!             if (heldTran.getExpiryTime().before(complete.getExchangeTime()) || heldTran.getTransactionTime().after(complete.getExchangeTime()))
                  throw new ExpiredHeldTransferException(complete);
  
!             final PostedTransaction tran = heldTran.complete(complete.getAmount().getAmount(), complete.getExchangeTime(), complete.getComment());
!             return (ExchangeCompletedReceipt) new ExchangeCompletedReceiptBuilder(complete,TimeTools.now()).convert(asset.getName(),signer);
          } catch (UnknownTransactionException e) {
!             throw new NonExistantHoldException(complete.getReceipt().getOrder().getDigest());
          } catch (TransactionExpiredException e) {
              throw new ExpiredHeldTransferException(complete);
***************
*** 148,158 ****
      public final CancelExchangeReceipt process(final CancelExchangeOrder cancel) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
!             final PostedHeldTransaction heldTran = ledger.findHeldTransaction(cancel.getHoldId());
              if (!isRecipient(cancel.getSignatory(), heldTran))
                  throw new TransferDeniedException(cancel);
              heldTran.cancel();
!             return new CancelExchangeReceiptBuilder(cancel);
          } catch (UnknownTransactionException e) {
!             throw new NonExistantHoldException(cancel.getHoldId());
          } catch (LowlevelLedgerException e) {
              throw new LowLevelPaymentException(e);
--- 149,159 ----
      public final CancelExchangeReceipt process(final CancelExchangeOrder cancel) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
!             final PostedHeldTransaction heldTran = ledger.findHeldTransaction(cancel.getReceipt().getOrder().getDigest());
              if (!isRecipient(cancel.getSignatory(), heldTran))
                  throw new TransferDeniedException(cancel);
              heldTran.cancel();
!             return (CancelExchangeReceipt) new CancelExchangeReceiptBuilder(cancel,TimeTools.now()).convert(asset.getName(),signer);
          } catch (UnknownTransactionException e) {
!             throw new NonExistantHoldException(cancel.getReceipt().getOrder().getDigest());
          } catch (LowlevelLedgerException e) {
              throw new LowLevelPaymentException(e);