[Neuclear-develop] neuclear-pay/src/java/org/neuclear/exchange/orders CancelExchangeOrder.java,1.4,1.5 ExchangeCompletionOrder.java,1.5,1.6 ExchangeOrder.java,1.5,1.6

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

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

Modified Files:
	CancelExchangeOrder.java ExchangeCompletionOrder.java 
	ExchangeOrder.java 
Log Message:
Now builds.
Now need to do unit tests

Index: CancelExchangeOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/CancelExchangeOrder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CancelExchangeOrder.java	11 Jan 2004 00:39:06 -0000	1.4
--- CancelExchangeOrder.java	13 Jan 2004 15:11:18 -0000	1.5
***************
*** 22,26 ****
          this.receipt=receipt;
      }
!     public ExchangeOrderReceipt getExchangeReceipt(){
          return receipt;
      }
--- 22,26 ----
          this.receipt=receipt;
      }
!     public ExchangeOrderReceipt getReceipt(){
          return receipt;
      }

Index: ExchangeCompletionOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeCompletionOrder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExchangeCompletionOrder.java	12 Jan 2004 22:39:15 -0000	1.5
--- ExchangeCompletionOrder.java	13 Jan 2004 15:11:18 -0000	1.6
***************
*** 4,7 ****
--- 4,8 ----
  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.*;
***************
*** 17,21 ****
   */
  public final class ExchangeCompletionOrder extends ExchangeTransactionContract {
!     private ExchangeCompletionOrder(final SignedNamedCore core, final ExchangeOrderReceipt receipt, final Identity counterparty, final double amount, final Date exchangetime) {
          super(core,receipt.getAsset(), receipt.getAgent());
          this.exchangetime = exchangetime.getTime();
--- 18,22 ----
   */
  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();
***************
*** 23,26 ****
--- 24,28 ----
          this.counterparty=counterparty;
          this.receipt=receipt;
+         this.comment=comment;
      }
  
***************
*** 29,33 ****
      }
  
!     public final double getAmount() {
          return amount;
      }
--- 31,35 ----
      }
  
!     public final Value getAmount() {
          return amount;
      }
***************
*** 41,48 ****
      }
  
      private final long exchangetime;
!     private final double amount;
      private final Identity counterparty;
      private final ExchangeOrderReceipt receipt;
  
      public static final class Reader implements NamedObjectReader {
--- 43,55 ----
      }
  
+     public String getComment() {
+         return comment;
+     }
+ 
      private final long exchangetime;
!     private final Value amount;
      private final Identity counterparty;
      private final ExchangeOrderReceipt receipt;
+     private final String comment;
  
      public static final class Reader implements NamedObjectReader {
***************
*** 62,66 ****
                          TransferGlobals.parseRecipientTag(elem),
                          TransferGlobals.parseValueTag(elem),
!                         TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TIME_TAGNAME))
                          );
              }
--- 69,74 ----
                          TransferGlobals.parseRecipientTag(elem),
                          TransferGlobals.parseValueTag(elem),
!                         TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TIME_TAGNAME)),
!                         TransferGlobals.parseCommentElement(elem)
                          );
              }

Index: ExchangeOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExchangeOrder.java	12 Jan 2004 22:39:15 -0000	1.5
--- ExchangeOrder.java	13 Jan 2004 15:11:18 -0000	1.6
***************
*** 91,95 ****
                          TransferGlobals.parseValueTag(elem),
                          parseBidItems(elem),
!                         TransferGlobals.getCommentElement(elem),
                          TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXPIRY_TAG))
                          );
--- 91,95 ----
                          TransferGlobals.parseValueTag(elem),
                          parseBidItems(elem),
!                         TransferGlobals.parseCommentElement(elem),
                          TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXPIRY_TAG))
                          );