hello all,
the attached patch --already committed-- removes unused imports, fields and
methods from the keytool classes.
2006-07-29 Raif S. Naffah <[EMAIL PROTECTED]>
* tools/gnu/classpath/tools/keytool/Command.java: Removed unused import.
(getCallbackHandler): Fully qualify linked class in javadoc.
* tools/gnu/classpath/tools/keytool/GenKeyCmd.java (cmdOptionsParser):
Removed.
* tools/gnu/classpath/tools/keytool/ImportCmd.java (imported): Likewise.
* tools/gnu/classpath/tools/keytool/Main.java (printHelp): Likewise.
cheers;
rsn
Index: Main.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/Main.java,v
retrieving revision 1.4
diff -u -r1.4 Main.java
--- Main.java 12 Jun 2006 05:14:07 -0000 1.4
+++ Main.java 28 Jul 2006 19:42:47 -0000
@@ -296,14 +296,6 @@
log.exiting(this.getClass().getName(), "teardown"); //$NON-NLS-1$
}
- private void printHelp()
- {
- if (helpPrinted)
- return;
-
- helpPrinted = true;
- }
-
// Inner class(es)
// ==========================================================================
Index: ImportCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java,v
retrieving revision 1.7
diff -u -r1.7 ImportCmd.java
--- ImportCmd.java 16 Jul 2006 05:55:59 -0000 1.7
+++ ImportCmd.java 28 Jul 2006 19:44:20 -0000
@@ -207,7 +207,6 @@
protected String _ksPassword;
protected String _providerClassName;
private CertificateFactory x509Factory;
- private boolean imported;
/**
* Pathname to a GKR-type cacerts file to use when trustCACerts is true. This
* is usually a file named "cacerts.gkr" located in lib/security in the folder
Index: GenKeyCmd.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java,v
retrieving revision 1.6
diff -u -r1.6 GenKeyCmd.java
--- GenKeyCmd.java 16 Jul 2006 05:55:59 -0000 1.6
+++ GenKeyCmd.java 28 Jul 2006 19:45:17 -0000
@@ -217,7 +217,6 @@
protected String _providerClassName;
private int keySize;
private X500DistinguishedName distinguishedName;
- private Parser cmdOptionsParser;
// default 0-arguments constructor
Index: Command.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/keytool/Command.java,v
retrieving revision 1.8
diff -u -r1.8 Command.java
--- Command.java 16 Jul 2006 16:35:44 -0000 1.8
+++ Command.java 28 Jul 2006 19:46:27 -0000
@@ -56,7 +56,6 @@
import gnu.java.security.hash.Sha160;
import gnu.java.security.util.Util;
import gnu.java.security.x509.X500DistinguishedName;
-import gnu.javax.security.auth.callback.ConsoleCallbackHandler;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -1203,7 +1202,8 @@
* <p>
* If no installed providers were found, this method falls back on the GNU
* provider, by-passing the Security search mechanism. The default console
- * callback handler implementation is [EMAIL PROTECTED] ConsoleCallbackHandler}.
+ * callback handler implementation is
+ * [EMAIL PROTECTED] gnu.javax.security.auth.callback.ConsoleCallbackHandler}.
*
* @return a console-based [EMAIL PROTECTED] CallbackHandler}.
*/
