|
From: Pelle B. <pe...@us...> - 2004-04-12 15:14:44
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6848/src/java/org/neuclear/id/builders Modified Files: Builder.java Log Message: Now have a slightly better way of handling the waiting for input using the WaitForInput class. This will later be put into a command queue for execution. Index: Builder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/Builder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Builder.java 3 Mar 2004 23:26:42 -0000 1.6 --- Builder.java 12 Apr 2004 15:00:54 -0000 1.7 *************** *** 3,6 **** --- 3,7 ---- import org.dom4j.*; import org.neuclear.commons.crypto.passphraseagents.UserCancellationException; + import org.neuclear.commons.crypto.signers.BrowsableSigner; import org.neuclear.commons.crypto.signers.NonExistingSignerException; import org.neuclear.commons.crypto.signers.Signer; *************** *** 8,12 **** import org.neuclear.id.InvalidNamedObjectException; import org.neuclear.id.NSTools; - import org.neuclear.id.NameResolutionException; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.verifier.VerifyingReader; --- 9,12 ---- *************** *** 34,43 **** public Builder(final Element elem) throws XMLSecurityException { super(elem); ! createDocument(); } ! final public SignedNamedObject convert() throws InvalidNamedObjectException{ return VerifyingReader.getInstance().read(getElement()); } private void createDocument() { final Element elem = getElement(); --- 34,45 ---- public Builder(final Element elem) throws XMLSecurityException { super(elem); ! createDocument(); ! } ! final public SignedNamedObject convert() throws InvalidNamedObjectException { return VerifyingReader.getInstance().read(getElement()); } + private void createDocument() { final Element elem = getElement(); *************** *** 46,49 **** --- 48,52 ---- } } + /** * Sign NamedObject using given PrivateKey. This also adds a timestamp to the root element prior to signing *************** *** 53,57 **** getElement().addAttribute(DocumentHelper.createQName("timestamp", NSTools.NS_NEUID), TimeTools.createTimeStamp()); } ! public Object clone() { try { final Element elem = (Element) getElement().clone(); --- 56,61 ---- getElement().addAttribute(DocumentHelper.createQName("timestamp", NSTools.NS_NEUID), TimeTools.createTimeStamp()); } ! ! public Object clone() { try { final Element elem = (Element) getElement().clone(); *************** *** 63,75 **** } ! public final SignedNamedObject convert(String name,Signer signer) throws InvalidNamedObjectException { try { ! sign(name,signer); } catch (XMLSecurityException e) { ! throw new InvalidNamedObjectException("Problem in XML Sig",e); } catch (NonExistingSignerException e) { ! throw new InvalidNamedObjectException("Can not Sign with "+name,e); } catch (UserCancellationException e) { ! throw new InvalidNamedObjectException("User Cancelled Signing",e); } return convert(); --- 67,90 ---- } ! public final SignedNamedObject convert(String name, Signer signer) throws InvalidNamedObjectException { try { ! sign(name, signer); } catch (XMLSecurityException e) { ! throw new InvalidNamedObjectException("Problem in XML Sig", e); } catch (NonExistingSignerException e) { ! throw new InvalidNamedObjectException("Can not Sign with " + name, e); } catch (UserCancellationException e) { ! throw new InvalidNamedObjectException("User Cancelled Signing", e); ! } ! return convert(); ! } ! ! public final SignedNamedObject convert(BrowsableSigner signer) throws InvalidNamedObjectException { ! try { ! sign(signer); ! } catch (XMLSecurityException e) { ! throw new InvalidNamedObjectException("Problem in XML Sig", e); ! } catch (UserCancellationException e) { ! throw new InvalidNamedObjectException("User Cancelled Signing", e); } return convert(); |