[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts HeldTransferReceipt.java,1.4,1.5 HeldTransferRequest.java,1.3,1.4 TransferContract.java,1.5,1.6

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

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

Modified Files:
	HeldTransferReceipt.java HeldTransferRequest.java 
	TransferContract.java 
Log Message:
Changed some mutable fields in immutable classes, making them truely immutable. Thus safer.

Index: HeldTransferReceipt.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/HeldTransferReceipt.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HeldTransferReceipt.java	21 Nov 2003 04:43:04 -0000	1.4
--- HeldTransferReceipt.java	21 Nov 2003 13:57:19 -0000	1.5
***************
*** 17,27 ****
      HeldTransferReceipt(final SignedNamedCore core, final Asset asset, final Identity from, final Identity to, final String reqid, final double amount, final Date valuetime, final String comment, final Date helduntil) throws NeuClearException {
          super(core, asset, from, to, reqid, amount, valuetime, comment);
!         this.helduntil = helduntil;
      }
  
      public final Date getHeldUntil() {
!         return helduntil;
      }
  
!     private final Date helduntil;
  }
--- 17,27 ----
      HeldTransferReceipt(final SignedNamedCore core, final Asset asset, final Identity from, final Identity to, final String reqid, final double amount, final Date valuetime, final String comment, final Date helduntil) throws NeuClearException {
          super(core, asset, from, to, reqid, amount, valuetime, comment);
!         this.helduntil = helduntil.getTime();
      }
  
      public final Date getHeldUntil() {
!         return new Timestamp(helduntil);
      }
  
!     private final long helduntil;
  }

Index: HeldTransferRequest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/HeldTransferRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HeldTransferRequest.java	21 Nov 2003 04:43:04 -0000	1.3
--- HeldTransferRequest.java	21 Nov 2003 13:57:19 -0000	1.4
***************
*** 16,26 ****
      HeldTransferRequest(final SignedNamedCore core, final Asset asset, final Identity to, final double amount, final Date valuetime, final String comment, final Date helduntil) throws NeuClearException {
          super(core, asset, to, amount, valuetime, comment);
!         this.helduntil = helduntil;
      }
  
      public final Date getHeldUntil() {
!         return helduntil;
      }
  
!     private final Date helduntil;
  }
--- 16,26 ----
      HeldTransferRequest(final SignedNamedCore core, final Asset asset, final Identity to, final double amount, final Date valuetime, final String comment, final Date helduntil) throws NeuClearException {
          super(core, asset, to, amount, valuetime, comment);
!         this.helduntil = helduntil.getTime();
      }
  
      public final Date getHeldUntil() {
!         return new Timestamp(helduntil);
      }
  
!     private final long helduntil;
  }

Index: TransferContract.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/TransferContract.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TransferContract.java	21 Nov 2003 04:43:04 -0000	1.5
--- TransferContract.java	21 Nov 2003 13:57:19 -0000	1.6
***************
*** 50,54 ****
          this.comment = (comment != null) ? comment : "";
          this.to = to;
!         this.valuetime = valuetime;
      }
  
--- 50,54 ----
          this.comment = (comment != null) ? comment : "";
          this.to = to;
!         this.valuetime = valuetime.getTime();
      }
  
***************
*** 58,62 ****
  
      public final Date getValueTime() {
!         return valuetime;
      }
  
--- 58,62 ----
  
      public final Date getValueTime() {
!         return new Timestamp(valuetime);
      }
  
***************
*** 74,78 ****
      private final double amount;
      private final Identity to;
!     private final Date valuetime;
      private final String comment;
  
--- 74,78 ----
      private final double amount;
      private final Identity to;
!     private final long valuetime;
      private final String comment;