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

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

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

Modified Files:
	CurrencyController.java 
Log Message:
Renamed HeldTransfer to Exchange
Dropped valuetime from the request objects.
Doesnt yet compile. New commit to follow soon.

Index: CurrencyController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CurrencyController.java	28 Nov 2003 00:11:50 -0000	1.8
--- CurrencyController.java	3 Jan 2004 20:36:25 -0000	1.9
***************
*** 3,8 ****
  import org.neuclear.asset.*;
  import org.neuclear.asset.contracts.*;
! import org.neuclear.asset.contracts.builders.CancelHeldTransferReceiptBuilder;
! import org.neuclear.asset.contracts.builders.HeldTransferReceiptBuilder;
  import org.neuclear.asset.contracts.builders.TransferReceiptBuilder;
  import org.neuclear.commons.NeuClearException;
--- 3,8 ----
  import org.neuclear.asset.*;
  import org.neuclear.asset.contracts.*;
! import org.neuclear.asset.contracts.builders.CancelExchangeReceiptBuilder;
! import org.neuclear.asset.contracts.builders.ExchangeReceiptBuilder;
  import org.neuclear.asset.contracts.builders.TransferReceiptBuilder;
  import org.neuclear.commons.NeuClearException;
***************
*** 91,95 ****
      }
  
!     public final HeldTransferReceiptBuilder process(final HeldTransferRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              if (!req.getSignatory().equals(req.getFrom()))
--- 91,95 ----
      }
  
!     public final ExchangeReceiptBuilder process(final ExchangeRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              if (!req.getSignatory().equals(req.getFrom()))
***************
*** 98,105 ****
              final Book to = getBook(req.getTo());
  
!             final PostedHeldTransaction posted = from.hold(to, req.getAmount(), req.getComment(), req.getValueTime(), req.getHeldUntil());
  
  
!             return new HeldTransferReceiptBuilder(req, createTransactionId(req, posted));
          } catch (UnknownBookException e) { //TODO Implement something like this eg. AccountNotValidException
              throw new InvalidTransferException(e.getSubMessage());
--- 98,105 ----
              final Book to = getBook(req.getTo());
  
!             final PostedHeldTransaction posted = from.hold(to, req.getAmount(), req.getComment(), req.getValueTime(), req.getValidTo());
  
  
!             return new ExchangeReceiptBuilder(req, createTransactionId(req, posted));
          } catch (UnknownBookException e) { //TODO Implement something like this eg. AccountNotValidException
              throw new InvalidTransferException(e.getSubMessage());
***************
*** 115,119 ****
      }
  
!     public final TransferReceiptBuilder process(final CompleteHeldTransferRequest complete) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
          try {
              if (!complete.getSignatory().equals(complete.getTo()))
--- 115,119 ----
      }
  
!     public final TransferReceiptBuilder process(final CompleteExchangeRequest complete) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
          try {
              if (!complete.getSignatory().equals(complete.getTo()))
***************
*** 144,148 ****
      }
  
!     public final CancelHeldTransferReceiptBuilder process(final CancelHeldTransferRequest cancel) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              final PostedHeldTransaction heldTran = ledger.findHeldTransaction(cancel.getHoldId());
--- 144,148 ----
      }
  
!     public final CancelExchangeReceiptBuilder process(final CancelExchangeRequest cancel) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              final PostedHeldTransaction heldTran = ledger.findHeldTransaction(cancel.getHoldId());
***************
*** 150,154 ****
                  throw new TransferDeniedException(cancel);
              heldTran.cancel();
!             return new CancelHeldTransferReceiptBuilder(cancel);
          } catch (UnknownTransactionException e) {
              throw new NonExistantHoldException(cancel.getHoldId());
--- 150,154 ----
                  throw new TransferDeniedException(cancel);
              heldTran.cancel();
!             return new CancelExchangeReceiptBuilder(cancel);
          } catch (UnknownTransactionException e) {
              throw new NonExistantHoldException(cancel.getHoldId());