[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/orders/builders ReceiptBuilder.java,1.1,1.2 TransferOrderBuilder.java,1.1,1.2 TransferReceiptBuilder.java,1.3,1.4

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

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

Modified Files:
	ReceiptBuilder.java TransferOrderBuilder.java 
	TransferReceiptBuilder.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.

Index: ReceiptBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/builders/ReceiptBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReceiptBuilder.java	11 Jan 2004 00:39:06 -0000	1.1
--- ReceiptBuilder.java	12 Jan 2004 22:39:14 -0000	1.2
***************
*** 1,10 ****
  package org.neuclear.asset.orders.builders;
  
- import org.neuclear.id.builders.EmbeddedSignedObjectBuilder;
- import org.neuclear.id.SignedNamedObject;
- import org.neuclear.commons.time.TimeTools;
- import org.neuclear.asset.orders.TransferGlobals;
  import org.dom4j.QName;
! import org.dom4j.DocumentException;
  
  import java.util.Date;
--- 1,9 ----
  package org.neuclear.asset.orders.builders;
  
  import org.dom4j.QName;
! import org.neuclear.asset.orders.TransferGlobals;
! import org.neuclear.commons.time.TimeTools;
! import org.neuclear.id.SignedNamedObject;
! import org.neuclear.id.builders.EmbeddedSignedObjectBuilder;
  
  import java.util.Date;

Index: TransferOrderBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/builders/TransferOrderBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransferOrderBuilder.java	11 Jan 2004 00:39:06 -0000	1.1
--- TransferOrderBuilder.java	12 Jan 2004 22:39:14 -0000	1.2
***************
*** 2,16 ****
  
  import org.dom4j.Element;
- import org.dom4j.QName;
  import org.neuclear.asset.InvalidTransferException;
  import org.neuclear.asset.NegativeTransferException;
  import org.neuclear.asset.contracts.Asset;
- import org.neuclear.asset.orders.transfers.TransferGlobals;
  import org.neuclear.asset.orders.TransferGlobals;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.id.Identity;
- import org.neuclear.id.NSTools;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.xml.xmlsec.SignedElement;
  
--- 2,13 ----
  
  import org.dom4j.Element;
  import org.neuclear.asset.InvalidTransferException;
  import org.neuclear.asset.NegativeTransferException;
  import org.neuclear.asset.contracts.Asset;
  import org.neuclear.asset.orders.TransferGlobals;
+ import org.neuclear.asset.orders.Value;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.id.Identity;
  import org.neuclear.xml.xmlsec.SignedElement;
  
***************
*** 35,38 ****
--- 32,40 ----
  $Id$
  $Log$
+ Revision 1.2  2004/01/12 22:39:14  pelle
+ 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.
+ 
  Revision 1.1  2004/01/11 00:39:06  pelle
  Cleaned up the schemas even more they now all verifiy.
***************
*** 123,129 ****
   */
  public class TransferOrderBuilder extends SignedElement {
!     protected TransferOrderBuilder(final Asset asset, final Identity recipient, final double amount, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
          super(TransferGlobals.createQName(TransferGlobals.XFER_TAGNAME));
!         if (amount < 0)
              throw new NegativeTransferException(amount);
          if (asset==null)
--- 125,131 ----
   */
  public class TransferOrderBuilder extends SignedElement {
!     protected TransferOrderBuilder(final Asset asset, final Identity recipient, final Value amount, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
          super(TransferGlobals.createQName(TransferGlobals.XFER_TAGNAME));
!         if (amount.getAmount() < 0)
              throw new NegativeTransferException(amount);
          if (asset==null)
***************
*** 135,139 ****
          element.add(TransferGlobals.createElement(TransferGlobals.RECIPIENT_TAG, recipient.getName()));
          element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, asset.getName()));
!         element.add(TransferGlobals.createElement(TransferGlobals.AMOUNT_TAG,Double.toString(amount)));
  
          if (!Utility.isEmpty(comment))
--- 137,141 ----
          element.add(TransferGlobals.createElement(TransferGlobals.RECIPIENT_TAG, recipient.getName()));
          element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, asset.getName()));
!         element.add(TransferGlobals.createValueTag(amount));
  
          if (!Utility.isEmpty(comment))

Index: TransferReceiptBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/builders/TransferReceiptBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferReceiptBuilder.java	11 Jan 2004 00:39:06 -0000	1.3
--- TransferReceiptBuilder.java	12 Jan 2004 22:39:14 -0000	1.4
***************
*** 1,5 ****
  package org.neuclear.asset.orders.builders;
  
- import org.dom4j.Element;
  import org.neuclear.asset.InvalidTransferException;
  import org.neuclear.asset.NegativeTransferException;
--- 1,4 ----
***************
*** 7,14 ****
  import org.neuclear.asset.orders.TransferOrder;
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.time.TimeTools;
- import org.neuclear.exchange.orders.ExchangeCompletionOrder;
  
- import java.sql.Timestamp;
  import java.util.Date;
  
--- 6,10 ----
***************
*** 33,36 ****
--- 29,37 ----
  $Id$
  $Log$
+ Revision 1.4  2004/01/12 22:39:14  pelle
+ 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.
+ 
  Revision 1.3  2004/01/11 00:39:06  pelle
  Cleaned up the schemas even more they now all verifiy.