[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/verifier NSVerifier.java,1.2,1.3

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

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

Modified Files:
	NSVerifier.java 
Log Message:
Changed NameSpace to Identity.
To cause less confusion in the future.


Index: NSVerifier.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier/NSVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NSVerifier.java	22 Sep 2003 19:24:01 -0000	1.2
--- NSVerifier.java	23 Sep 2003 19:16:28 -0000	1.3
***************
*** 1,7 ****
  package org.neuclear.id.verifier;
  
! import org.neuclear.id.InvalidNameSpaceException;
  import org.neuclear.id.NSTools;
! import org.neuclear.id.NameSpace;
  import org.neuclear.id.NamedObject;
  import org.neuclear.id.resolver.NSResolver;
--- 1,7 ----
  package org.neuclear.id.verifier;
  
! import org.neuclear.id.InvalidIdentityException;
  import org.neuclear.id.NSTools;
! import org.neuclear.id.Identity;
  import org.neuclear.id.NamedObject;
  import org.neuclear.id.resolver.NSResolver;
***************
*** 22,26 ****
      /**
       * We first check if the name is syntactically correct.
!      * Then we check if it is a toplevel NameSpace.
       * If it is we check if the objects signature matches the toplevel namespace
       * We check if the parent is valid
--- 22,26 ----
      /**
       * We first check if the name is syntactically correct.
!      * Then we check if it is a toplevel Identity.
       * If it is we check if the objects signature matches the toplevel namespace
       * We check if the parent is valid
***************
*** 35,48 ****
          if (parentName.equals("neu://")) {
              boolean valid = obj.verifySignature(getRootPK());
! //            if (valid && obj instanceof NameSpace)
! //                NSResolver.NSCACHE.cache((NameSpace)obj);
              return valid;
          }
  
          // Allright we need to do this the hard way
!         NameSpace parent = null;
          try {
              parent = NSResolver.resolveNameSpace(parentName);
!         } catch (InvalidNameSpaceException e) {
              return false;
          }
--- 35,48 ----
          if (parentName.equals("neu://")) {
              boolean valid = obj.verifySignature(getRootPK());
! //            if (valid && obj instanceof Identity)
! //                NSResolver.NSCACHE.cache((Identity)obj);
              return valid;
          }
  
          // Allright we need to do this the hard way
!         Identity parent = null;
          try {
              parent = NSResolver.resolveNameSpace(parentName);
!         } catch (InvalidIdentityException e) {
              return false;
          }
***************
*** 52,57 ****
  
          boolean valid = (parent != null && parent.postAllowed(obj));
! //        if (valid && obj instanceof NameSpace)
! //            NSResolver.NSCACHE.cache((NameSpace)obj);
          return valid;
      }
--- 52,57 ----
  
          boolean valid = (parent != null && parent.postAllowed(obj));
! //        if (valid && obj instanceof Identity)
! //            NSResolver.NSCACHE.cache((Identity)obj);
          return valid;
      }