[Neuclear-develop] neuclear-pay/src/java/org/neuclear/exchange/orders CancelExchangeReceipt.java,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20556/src/java/org/neuclear/exchange/orders

Modified Files:
	CancelExchangeReceipt.java 
Log Message:
Updated tests to use AbstractObjectCreationTest

Index: CancelExchangeReceipt.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/CancelExchangeReceipt.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CancelExchangeReceipt.java	10 Jan 2004 00:00:46 -0000	1.3
--- CancelExchangeReceipt.java	3 Mar 2004 23:28:14 -0000	1.4
***************
*** 4,8 ****
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.orders.TransferGlobals;
! import org.neuclear.id.*;
  import org.neuclear.id.verifier.VerifyingReader;
  
--- 4,11 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.orders.TransferGlobals;
! import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NamedObjectReader;
! import org.neuclear.id.SignedNamedCore;
! import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.verifier.VerifyingReader;
  
***************
*** 15,27 ****
   * Time: 5:35:26 PM
   */
! public final class CancelExchangeReceipt extends ExchangeTransactionContract{
  
!     private CancelExchangeReceipt(SignedNamedCore core,CancelExchangeOrder order,final Date canceltime)  {
          super(core, order.getAsset(), order.getAgent());
!         this.canceltime=canceltime.getTime();
!         this.order=order;
      }
  
!     public CancelExchangeOrder getOrder(){
          return order;
      }
--- 18,30 ----
   * Time: 5:35:26 PM
   */
! public final class CancelExchangeReceipt extends ExchangeTransactionContract {
  
!     private CancelExchangeReceipt(SignedNamedCore core, CancelExchangeOrder order, final Date canceltime) {
          super(core, order.getAsset(), order.getAgent());
!         this.canceltime = canceltime.getTime();
!         this.order = order;
      }
  
!     public CancelExchangeOrder getOrder() {
          return order;
      }
***************
*** 31,35 ****
      }
  
!     private final long   canceltime;
      private final CancelExchangeOrder order;
  
--- 34,38 ----
      }
  
!     private final long canceltime;
      private final CancelExchangeOrder order;
  
***************
*** 43,58 ****
          public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException {
              if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET))
!                 throw new InvalidNamedObjectException(core.getName(),"Not in XML NameSpace: "+AssetGlobals.NS_ASSET.getURI());
  
!             try {
!                 if (elem.getName().equals(ExchangeGlobals.CANCEL_RCPT_TAGNAME)){
!                     final Date valuetime = TransferGlobals.parseValueTimeElement(elem);
!                     CancelExchangeOrder order=(CancelExchangeOrder) VerifyingReader.getInstance().read(elem.element(ExchangeGlobals.createQName(ExchangeGlobals.CANCEL_TAGNAME)));
!                     return new CancelExchangeReceipt(core,order,valuetime);
!                 }
!                 } catch (NameResolutionException e) {
!                     throw new InvalidNamedObjectException(core.getName(),e);
!                 }
!                 throw new InvalidNamedObjectException(core.getName(),"Not Matched");
          }
      }
--- 46,57 ----
          public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException {
              if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET))
!                 throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI());
  
!             if (elem.getName().equals(ExchangeGlobals.CANCEL_RCPT_TAGNAME)) {
!                 final Date valuetime = TransferGlobals.parseValueTimeElement(elem);
!                 CancelExchangeOrder order = (CancelExchangeOrder) VerifyingReader.getInstance().read(elem.element(ExchangeGlobals.createQName(ExchangeGlobals.CANCEL_TAGNAME)));
!                 return new CancelExchangeReceipt(core, order, valuetime);
!             }
!             throw new InvalidNamedObjectException(core.getName(), "Not Matched");
          }
      }