[Neuclear-develop] neuclear-pay/src/java/org/neuclear/exchange/orders ExchangeCompletionOrder.java,1.6,1.7

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4149/src/java/org/neuclear/exchange/orders

Modified Files:
	ExchangeCompletionOrder.java 
Log Message:
Got TransferOrder and Builder working with their test cases.
Working on TransferReceipt which is the first embedded receipt. This is causing some problems at the moment.

Index: ExchangeCompletionOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeCompletionOrder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExchangeCompletionOrder.java	13 Jan 2004 15:11:18 -0000	1.6
--- ExchangeCompletionOrder.java	2 Apr 2004 23:04:36 -0000	1.7
***************
*** 1,11 ****
  package org.neuclear.exchange.orders;
  
! import org.neuclear.asset.contracts.Asset;
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.orders.TransferGlobals;
  import org.neuclear.asset.orders.Value;
! import org.neuclear.exchange.contracts.ExchangeAgent;
! import org.neuclear.id.*;
! import org.dom4j.Element;
  
  import java.sql.Timestamp;
--- 1,12 ----
  package org.neuclear.exchange.orders;
  
! import org.dom4j.Element;
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.orders.TransferGlobals;
  import org.neuclear.asset.orders.Value;
! import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NamedObjectReader;
! import org.neuclear.id.SignedNamedCore;
! import org.neuclear.id.SignedNamedObject;
  
  import java.sql.Timestamp;
***************
*** 18,28 ****
   */
  public final class ExchangeCompletionOrder extends ExchangeTransactionContract {
!     private ExchangeCompletionOrder(final SignedNamedCore core, final ExchangeOrderReceipt receipt, final Identity counterparty, final Value amount, final Date exchangetime,final String comment) {
!         super(core,receipt.getAsset(), receipt.getAgent());
          this.exchangetime = exchangetime.getTime();
          this.amount = amount;
!         this.counterparty=counterparty;
!         this.receipt=receipt;
!         this.comment=comment;
      }
  
--- 19,29 ----
   */
  public final class ExchangeCompletionOrder extends ExchangeTransactionContract {
!     private ExchangeCompletionOrder(final SignedNamedCore core, final ExchangeOrderReceipt receipt, final String counterparty, final Value amount, final Date exchangetime, final String comment) {
!         super(core, receipt.getAsset(), receipt.getAgent());
          this.exchangetime = exchangetime.getTime();
          this.amount = amount;
!         this.counterparty = counterparty;
!         this.receipt = receipt;
!         this.comment = comment;
      }
  
***************
*** 35,39 ****
      }
  
!     public final Identity getCounterparty() {
          return counterparty;
      }
--- 36,40 ----
      }
  
!     public final String getCounterparty() {
          return counterparty;
      }
***************
*** 49,53 ****
      private final long exchangetime;
      private final Value amount;
!     private final Identity counterparty;
      private final ExchangeOrderReceipt receipt;
      private final String comment;
--- 50,54 ----
      private final long exchangetime;
      private final Value amount;
!     private final String counterparty;
      private final ExchangeOrderReceipt receipt;
      private final String comment;
***************
*** 62,77 ****
          public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException {
              if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET))
!                 throw new InvalidNamedObjectException(core.getName(),"Not in XML NameSpace: "+AssetGlobals.NS_ASSET.getURI());
  
!             if (elem.getName().equals(ExchangeGlobals.COMPLETE_TAGNAME)){
                  return new ExchangeCompletionOrder(core,
!                         (ExchangeOrderReceipt)TransferGlobals.parseEmbedded(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME)),
                          TransferGlobals.parseRecipientTag(elem),
                          TransferGlobals.parseValueTag(elem),
!                         TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TIME_TAGNAME)),
!                         TransferGlobals.parseCommentElement(elem)
!                         );
              }
!             throw new InvalidNamedObjectException(core.getName(),"Not Matched");
          }
      }
--- 63,77 ----
          public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException {
              if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET))
!                 throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI());
  
!             if (elem.getName().equals(ExchangeGlobals.COMPLETE_TAGNAME)) {
                  return new ExchangeCompletionOrder(core,
!                         (ExchangeOrderReceipt) TransferGlobals.parseEmbedded(elem, ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME)),
                          TransferGlobals.parseRecipientTag(elem),
                          TransferGlobals.parseValueTag(elem),
!                         TransferGlobals.parseTimeStampElement(elem, ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TIME_TAGNAME)),
!                         TransferGlobals.parseCommentElement(elem));
              }
!             throw new InvalidNamedObjectException(core.getName(), "Not Matched");
          }
      }