Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10493/src/java/org/neuclear/commons/crypto/passphraseagents/swing Modified Files: KeyStoreDialog.java NewAliasDialog.java NewPassphraseDialog.java SimpleDialog.java SwingAgent.java Log Message: Got rid of the looping InvalidPassphraseException in DefaultSigner. Added initial focus for all dialogs. Index: KeyStoreDialog.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/KeyStoreDialog.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** KeyStoreDialog.java 14 Apr 2004 23:39:57 -0000 1.5 --- KeyStoreDialog.java 15 Apr 2004 15:34:41 -0000 1.6 *************** *** 33,36 **** --- 33,40 ---- $Id$ $Log$ + Revision 1.6 2004/04/15 15:34:41 pelle + Got rid of the looping InvalidPassphraseException in DefaultSigner. + Added initial focus for all dialogs. + Revision 1.5 2004/04/14 23:39:57 pelle Fixed a few things in the ServletSignerFactory *************** *** 311,317 **** else message.clear(); - passphrase.requestFocus(); frame.pack(); frame.show(); sign.setEnabled(false); } --- 315,322 ---- else message.clear(); frame.pack(); frame.show(); + frame.toFront(); + passphrase.requestFocus(); sign.setEnabled(false); } Index: SwingAgent.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/SwingAgent.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SwingAgent.java 14 Apr 2004 00:10:52 -0000 1.7 --- SwingAgent.java 15 Apr 2004 15:34:41 -0000 1.8 *************** *** 3,11 **** import com.jgoodies.plaf.Options; import org.neuclear.commons.crypto.Base64; import org.neuclear.commons.crypto.passphraseagents.InteractiveAgent; import org.neuclear.commons.crypto.passphraseagents.UserCancellationException; import org.neuclear.commons.crypto.signers.BrowsableSigner; import org.neuclear.commons.crypto.signers.DefaultSigner; - import org.neuclear.commons.crypto.signers.InvalidPassphraseException; import org.neuclear.commons.crypto.signers.SetPublicKeyCallBack; --- 3,11 ---- import com.jgoodies.plaf.Options; import org.neuclear.commons.crypto.Base64; + import org.neuclear.commons.crypto.CryptoTools; import org.neuclear.commons.crypto.passphraseagents.InteractiveAgent; import org.neuclear.commons.crypto.passphraseagents.UserCancellationException; import org.neuclear.commons.crypto.signers.BrowsableSigner; import org.neuclear.commons.crypto.signers.DefaultSigner; import org.neuclear.commons.crypto.signers.SetPublicKeyCallBack; *************** *** 17,20 **** --- 17,24 ---- $Id$ $Log$ + Revision 1.8 2004/04/15 15:34:41 pelle + Got rid of the looping InvalidPassphraseException in DefaultSigner. + Added initial focus for all dialogs. + Revision 1.7 2004/04/14 00:10:52 pelle Added a MessageLabel for handling errors, validation and info *************** *** 77,102 **** final InteractiveAgent dia = new SwingAgent(); try { ! try { // System.out.println(dia.getPassPhrase("test")); ! final BrowsableSigner signer = new DefaultSigner(dia); ! while (true) { ! byte sig[] = signer.sign("testdata".getBytes(), new SetPublicKeyCallBack() { ! public void setPublicKey(PublicKey pub) { ! System.out.println("PublicKey:"); ! System.out.println(pub); ! } ! }); ! System.out.println(Base64.encode(sig)); ! } // System.out.println("Getting passphrase... " + new String(dia.getPassPhrase((BrowsableSigner) signer))); // System.out.println("Getting passphrase... " + new String(dia.getPassPhrase("neu://pelle@test", true))); ! } catch (UserCancellationException e) { ! System.out.print("User Cancellation by: " + e.getName()); ! } ! ! } catch (InvalidPassphraseException e) { ! e.printStackTrace(); } System.exit(0); } --- 81,103 ---- final InteractiveAgent dia = new SwingAgent(); try { ! CryptoTools.ensureProvider(); // System.out.println(dia.getPassPhrase("test")); ! final BrowsableSigner signer = new DefaultSigner(dia); ! while (true) { ! byte sig[] = signer.sign("testdata".getBytes(), new SetPublicKeyCallBack() { ! public void setPublicKey(PublicKey pub) { ! System.out.println("PublicKey:"); ! System.out.println(pub); ! } ! }); ! System.out.println(Base64.encode(sig)); ! } // System.out.println("Getting passphrase... " + new String(dia.getPassPhrase((BrowsableSigner) signer))); // System.out.println("Getting passphrase... " + new String(dia.getPassPhrase("neu://pelle@test", true))); ! } catch (UserCancellationException e) { ! System.out.print("User Cancellation by: " + e.getName()); } + System.exit(0); } Index: NewPassphraseDialog.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/NewPassphraseDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NewPassphraseDialog.java 14 Apr 2004 00:10:51 -0000 1.1 --- NewPassphraseDialog.java 15 Apr 2004 15:34:41 -0000 1.2 *************** *** 18,21 **** --- 18,25 ---- $Id$ $Log$ + Revision 1.2 2004/04/15 15:34:41 pelle + Got rid of the looping InvalidPassphraseException in DefaultSigner. + Added initial focus for all dialogs. + Revision 1.1 2004/04/14 00:10:51 pelle Added a MessageLabel for handling errors, validation and info *************** *** 181,184 **** --- 185,189 ---- runner = this; ok.setEnabled(false); + passphrase.requestFocus(); alias.setText(req); dialog.pack(); Index: SimpleDialog.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/SimpleDialog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SimpleDialog.java 14 Apr 2004 00:10:52 -0000 1.4 --- SimpleDialog.java 15 Apr 2004 15:34:41 -0000 1.5 *************** *** 18,21 **** --- 18,25 ---- $Id$ $Log$ + Revision 1.5 2004/04/15 15:34:41 pelle + Got rid of the looping InvalidPassphraseException in DefaultSigner. + Added initial focus for all dialogs. + Revision 1.4 2004/04/14 00:10:52 pelle Added a MessageLabel for handling errors, validation and info *************** *** 171,174 **** --- 175,179 ---- dialog.pack(); dialog.show(); + passphrase.requestFocus(); System.out.println(Thread.currentThread()); Index: NewAliasDialog.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/NewAliasDialog.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NewAliasDialog.java 14 Apr 2004 00:10:51 -0000 1.5 --- NewAliasDialog.java 15 Apr 2004 15:34:41 -0000 1.6 *************** *** 17,20 **** --- 17,24 ---- $Id$ $Log$ + Revision 1.6 2004/04/15 15:34:41 pelle + Got rid of the looping InvalidPassphraseException in DefaultSigner. + Added initial focus for all dialogs. + Revision 1.5 2004/04/14 00:10:51 pelle Added a MessageLabel for handling errors, validation and info *************** *** 228,231 **** --- 232,236 ---- passphrase2.setEnabled(true); setMainPanel(); + alias.requestFocus(); } |