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

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

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

Modified Files:
	CurrencyController.java 
Log Message:
Create new Document classification "order", which is really just inherint in the new
package layout.
Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders.

Index: CurrencyController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CurrencyController.java	3 Jan 2004 20:36:25 -0000	1.9
--- CurrencyController.java	5 Jan 2004 23:47:09 -0000	1.10
***************
*** 2,9 ****
  
  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;
  import org.neuclear.id.Identity;
--- 2,16 ----
  
  import org.neuclear.asset.*;
+ import org.neuclear.exchange.orders.CancelExchangeOrder;
+ import org.neuclear.exchange.orders.ExchangeCompletionOrder;
+ import org.neuclear.exchange.orders.ExchangeCompletionOrder;
+ import org.neuclear.exchange.orders.ExchangeOrder;
+ import org.neuclear.asset.orders.TransferOrder;
+ import org.neuclear.asset.orders.builders.TransferReceiptBuilder;
  import org.neuclear.asset.contracts.*;
! import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
! import org.neuclear.exchange.orders.builders.ExchangeReceiptBuilder;
! import org.neuclear.exchange.orders.builders.ExchangeReceiptBuilder;
! import org.neuclear.asset.orders.builders.TransferReceiptBuilder;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.id.Identity;
***************
*** 42,46 ****
      }
  
!     public final TransferReceiptBuilder process(final TransferRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
  
          try {
--- 49,53 ----
      }
  
!     public final TransferReceiptBuilder process(final TransferOrder req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
  
          try {
***************
*** 65,69 ****
      }
  
!     private String createTransactionId(final TransferRequest req, final PostedTransaction posted) {
          return req.getAsset().getName() + "/" + posted.getXid();
      }
--- 72,76 ----
      }
  
!     private String createTransactionId(final TransferOrder req, final PostedTransaction posted) {
          return req.getAsset().getName() + "/" + posted.getXid();
      }
***************
*** 91,95 ****
      }
  
!     public final ExchangeReceiptBuilder process(final ExchangeRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              if (!req.getSignatory().equals(req.getFrom()))
--- 98,102 ----
      }
  
!     public final ExchangeReceiptBuilder process(final ExchangeOrder req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              if (!req.getSignatory().equals(req.getFrom()))
***************
*** 115,119 ****
      }
  
!     public final TransferReceiptBuilder process(final CompleteExchangeRequest complete) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
          try {
              if (!complete.getSignatory().equals(complete.getTo()))
--- 122,126 ----
      }
  
!     public final TransferReceiptBuilder process(final ExchangeCompletionOrder complete) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
          try {
              if (!complete.getSignatory().equals(complete.getTo()))
***************
*** 144,148 ****
      }
  
!     public final CancelExchangeReceiptBuilder process(final CancelExchangeRequest cancel) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              final PostedHeldTransaction heldTran = ledger.findHeldTransaction(cancel.getHoldId());
--- 151,155 ----
      }
  
!     public final CancelExchangeReceiptBuilder process(final CancelExchangeOrder cancel) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
              final PostedHeldTransaction heldTran = ledger.findHeldTransaction(cancel.getHoldId());