[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/remote AssetControlClient.java,1.9,1.10

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

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

Modified Files:
	AssetControlClient.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: AssetControlClient.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/remote/AssetControlClient.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssetControlClient.java	3 Jan 2004 20:36:25 -0000	1.9
--- AssetControlClient.java	5 Jan 2004 23:47:10 -0000	1.10
***************
*** 1,12 ****
  package org.neuclear.asset.remote;
  
! import org.neuclear.asset.contracts.CancelExchangeReceipt;
! import org.neuclear.asset.contracts.ExchangeReceipt;
! import org.neuclear.asset.contracts.TransferReceipt;
  import org.neuclear.asset.contracts.builders.*;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.xml.XMLException;
  
  /*
--- 1,20 ----
  package org.neuclear.asset.remote;
  
! import org.neuclear.exchange.orders.CancelExchangeReceipt;
! import org.neuclear.exchange.orders.ExchangeOrderReceipt;
! import org.neuclear.asset.orders.TransferReceipt;
  import org.neuclear.asset.contracts.builders.*;
+ import org.neuclear.exchange.orders.CancelExchangeReceipt;
+ import org.neuclear.asset.orders.TransferReceipt;
+ import org.neuclear.asset.orders.builders.TransferBuilder;
+ import org.neuclear.asset.orders.builders.TransferRequestBuilder;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.xml.XMLException;
+ import org.neuclear.exchange.orders.CancelExchangeReceipt;
+ import org.neuclear.exchange.orders.builders.CancelExchangeRequestBuilder;
+ import org.neuclear.exchange.orders.builders.CompleteExchangeRequestBuilder;
+ import org.neuclear.exchange.orders.builders.ExchangeRequestBuilder;
  
  /*
***************
*** 30,33 ****
--- 38,46 ----
  $Id$
  $Log$
+ Revision 1.10  2004/01/05 23:47:10  pelle
+ 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.
+ 
  Revision 1.9  2004/01/03 20:36:25  pelle
  Renamed HeldTransfer to Exchange
***************
*** 89,94 ****
  Issuer is now Asset which is a subclass of Identity
  AssetController supports more than one Asset. Which is important for most non ecurrency implementations.
! TransferRequest/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use
! their matching TransferRequest/ReceiptBuilder classes.
  PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController
  which will handle all neuclear-ledger based AssetControllers.
--- 102,107 ----
  Issuer is now Asset which is a subclass of Identity
  AssetController supports more than one Asset. Which is important for most non ecurrency implementations.
! TransferOrder/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use
! their matching TransferOrder/ReceiptBuilder classes.
  PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController
  which will handle all neuclear-ledger based AssetControllers.
***************
*** 116,121 ****
  
  
!     public final ExchangeReceipt performHeldTransfer(final ExchangeRequestBuilder req) throws NeuClearException, XMLException {
!         return (ExchangeReceipt) send(req);
      }
  
--- 129,134 ----
  
  
!     public final ExchangeOrderReceipt performHeldTransfer(final ExchangeRequestBuilder req) throws NeuClearException, XMLException {
!         return (ExchangeOrderReceipt) send(req);
      }