[Neuclear-develop] neuclear-pay/src/java/org/neuclear/exchange/orders BidItem.java,NONE,1.1 ExchangeCompletionOrder.java,1.4,1.5 ExchangeOrder.java,1.4,1.5 ExchangeOrderReceipt.java,1.3,1.4

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

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

Modified Files:
	ExchangeCompletionOrder.java ExchangeOrder.java 
	ExchangeOrderReceipt.java 
Added Files:
	BidItem.java 
Log Message:
Completed all the builders and contracts.
Added a new abstract Value class to contain either an amount or a list of serial numbers.
Now ready to finish off the AssetControllers.

--- NEW FILE: BidItem.java ---
package org.neuclear.exchange.orders;

import org.neuclear.asset.contracts.Asset;
import org.neuclear.asset.orders.Value;

/**
 * Created by IntelliJ IDEA.
 * User: pelleb
 * Date: Jan 12, 2004
 * Time: 5:27:24 PM
 * To change this template use Options | File Templates.
 */
public  class BidItem {
    public BidItem(Asset asset, Value amount) {
        this.asset = asset;
        this.amount = amount;
    }

    public final Asset getAsset() {
        return asset;
    }

    public final Value getAmount() {
        return amount;
    }

    private final Asset asset;
    private final Value amount;
}

Index: ExchangeCompletionOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeCompletionOrder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExchangeCompletionOrder.java	11 Jan 2004 00:39:06 -0000	1.4
--- ExchangeCompletionOrder.java	12 Jan 2004 22:39:15 -0000	1.5
***************
*** 22,25 ****
--- 22,26 ----
          this.amount = amount;
          this.counterparty=counterparty;
+         this.receipt=receipt;
      }
  
***************
*** 36,42 ****
--- 37,48 ----
      }
  
+     public ExchangeOrderReceipt getReceipt() {
+         return receipt;
+     }
+ 
      private final long exchangetime;
      private final double amount;
      private final Identity counterparty;
+     private final ExchangeOrderReceipt receipt;
  
      public static final class Reader implements NamedObjectReader {
***************
*** 55,59 ****
                          (ExchangeOrderReceipt)TransferGlobals.parseEmbedded(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME)),
                          TransferGlobals.parseRecipientTag(elem),
!                         TransferGlobals.parseAmountTag(elem),
                          TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TIME_TAGNAME))
                          );
--- 61,65 ----
                          (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))
                          );

Index: ExchangeOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExchangeOrder.java	11 Jan 2004 00:39:06 -0000	1.4
--- ExchangeOrder.java	12 Jan 2004 22:39:15 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  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.*;
***************
*** 21,29 ****
  public final class ExchangeOrder extends ExchangeTransactionContract {
      private ExchangeOrder(final SignedNamedCore core,
!                     final Asset bidAsset, final ExchangeAgent agent, final double bid,
                      BidItem items[],  final String comment, final Date expires)  {
          super(core, bidAsset,agent);
          this.items =makeSafeCopy(items);
!         this.bidAmount = bid;
          this.comment = (comment != null) ? comment : "";
          this.expires = expires.getTime();
--- 22,30 ----
  public final class ExchangeOrder extends ExchangeTransactionContract {
      private ExchangeOrder(final SignedNamedCore core,
!                     final Asset bidAsset, final ExchangeAgent agent, final Value amount,
                      BidItem items[],  final String comment, final Date expires)  {
          super(core, bidAsset,agent);
          this.items =makeSafeCopy(items);
!         this.amount = amount;
          this.comment = (comment != null) ? comment : "";
          this.expires = expires.getTime();
***************
*** 45,50 ****
  
  
!     public final double getBidAmount() {
!         return bidAmount;
      }
  
--- 46,51 ----
  
  
!     public final Value getAmount() {
!         return amount;
      }
  
***************
*** 68,93 ****
          };
      }
!     private final double bidAmount;
      private final String comment;
      private final long expires;
      private final BidItem items[];
  
-     public static  class BidItem {
-         private BidItem(Asset asset, double amount) {
-             this.asset = asset;
-             this.amount = amount;
-         }
- 
-         public final Asset getAsset() {
-             return asset;
-         }
- 
-         public final double getAmount() {
-             return amount;
-         }
- 
-         private final Asset asset;
-         private final double amount;
-     }
      public static final class Reader implements NamedObjectReader {
          /**
--- 69,77 ----
          };
      }
!     private final Value amount;
      private final String comment;
      private final long expires;
      private final BidItem items[];
  
      public static final class Reader implements NamedObjectReader {
          /**
***************
*** 105,109 ****
                          TransferGlobals.parseAssetTag(elem),
                          ExchangeGlobals.parseAgentTag(elem),
!                         TransferGlobals.parseAmountTag(elem),
                          parseBidItems(elem),
                          TransferGlobals.getCommentElement(elem),
--- 89,93 ----
                          TransferGlobals.parseAssetTag(elem),
                          ExchangeGlobals.parseAgentTag(elem),
!                         TransferGlobals.parseValueTag(elem),
                          parseBidItems(elem),
                          TransferGlobals.getCommentElement(elem),
***************
*** 124,128 ****
              return new BidItem(
                      TransferGlobals.parseAssetTag(element),
!                     TransferGlobals.parseAmountTag(element));
  
          }
--- 108,112 ----
              return new BidItem(
                      TransferGlobals.parseAssetTag(element),
!                     TransferGlobals.parseValueTag(element));
  
          }

Index: ExchangeOrderReceipt.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrderReceipt.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ExchangeOrderReceipt.java	10 Jan 2004 00:00:46 -0000	1.3
--- ExchangeOrderReceipt.java	12 Jan 2004 22:39:15 -0000	1.4
***************
*** 24,28 ****
          this.order=order;
      }
!     public ExchangeOrder getExchangeOrder(){
          return order;
      }
--- 24,28 ----
          this.order=order;
      }
!     public ExchangeOrder getOrder(){
          return order;
      }