[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/orders/builders TransferOrderBuilder.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.sourceforge.net:/tmp/cvs-serv29255/src/java/org/neuclear/asset/orders/builders

Modified Files:
	TransferOrderBuilder.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: TransferOrderBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/builders/TransferOrderBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferOrderBuilder.java	13 Jan 2004 15:11:17 -0000	1.3
--- TransferOrderBuilder.java	18 Feb 2004 00:13:30 -0000	1.4
***************
*** 11,15 ****
  import org.neuclear.id.Identity;
  import org.neuclear.id.builders.Builder;
- import org.neuclear.xml.xmlsec.SignedElement;
  
  /*
--- 11,14 ----
***************
*** 33,36 ****
--- 32,39 ----
  $Id$
  $Log$
+ Revision 1.4  2004/02/18 00:13:30  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.3  2004/01/13 15:11:17  pelle
  Now builds.
***************
*** 131,138 ****
  public class TransferOrderBuilder extends Builder {
      public 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)
              throw new InvalidTransferException("assetName");
          if (recipient == null)
--- 134,144 ----
  public class TransferOrderBuilder extends Builder {
      public TransferOrderBuilder(final Asset asset, final Identity recipient, final Value amount, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
+         this(asset.getName(),recipient.getName(),amount,comment);
+     }
+     public TransferOrderBuilder(final String assetname, final String 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 (assetname==null)
              throw new InvalidTransferException("assetName");
          if (recipient == null)
***************
*** 140,145 ****
  
          final Element element = getElement();
!         element.add(TransferGlobals.createElement(TransferGlobals.RECIPIENT_TAG, recipient.getName()));
!         element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, asset.getName()));
          element.add(TransferGlobals.createValueTag(amount));
  
--- 146,151 ----
  
          final Element element = getElement();
!         element.add(TransferGlobals.createElement(TransferGlobals.RECIPIENT_TAG, recipient));
!         element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, assetname));
          element.add(TransferGlobals.createValueTag(amount));