[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/orders TransferGlobals.java,1.6,1.7

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

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

Index: TransferGlobals.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/TransferGlobals.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TransferGlobals.java	13 Jan 2004 15:11:17 -0000	1.6
--- TransferGlobals.java	3 Mar 2004 23:28:14 -0000	1.7
***************
*** 2,7 ****
  
  import org.dom4j.*;
- import org.neuclear.asset.contracts.Asset;
  import org.neuclear.asset.InvalidTransferException;
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.time.TimeTools;
--- 2,7 ----
  
  import org.dom4j.*;
  import org.neuclear.asset.InvalidTransferException;
+ import org.neuclear.asset.contracts.Asset;
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.time.TimeTools;
***************
*** 15,19 ****
  import java.sql.Timestamp;
  import java.text.ParseException;
- import java.util.StringTokenizer;
  
  /*
--- 15,18 ----
***************
*** 37,40 ****
--- 36,42 ----
  $Id$
  $Log$
+ Revision 1.7  2004/03/03 23:28:14  pelle
+ Updated tests to use AbstractObjectCreationTest
+ 
  Revision 1.6  2004/01/13 15:11:17  pelle
  Now builds.
***************
*** 151,173 ****
          return elem;
      }
      public static String getElementValue(final Element element, final String name) throws InvalidNamedObjectException {
!         return getElementValue(element,createQName(name));
      }
  
      public static String getElementValue(final Element element, final QName name) throws InvalidNamedObjectException {
!         final Element value=element.element(name);
!         if (value==null)
!             throw new InvalidNamedObjectException("Missing required element: "+name);
!         final String text=value.getTextTrim();
          if (Utility.isEmpty(text))
!             throw new InvalidNamedObjectException("Required element: "+name+" is empty");
          return text;
      }
  
      public static String parseCommentElement(final Element element) {
!         final Element value=element.element(createQName(COMMENT_TAG));
!         if (value==null)
              return "";
!         final String text=value.getTextTrim();
          return Utility.denullString(text);
      }
--- 153,176 ----
          return elem;
      }
+ 
      public static String getElementValue(final Element element, final String name) throws InvalidNamedObjectException {
!         return getElementValue(element, createQName(name));
      }
  
      public static String getElementValue(final Element element, final QName name) throws InvalidNamedObjectException {
!         final Element value = element.element(name);
!         if (value == null)
!             throw new InvalidNamedObjectException("Missing required element: " + name);
!         final String text = value.getTextTrim();
          if (Utility.isEmpty(text))
!             throw new InvalidNamedObjectException("Required element: " + name + " is empty");
          return text;
      }
  
      public static String parseCommentElement(final Element element) {
!         final Element value = element.element(createQName(COMMENT_TAG));
!         if (value == null)
              return "";
!         final String text = value.getTextTrim();
          return Utility.denullString(text);
      }
***************
*** 183,198 ****
  
      public static final Timestamp parseValueTimeElement(final Element elem) throws InvalidNamedObjectException {
!         return parseTimeStampElement(elem,createQName(VALUE_TIME_TAG));
      }
  
!     public static final Timestamp parseTimeStampElement(final Element elem,final String name) throws InvalidNamedObjectException {
!         return parseTimeStampElement(elem,createQName(name));
      }
!     public static final Timestamp parseTimeStampElement(final Element elem,final QName qn) throws InvalidNamedObjectException {
          try {
!             final Element telem=elem.element(qn);
!             if (telem==null)
                  throw new InvalidNamedObjectException("missing time stamp element");
!             final String value=telem.getTextTrim();
              if (Utility.isEmpty(value))
                  throw new InvalidNamedObjectException("missing time stamp");
--- 186,202 ----
  
      public static final Timestamp parseValueTimeElement(final Element elem) throws InvalidNamedObjectException {
!         return parseTimeStampElement(elem, createQName(VALUE_TIME_TAG));
      }
  
!     public static final Timestamp parseTimeStampElement(final Element elem, final String name) throws InvalidNamedObjectException {
!         return parseTimeStampElement(elem, createQName(name));
      }
! 
!     public static final Timestamp parseTimeStampElement(final Element elem, final QName qn) throws InvalidNamedObjectException {
          try {
!             final Element telem = elem.element(qn);
!             if (telem == null)
                  throw new InvalidNamedObjectException("missing time stamp element");
!             final String value = telem.getTextTrim();
              if (Utility.isEmpty(value))
                  throw new InvalidNamedObjectException("missing time stamp");
***************
*** 206,225 ****
  
      public static final Asset parseAssetTag(Element elem) throws InvalidNamedObjectException {
!         final String name = getElementValue(elem,ASSET_TAG);
          try {
              return (Asset) NSResolver.resolveIdentity(name);
          } catch (ClassCastException e) {
!             throw new InvalidNamedObjectException(name,e);
          } catch (NameResolutionException e) {
!             throw new InvalidNamedObjectException(name,e);
          }
  
      }
      public static final Identity parseRecipientTag(Element elem) throws InvalidNamedObjectException {
!         final String name = getElementValue(elem,RECIPIENT_TAG);
          try {
!             return  NSResolver.resolveIdentity(name);
          } catch (NameResolutionException e) {
!             throw new InvalidNamedObjectException(name,e);
          }
  
--- 210,230 ----
  
      public static final Asset parseAssetTag(Element elem) throws InvalidNamedObjectException {
!         final String name = getElementValue(elem, ASSET_TAG);
          try {
              return (Asset) NSResolver.resolveIdentity(name);
          } catch (ClassCastException e) {
!             throw new InvalidNamedObjectException(name, e);
          } catch (NameResolutionException e) {
!             throw new InvalidNamedObjectException(name, e);
          }
  
      }
+ 
      public static final Identity parseRecipientTag(Element elem) throws InvalidNamedObjectException {
!         final String name = getElementValue(elem, RECIPIENT_TAG);
          try {
!             return NSResolver.resolveIdentity(name);
          } catch (NameResolutionException e) {
!             throw new InvalidNamedObjectException(name, e);
          }
  
***************
*** 227,231 ****
  
      public static final Value parseValueTag(Element elem) throws InvalidNamedObjectException {
!         if (elem.elements(createQName(AMOUNT_TAG))!=null)
              return parseAmountTag(elem);
          else
--- 232,236 ----
  
      public static final Value parseValueTag(Element elem) throws InvalidNamedObjectException {
!         if (elem.elements(createQName(AMOUNT_TAG)) != null)
              return parseAmountTag(elem);
          else
***************
*** 235,276 ****
  
      private static SerialNumbers parseSerialNumbers(Element elem) throws InvalidNamedObjectException {
!         final String numbers=getElementValue(elem,SERIAL_NOS_TAG);
          return new SerialNumbers(numbers.split("\\s*"));
      }
  
      private static Amount parseAmountTag(Element elem) throws InvalidNamedObjectException {
!         final String amount=getElementValue(elem,AMOUNT_TAG);
  
          try {
              return new Amount(Double.parseDouble(amount));
          } catch (NumberFormatException e) {
!             throw new InvalidNamedObjectException("Badly formatted number",e);
          }
      }
  
!     public  static Element createValueTag(Value value) throws InvalidTransferException {
!         if (value instanceof Amount){
!             return createElement(TransferGlobals.AMOUNT_TAG,Double.toString(value.getAmount()));
          }
!         SerialNumbers nos=((SerialNumbers)value);
!         if (value.getAmount()>0) {
!             final StringBuffer buf=new StringBuffer((int) (nos.getAmount()*(nos.getNumber(0).length())+1));
!             for (int i=0;i<nos.getAmount();i++)
                  buf.append(nos.getNumber(i));
!                 buf.append("\n");
!             return createElement(TransferGlobals.SERIAL_NOS_TAG,buf.toString());
          }
          throw new InvalidTransferException("Cant have an empty list");
      }
!     public static final SignedNamedObject parseEmbedded(Element elem,QName name) throws InvalidNamedObjectException {
!         Element embedded=elem.element(name);
!         if (embedded==null)
!             throw new InvalidNamedObjectException("Element: "+elem.getName()+" doesnt contain a "+name.getQualifiedName());
!         try {
!             return VerifyingReader.getInstance().read(embedded);
!         } catch (NameResolutionException e) {
!             throw new InvalidNamedObjectException("Element: "+elem.getName()+" had a problem identifying signer",e);
!         }
      }
      static {
          registerReaders();
--- 240,279 ----
  
      private static SerialNumbers parseSerialNumbers(Element elem) throws InvalidNamedObjectException {
!         final String numbers = getElementValue(elem, SERIAL_NOS_TAG);
          return new SerialNumbers(numbers.split("\\s*"));
      }
  
      private static Amount parseAmountTag(Element elem) throws InvalidNamedObjectException {
!         final String amount = getElementValue(elem, AMOUNT_TAG);
  
          try {
              return new Amount(Double.parseDouble(amount));
          } catch (NumberFormatException e) {
!             throw new InvalidNamedObjectException("Badly formatted number", e);
          }
      }
  
!     public static Element createValueTag(Value value) throws InvalidTransferException {
!         if (value instanceof Amount) {
!             return createElement(TransferGlobals.AMOUNT_TAG, Double.toString(value.getAmount()));
          }
!         SerialNumbers nos = ((SerialNumbers) value);
!         if (value.getAmount() > 0) {
!             final StringBuffer buf = new StringBuffer((int) (nos.getAmount() * (nos.getNumber(0).length()) + 1));
!             for (int i = 0; i < nos.getAmount(); i++)
                  buf.append(nos.getNumber(i));
!             buf.append("\n");
!             return createElement(TransferGlobals.SERIAL_NOS_TAG, buf.toString());
          }
          throw new InvalidTransferException("Cant have an empty list");
      }
! 
!     public static final SignedNamedObject parseEmbedded(Element elem, QName name) throws InvalidNamedObjectException {
!         Element embedded = elem.element(name);
!         if (embedded == null)
!             throw new InvalidNamedObjectException("Element: " + elem.getName() + " doesnt contain a " + name.getQualifiedName());
!         return VerifyingReader.getInstance().read(embedded);
      }
+ 
      static {
          registerReaders();
***************
*** 281,289 ****
      public static final String XFER_NSPREFIX = "xfer";
      public static final String XFER_NSURI = "http://neuclear.org/neu/xfer.xsd";
!     public static final String VALUE_TIME_TAG="ValueTime";
!     public static final String COMMENT_TAG="Comment";
!     public static final String ASSET_TAG="Asset";
!     public static final String AMOUNT_TAG="Amount";
!     public static final String SERIAL_NOS_TAG="SerialNumbers";
      public static final String RECIPIENT_TAG = "Recipient";
  }
--- 284,292 ----
      public static final String XFER_NSPREFIX = "xfer";
      public static final String XFER_NSURI = "http://neuclear.org/neu/xfer.xsd";
!     public static final String VALUE_TIME_TAG = "ValueTime";
!     public static final String COMMENT_TAG = "Comment";
!     public static final String ASSET_TAG = "Asset";
!     public static final String AMOUNT_TAG = "Amount";
!     public static final String SERIAL_NOS_TAG = "SerialNumbers";
      public static final String RECIPIENT_TAG = "Recipient";
  }