[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts/builders AssetBuilder.java,1.6,1.7

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

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

Modified Files:
	AssetBuilder.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AssetBuilder.java	10 Jan 2004 00:00:44 -0000	1.6
--- AssetBuilder.java	18 Feb 2004 00:13:29 -0000	1.7
***************
*** 33,36 ****
--- 33,40 ----
  $Id$
  $Log$
+ Revision 1.7  2004/02/18 00:13:29  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.6  2004/01/10 00:00:44  pelle
  Implemented new Schema for Transfer*
***************
*** 102,106 ****
       * Used to create new Assets
       * 
-      * @param name       The Name of Identity
       * @param allow      PublicKey allowed to sign in here
       * @param repository URL of Default Store for NameSpace. (Note. A NameSpace object is stored in the default repository of it's parent namespace)
--- 106,109 ----
***************
*** 111,116 ****
       * @param minimum    Minimum transaction size
       */
!     public AssetBuilder(final String name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver, final String controller, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME), name, allow, repository, signer, logger, receiver);
          final Element elem = getElement();
          AssetGlobals.createAttribute(elem, "controller", controller);
--- 114,119 ----
       * @param minimum    Minimum transaction size
       */
!     public AssetBuilder(final PublicKey allow, final String signer, final String logger, final String receiver, final String controller, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME),  allow,  signer, logger, receiver);
          final Element elem = getElement();
          AssetGlobals.createAttribute(elem, "controller", controller);
***************
*** 127,133 ****
                  assetname = args[0];
  
!             final AssetBuilder assetraw = new AssetBuilder(assetname,
                      signer.getPublicKey(assetname),
-                     "http://repository.neuclear.org/",
                      "http://bux.neuclear.org:8080",
                      "http://logger.neuclear.org",
--- 130,135 ----
                  assetname = args[0];
  
!             final AssetBuilder assetraw = new AssetBuilder(
                      signer.getPublicKey(assetname),
                      "http://bux.neuclear.org:8080",
                      "http://logger.neuclear.org",
***************
*** 137,141 ****
                      0.01
              );
!             final Asset asset= (Asset) assetraw.sign(signer);
              final Store store = new FileStore("target/testdata/repository");
              store.receive(asset);
--- 139,143 ----
                      0.01
              );
!             final Asset asset= (Asset) assetraw.convert(assetname,signer);
              final Store store = new FileStore("target/testdata/repository");
              store.receive(asset);