[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/orders TransferGlobals.java,1.1,1.2 TransferReceipt.java,1.1,1.2 TransferContract.java,1.1,NONE

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

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

Modified Files:
	TransferGlobals.java TransferReceipt.java 
Removed Files:
	TransferContract.java 
Log Message:
Started restructuring the original xml schemas.
Updated the Exchange and transfer orders.

Index: TransferGlobals.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/TransferGlobals.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransferGlobals.java	5 Jan 2004 23:47:09 -0000	1.1
--- TransferGlobals.java	6 Jan 2004 23:26:48 -0000	1.2
***************
*** 26,29 ****
--- 26,33 ----
  $Id$
  $Log$
+ Revision 1.2  2004/01/06 23:26:48  pelle
+ Started restructuring the original xml schemas.
+ Updated the Exchange and transfer orders.
+ 
  Revision 1.1  2004/01/05 23:47:09  pelle
  Create new Document classification "order", which is really just inherint in the new
***************
*** 116,127 ****
  
      public static void registerReaders() {
!         VerifyingReader.getInstance().registerReader(TransferGlobals.CANCEL_RCPT_TAGNAME, new AssetTransactionContract.Reader());
!         VerifyingReader.getInstance().registerReader(TransferGlobals.CANCEL_TAGNAME, new AssetTransactionContract.Reader());
!         VerifyingReader.getInstance().registerReader(TransferGlobals.XFER_TAGNAME, new AssetTransactionContract.Reader());
!         VerifyingReader.getInstance().registerReader(TransferGlobals.HELD_XFER_TAGNAME, new AssetTransactionContract.Reader());
!         VerifyingReader.getInstance().registerReader(TransferGlobals.XFER_RCPT_TAGNAME, new AssetTransactionContract.Reader());
!         VerifyingReader.getInstance().registerReader(TransferGlobals.HELD_XFER_RCPT_TAGNAME, new AssetTransactionContract.Reader());
!         VerifyingReader.getInstance().registerReader(TransferGlobals.COMPLETE_TAGNAME, new AssetTransactionContract.Reader());
! 
      }
  
--- 120,125 ----
  
      public static void registerReaders() {
!         VerifyingReader.getInstance().registerReader(TransferGlobals.XFER_TAGNAME, new TransferOrder.Reader());
!         VerifyingReader.getInstance().registerReader(TransferGlobals.XFER_RCPT_TAGNAME, new TransferReceipt.Reader());
      }
  
***************
*** 132,141 ****
      public static final String XFER_TAGNAME = "TransferOrder";
      public static final String XFER_RCPT_TAGNAME = "TransferReceipt";
-     public static final String HELD_XFER_TAGNAME = "ExchangeOrder";
-     public static final String HELD_XFER_RCPT_TAGNAME = "ExchangeOrderReceipt";
-     public static final String COMPLETE_TAGNAME = "CompleteHoldRequest";
-     public static final String CANCEL_TAGNAME = "CancelHoldRequest";
-     public static final String CANCEL_RCPT_TAGNAME = "CancelHoldReceipt";
      public static final String XFER_NSPREFIX = "xfer";
!     public static final String XFER_NSURI = "http://neuclear.org/neu/xfer";
  }
--- 130,134 ----
      public static final String XFER_TAGNAME = "TransferOrder";
      public static final String XFER_RCPT_TAGNAME = "TransferReceipt";
      public static final String XFER_NSPREFIX = "xfer";
!     public static final String XFER_NSURI = "http://neuclear.org/neu/xfer.xsd";
  }

Index: TransferReceipt.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/TransferReceipt.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransferReceipt.java	5 Jan 2004 23:47:09 -0000	1.1
--- TransferReceipt.java	6 Jan 2004 23:26:48 -0000	1.2
***************
*** 22,45 ****
  public class TransferReceipt extends AssetTransactionContract {
  
!     private TransferReceipt(final SignedNamedCore core, final Asset asset, final Identity from, final Identity to, final String reqid, final double amount, final Date valuetime, final String comment)  {
!         super(core, asset);
!         this.from = from;
!         this.reqid = reqid;
!         this.to=to;
          this.valuetime=valuetime.getTime();
!         this.amount = amount;
!         this.comment = (comment != null) ? comment : "";
!     }
! 
!     public final Identity getFrom() {
!         return from;
!     }
! 
!     public final String getRequestId() {
!         return reqid;
      }
  
!     public final Identity getTo() {
!         return to;
      }
      public final Date getValueTime() {
--- 22,33 ----
  public class TransferReceipt extends AssetTransactionContract {
  
!     private TransferReceipt(final SignedNamedCore core, final TransferOrder order, final Date valuetime)  {
!         super(core, order.getAsset());
          this.valuetime=valuetime.getTime();
!         this.order=order;
      }
  
!     public final TransferOrder getOrder(){
!         return order;
      }
      public final Date getValueTime() {
***************
*** 47,65 ****
      }
  
-     public final double getAmount() {
-             return amount;
-         }
- 
-     public final String getComment() {
-         return comment;
-     }
- 
- 
-     private final double amount;
-     private final String comment;
      private final long valuetime;
!     private final Identity from;
!     private final String reqid;
!     private final Identity to;
    public static final class Reader implements NamedObjectReader {
          /**
--- 35,41 ----
      }
  
      private final long valuetime;
!     private final TransferOrder order;
! 
    public static final class Reader implements NamedObjectReader {
          /**

--- TransferContract.java DELETED ---