[Neuclear-develop] neuclear-id/src/java/org/neuclear/id SignedNamedCore.java,1.7,1.8 SignedNamedObject.java,1.14,1.15 Named.java,1.4,NONE

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv10463/src/java/org/neuclear/id

Modified Files:
	SignedNamedCore.java SignedNamedObject.java 
Removed Files:
	Named.java 
Log Message:
overwrote the standard Object.toString(), hashCode() and equals() methods for SignedNamedObject/Core
fixed cactus tests
Added TransferRequestServlet
Added cactus tests to pay

Index: SignedNamedCore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedCore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SignedNamedCore.java	19 Dec 2003 18:03:34 -0000	1.7
--- SignedNamedCore.java	20 Dec 2003 00:21:19 -0000	1.8
***************
*** 2,5 ****
--- 2,11 ----
   * $Id$
   * $Log$
+  * Revision 1.8  2003/12/20 00:21:19  pelle
+  * overwrote the standard Object.toString(), hashCode() and equals() methods for SignedNamedObject/Core
+  * fixed cactus tests
+  * Added TransferRequestServlet
+  * Added cactus tests to pay
+  *
   * Revision 1.7  2003/12/19 18:03:34  pelle
   * Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 377,380 ****
--- 383,402 ----
      public final byte[] getDigest() {
          return CryptoTools.digest(encoded.getBytes());
+     }
+ 
+     public final int hashCode() {
+         return encoded.hashCode();
+     }
+ 
+     public final String toString() {
+         return name;    //To change body of overriden methods use Options | File Templates.
+     }
+ 
+     public final boolean equals(Object object) {
+         if (object==this)
+             return true;
+         if (object instanceof SignedNamedCore)
+             return true;
+         return encoded.equals(((SignedNamedCore)object).getEncoded());    //To change body of overriden methods use Options | File Templates.
      }
  

Index: SignedNamedObject.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedObject.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SignedNamedObject.java	19 Dec 2003 18:03:34 -0000	1.14
--- SignedNamedObject.java	20 Dec 2003 00:21:19 -0000	1.15
***************
*** 2,5 ****
--- 2,11 ----
   * $Id$
   * $Log$
+  * Revision 1.15  2003/12/20 00:21:19  pelle
+  * overwrote the standard Object.toString(), hashCode() and equals() methods for SignedNamedObject/Core
+  * fixed cactus tests
+  * Added TransferRequestServlet
+  * Added cactus tests to pay
+  *
   * Revision 1.14  2003/12/19 18:03:34  pelle
   * Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 244,248 ****
   * @see org.neuclear.commons.crypto.signers.Signer
   */
! public class SignedNamedObject implements SignedObject, Named {
  
      protected SignedNamedObject(final SignedNamedCore core)  {
--- 250,254 ----
   * @see org.neuclear.commons.crypto.signers.Signer
   */
! public class SignedNamedObject implements SignedObject {
  
      protected SignedNamedObject(final SignedNamedCore core)  {
***************
*** 327,330 ****
--- 333,353 ----
          return DocumentHelper.createQName(name, NSTools.NS_NEUID);
      }
+ 
+     public final int hashCode() {
+         return getClass().hashCode()+core.hashCode();
+     }
+ 
+     public String toString() {
+         return core.toString();
+     }
+ 
+     public final boolean equals(Object object) {
+         if (object==this)
+             return true;
+         if (object.getClass()==getClass())
+             return true;
+         return getEncoded().equals(((SignedNamedObject)object).getEncoded());
+     }
+ 
      private final SignedNamedCore core;
  

--- Named.java DELETED ---