[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset AssetController.java,1.11,1.12 NegativeTransferException.java,1.4,1.5

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

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

Modified Files:
	AssetController.java NegativeTransferException.java 
Log Message:
Completed all the builders and contracts.
Added a new abstract Value class to contain either an amount or a list of serial numbers.
Now ready to finish off the AssetControllers.

Index: AssetController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/AssetController.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AssetController.java	10 Jan 2004 00:00:45 -0000	1.11
--- AssetController.java	12 Jan 2004 22:39:14 -0000	1.12
***************
*** 4,13 ****
  import org.neuclear.asset.orders.AssetTransactionContract;
  import org.neuclear.asset.orders.TransferOrder;
  import org.neuclear.commons.NeuClearException;
! import org.neuclear.exchange.orders.CancelExchangeOrder;
! import org.neuclear.exchange.orders.ExchangeCompletionOrder;
! import org.neuclear.exchange.orders.ExchangeOrder;
! import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
! import org.neuclear.id.builders.NamedObjectBuilder;
  
  /*
--- 4,11 ----
  import org.neuclear.asset.orders.AssetTransactionContract;
  import org.neuclear.asset.orders.TransferOrder;
+ import org.neuclear.asset.orders.TransferReceipt;
  import org.neuclear.commons.NeuClearException;
! import org.neuclear.exchange.orders.*;
! import org.neuclear.id.SignedNamedObject;
  
  /*
***************
*** 31,34 ****
--- 29,37 ----
  $Id$
  $Log$
+ Revision 1.12  2004/01/12 22:39:14  pelle
+ Completed all the builders and contracts.
+ Added a new abstract Value class to contain either an amount or a list of serial numbers.
+ Now ready to finish off the AssetControllers.
+ 
  Revision 1.11  2004/01/10 00:00:45  pelle
  Implemented new Schema for Transfer*
***************
*** 115,119 ****
       * @throws InvalidTransferException 
       */
!     public final NamedObjectBuilder process(final AssetTransactionContract contract) throws TransferDeniedException, LowLevelPaymentException, InvalidTransferException, NeuClearException {
          if (contract instanceof TransferOrder)
              return process((TransferOrder) contract);
--- 118,122 ----
       * @throws InvalidTransferException 
       */
!     public final SignedNamedObject process(final AssetTransactionContract contract) throws TransferDeniedException, LowLevelPaymentException, InvalidTransferException, NeuClearException {
          if (contract instanceof TransferOrder)
              return process((TransferOrder) contract);
***************
*** 146,150 ****
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.asset.orders.builders.TransferReceiptBuilder process(TransferOrder req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
--- 149,153 ----
       * @throws InvalidTransferException 
       */
!     public abstract TransferReceipt process(TransferOrder req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
***************
*** 154,163 ****
       * 
       * @param req Valid ExchangeOrder
!      * @return Unsigned ExchangeReceiptBuilder
       * @throws LowLevelPaymentException 
       * @throws TransferDeniedException  
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.exchange.orders.builders.ExchangeReceiptBuilder process(ExchangeOrder req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
--- 157,166 ----
       * 
       * @param req Valid ExchangeOrder
!      * @return Unsigned ExchangeOrderReceiptBuilder
       * @throws LowLevelPaymentException 
       * @throws TransferDeniedException  
       * @throws InvalidTransferException 
       */
!     public abstract ExchangeOrderReceipt process(ExchangeOrder req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
***************
*** 170,174 ****
       * @throws InvalidTransferException 
       */
!     public abstract org.neuclear.asset.orders.builders.TransferReceiptBuilder process(ExchangeCompletionOrder complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
--- 173,177 ----
       * @throws InvalidTransferException 
       */
!     public abstract ExchangeCompletedReceipt process(ExchangeCompletionOrder complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
      /**
***************
*** 182,186 ****
       */
  
!     public abstract CancelExchangeReceiptBuilder process(CancelExchangeOrder cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
  
--- 185,189 ----
       */
  
!     public abstract CancelExchangeReceipt process(CancelExchangeOrder cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
  
  

Index: NegativeTransferException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/NegativeTransferException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NegativeTransferException.java	21 Nov 2003 04:43:04 -0000	1.4
--- NegativeTransferException.java	12 Jan 2004 22:39:14 -0000	1.5
***************
*** 1,4 ****
--- 1,6 ----
  package org.neuclear.asset;
  
+ import org.neuclear.asset.orders.Value;
+ 
  
  /**
***************
*** 8,20 ****
   */
  public final class NegativeTransferException extends InvalidTransferException {
!     public NegativeTransferException(final double amount) {
          super("negative amount");
          this.amount = amount;
      }
  
!     private final double amount;
  
  
!     public final double getAmount() {
          return amount;
      }
--- 10,22 ----
   */
  public final class NegativeTransferException extends InvalidTransferException {
!     public NegativeTransferException(final Value amount) {
          super("negative amount");
          this.amount = amount;
      }
  
!     private final Value amount;
  
  
!     public final Value getAmount() {
          return amount;
      }