[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/servlet TransferRequestServlet.java,1.3,1.4

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

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

Modified Files:
	TransferRequestServlet.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: TransferRequestServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/servlet/TransferRequestServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferRequestServlet.java	1 Apr 2004 23:18:33 -0000	1.3
--- TransferRequestServlet.java	2 Apr 2004 23:04:36 -0000	1.4
***************
*** 2,6 ****
  
  import org.neuclear.asset.InvalidTransferException;
- import org.neuclear.asset.contracts.Asset;
  import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.builders.TransferOrderBuilder;
--- 2,5 ----
***************
*** 35,38 ****
--- 34,41 ----
  $Id$
  $Log$
+ Revision 1.4  2004/04/02 23:04:36  pelle
+ 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.
+ 
  Revision 1.3  2004/04/01 23:18:33  pelle
  Split Identity into Signatory and Identity class.
***************
*** 89,101 ****
  public class TransferRequestServlet extends SignatureRequestServlet {
      protected Builder createBuilder(HttpServletRequest request) throws NeuClearException {
-         Asset asset = (Asset) Resolver.resolveIdentity(getServiceid());
          Identity user = (Identity) request.getUserPrincipal();
          if (user == null)
              user = Resolver.resolveIdentity(request.getParameter("sender"));
!         Identity to = Resolver.resolveIdentity(request.getParameter("recipient"));
          double amount = Double.parseDouble(Utility.denullString(request.getParameter("amount"), "0"));
          String comment = Utility.denullString(request.getParameter("comment"));
          try {
!             return new TransferOrderBuilder(asset, to, new Amount(amount), comment);
          } catch (InvalidTransferException e) {
              throw new InvalidNamedObjectException(user.getName(), e);
--- 92,103 ----
  public class TransferRequestServlet extends SignatureRequestServlet {
      protected Builder createBuilder(HttpServletRequest request) throws NeuClearException {
          Identity user = (Identity) request.getUserPrincipal();
          if (user == null)
              user = Resolver.resolveIdentity(request.getParameter("sender"));
!         String to = request.getParameter("recipient");
          double amount = Double.parseDouble(Utility.denullString(request.getParameter("amount"), "0"));
          String comment = Utility.denullString(request.getParameter("comment"));
          try {
!             return new TransferOrderBuilder(getServiceid(), to, new Amount(amount), comment);
          } catch (InvalidTransferException e) {
              throw new InvalidNamedObjectException(user.getName(), e);