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

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

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

Modified Files:
	CurrencyController.java 
Log Message:
Cleaned up the schemas even more they now all verifiy.
The Order/Receipt pairs for neuclear pay, should now work. They all have Readers using the latest
Schema.
The TransferBuilders are done and the ExchangeBuilders are nearly there.
The new EmbeddedSignedNamedObject builder is useful for creating new Receipts. The new ReceiptBuilder uses
this to create the embedded transaction.
ExchangeOrders now have the concept of BidItem's, you could create an ExchangeOrder bidding on various items at the same time, to be exchanged as one atomic multiparty exchange.
Still doesnt build yet, but very close now ;-)

Index: CurrencyController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CurrencyController.java	10 Jan 2004 00:00:44 -0000	1.11
--- CurrencyController.java	11 Jan 2004 00:39:05 -0000	1.12
***************
*** 51,62 ****
  
          try {
!             if (!req.getSignatory().equals(req.getFrom()))
!                 throw new TransferDeniedException(req);
!             final Book from = getBook(req.getFrom());
              final Book to = getBook(req.getRecipient());
  
              final Timestamp valuetime =TimeTools.now();
              final PostedTransaction posted = from.transfer(to, req.getAmount(), req.getComment(), valuetime);
!             return new TransferReceiptBuilder(req, createTransactionId(req, posted));
          } catch (UnknownBookException e) {
              throw new InvalidTransferException(e.getSubMessage());
--- 51,61 ----
  
          try {
!             final Book from = getBook(req.getSignatory());
              final Book to = getBook(req.getRecipient());
  
              final Timestamp valuetime =TimeTools.now();
              final PostedTransaction posted = from.transfer(to, req.getAmount(), req.getComment(), valuetime);
!             final String transaction = createTransactionId(req, posted);
!             return new TransferReceiptBuilder(req, transaction);
          } catch (UnknownBookException e) {
              throw new InvalidTransferException(e.getSubMessage());
***************
*** 73,77 ****
  
      private String createTransactionId(final TransferOrder req, final PostedTransaction posted) {
!         return req.getAsset().getName() + "/" + posted.getXid();
      }
  
--- 72,76 ----
  
      private String createTransactionId(final TransferOrder req, final PostedTransaction posted) {
!         return req.getDigest();
      }