|
From: <pe...@us...> - 2003-12-19 00:31:33
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver
In directory sc8-pr-cvs1:/tmp/cvs-serv19108/src/java/org/neuclear/id/resolver
Modified Files:
NSResolver.java
Log Message:
Lots of usability changes through out all the passphrase agents and end user tools.
Index: NSResolver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver/NSResolver.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NSResolver.java 11 Dec 2003 23:57:29 -0000 1.15
--- NSResolver.java 19 Dec 2003 00:31:30 -0000 1.16
***************
*** 2,9 ****
import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.Identity;
! import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NSTools;
! import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.cache.NSCache;
import org.neuclear.source.Source;
--- 2,6 ----
import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.*;
import org.neuclear.id.cache.NSCache;
import org.neuclear.source.Source;
***************
*** 32,40 ****
* @return
*/
! public final static Identity resolveIdentity(final String name) throws NeuClearException, InvalidNamedObjectException {
final SignedNamedObject id = resolve(name);
if (id instanceof Identity)
return (Identity) id;
! throw new InvalidNamedObjectException(name + " is not a valid Identity");
}
--- 29,37 ----
* @return
*/
! public final static Identity resolveIdentity(final String name) throws NameResolutionException, NeuClearException,InvalidNamedObjectException {
final SignedNamedObject id = resolve(name);
if (id instanceof Identity)
return (Identity) id;
! throw new InvalidNamedObjectException(name);
}
***************
*** 47,51 ****
* @return
*/
! public final static SignedNamedObject resolve(final String name) throws NeuClearException, InvalidNamedObjectException {
SignedNamedObject obj = NSCACHE.fetchCached(name);
if (obj != null)
--- 44,48 ----
* @return
*/
! public final static SignedNamedObject resolve(final String name) throws NameResolutionException,NeuClearException, InvalidNamedObjectException {
SignedNamedObject obj = NSCACHE.fetchCached(name);
if (obj != null)
***************
*** 64,68 ****
obj = Source.getInstance().fetch(store, name);
if (obj == null)
! throw new NeuClearException("Identity: " + name + " was not resolved");
NSCACHE.cache(obj);
return obj; //This may not be null
--- 61,65 ----
obj = Source.getInstance().fetch(store, name);
if (obj == null)
! throw new NameResolutionException(name);
NSCACHE.cache(obj);
return obj; //This may not be null
|