Cleanup imports

Automated changes done by Eclipse
Minor tweak to one file where Eclipse was tring to find an import for Any
Due to finding it in an annotated comment.

https://bugzilla.redhat.com/show_bug.cgi?id=728303

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2292 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

15 files changed, 68 insertions, 70 deletions

diff --git a/pki/base/util/src/netscape/security/provider/CMS.java b/pki/base/util/src/netscape/security/provider/CMS.java
index 62f0e139..63a776b0 100644
--- a/pki/base/util/src/netscape/security/provider/CMS.java
+++ b/pki/base/util/src/netscape/security/provider/CMS.java
@@ -17,9 +17,8 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.io.*;
-import java.util.*;
-import java.security.*;
+import java.security.AccessController;
+import java.security.Provider;
 /**
  * The CMS Security Provider.
  */
diff --git a/pki/base/util/src/netscape/security/provider/DSA.java b/pki/base/util/src/netscape/security/provider/DSA.java
index 507627e1..a40bd029 100644
--- a/pki/base/util/src/netscape/security/provider/DSA.java
+++ b/pki/base/util/src/netscape/security/provider/DSA.java
@@ -17,8 +17,8 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.PrintStream;
 import java.math.BigInteger;
 import java.security.AlgorithmParameters;
 import java.security.InvalidAlgorithmParameterException;
@@ -26,20 +26,19 @@ import java.security.InvalidKeyException;
 import java.security.InvalidParameterException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
 import java.security.PrivateKey;
+import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Signature;
 import java.security.SignatureException;
-import java.security.interfaces.*;
+import java.security.interfaces.DSAParams;
 import java.security.spec.DSAParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 
 import netscape.security.util.BigInt;
-import netscape.security.util.DerValue;
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
-import netscape.security.x509.AlgIdDSA;
+import netscape.security.util.DerValue;
 
 /**
  * The Digital Signature Standard (using the Digital Signature
diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java b/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java
index e97544a4..f2292e34 100755
--- a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java
+++ b/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java
@@ -17,20 +17,18 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.util.*;
-import java.lang.*;
+import java.security.InvalidKeyException;
 import java.security.Key;
-import java.security.PublicKey;
-import java.security.PrivateKey;
 import java.security.KeyFactorySpi;
-import java.security.InvalidKeyException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
 import java.security.interfaces.DSAParams;
-import java.security.spec.DSAPublicKeySpec;
 import java.security.spec.DSAPrivateKeySpec;
-import java.security.spec.KeySpec;
+import java.security.spec.DSAPublicKeySpec;
 import java.security.spec.InvalidKeySpecException;
-import java.security.spec.X509EncodedKeySpec;
+import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
 
 /**
  * This class implements the DSA key factory of the Sun provider.
diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
index be5b4428..4b781fa1 100644
--- a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
+++ b/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
@@ -17,23 +17,22 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.util.Hashtable;
 import java.math.BigInteger;
-import java.security.AlgorithmParameters;
 import java.security.AlgorithmParameterGenerator;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.InvalidParameterException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
 import java.security.ProviderException;
 import java.security.SecureRandom;
 import java.security.interfaces.DSAParams;
 import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.DSAParameterSpec;
+import java.security.spec.InvalidParameterSpecException;
+import java.util.Hashtable;
 
 import netscape.security.x509.AlgIdDSA;
 
diff --git a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java b/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java
index 949e9ea6..cec2b97b 100755
--- a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java
+++ b/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java
@@ -21,13 +21,13 @@ import java.math.BigInteger;
 import java.security.AlgorithmParameterGeneratorSpi;
 import java.security.AlgorithmParameters;
 import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
-import java.security.InvalidParameterException;
 import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.DSAParameterSpec;
+import java.security.spec.InvalidParameterSpecException;
 
 /*
  * This class generates parameters for the DSA algorithm. It uses a default
diff --git a/pki/base/util/src/netscape/security/provider/DSAParameters.java b/pki/base/util/src/netscape/security/provider/DSAParameters.java
index 4edf8849..70b7fa08 100755
--- a/pki/base/util/src/netscape/security/provider/DSAParameters.java
+++ b/pki/base/util/src/netscape/security/provider/DSAParameters.java
@@ -17,17 +17,16 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
 import java.math.BigInteger;
 import java.security.AlgorithmParametersSpi;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.DSAParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 
-import netscape.security.util.DerValue;
-import netscape.security.util.DerOutputStream;
 import netscape.security.util.BigInt;
+import netscape.security.util.DerOutputStream;
+import netscape.security.util.DerValue;
 
 /**
  * This class implements the parameter set used by the
diff --git a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java b/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java
index ab60554e..f480ea08 100644
--- a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java
+++ b/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java
@@ -17,22 +17,19 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
 import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.ProviderException;
 import java.security.AlgorithmParameters;
+import java.security.InvalidKeyException;
+import java.security.interfaces.DSAParams;
 import java.security.spec.DSAParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
-import java.security.interfaces.DSAParams;
 
-import netscape.security.x509.AlgIdDSA;
 import netscape.security.pkcs.PKCS8Key;
-import netscape.security.util.BigInt;
-import netscape.security.util.DerValue;
 import netscape.security.util.DerInputStream;
-import netscape.security.util.DerOutputStream;
+import netscape.security.util.DerValue;
+import netscape.security.x509.AlgIdDSA;
 
 /**
  * A PKCS#8 private key for the Digital Signature Algorithm.
diff --git a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java b/pki/base/util/src/netscape/security/provider/DSAPublicKey.java
index 9ebdc0dc..c3a6896c 100644
--- a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java
+++ b/pki/base/util/src/netscape/security/provider/DSAPublicKey.java
@@ -17,22 +17,20 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
 import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.ProviderException;
 import java.security.AlgorithmParameters;
+import java.security.InvalidKeyException;
+import java.security.interfaces.DSAParams;
 import java.security.spec.DSAParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
-import java.security.interfaces.DSAParams;
 
-import netscape.security.x509.X509Key;
-import netscape.security.x509.AlgIdDSA;
 import netscape.security.util.BigInt;
-import netscape.security.util.DerValue;
 import netscape.security.util.DerInputStream;
-import netscape.security.util.DerOutputStream;
+import netscape.security.util.DerValue;
+import netscape.security.x509.AlgIdDSA;
+import netscape.security.x509.X509Key;
 
 /**
  * An X.509 public key for the Digital Signature Algorithm.
diff --git a/pki/base/util/src/netscape/security/provider/MD5.java b/pki/base/util/src/netscape/security/provider/MD5.java
index 97bbac20..a3c12490 100644
--- a/pki/base/util/src/netscape/security/provider/MD5.java
+++ b/pki/base/util/src/netscape/security/provider/MD5.java
@@ -17,9 +17,8 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.util.*;
-import java.lang.*;
-import java.security.*;
+import java.security.DigestException;
+import java.security.MessageDigestSpi;
 
 /**
  * The MD5 class is used to compute an MD5 message digest over a given
diff --git a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java b/pki/base/util/src/netscape/security/provider/RSAPublicKey.java
index 83dbc7f3..6206b699 100644
--- a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java
+++ b/pki/base/util/src/netscape/security/provider/RSAPublicKey.java
@@ -17,18 +17,17 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
 import java.security.InvalidKeyException;
-import java.security.ProviderException;
-import netscape.security.x509.AlgorithmId;
-import netscape.security.util.BigInt;
 
-import netscape.security.x509.X509Key;
-import netscape.security.util.ObjectIdentifier;
-import netscape.security.util.DerValue;
+import netscape.security.util.BigInt;
 import netscape.security.util.DerInputStream;
 import netscape.security.util.DerOutputStream;
+import netscape.security.util.DerValue;
+import netscape.security.util.ObjectIdentifier;
+import netscape.security.x509.AlgorithmId;
+import netscape.security.x509.X509Key;
 
 /**
  * An X.509 public key for the RSA Algorithm.
diff --git a/pki/base/util/src/netscape/security/provider/SHA.java b/pki/base/util/src/netscape/security/provider/SHA.java
index 09fdf2df..2e5ac328 100644
--- a/pki/base/util/src/netscape/security/provider/SHA.java
+++ b/pki/base/util/src/netscape/security/provider/SHA.java
@@ -17,7 +17,8 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.security.*;
+import java.security.DigestException;
+import java.security.MessageDigestSpi;
 
 /**
  * This class implements the Secure Hash Algorithm (SHA) developed by
diff --git a/pki/base/util/src/netscape/security/provider/Sun.java b/pki/base/util/src/netscape/security/provider/Sun.java
index 20e295ca..2ba6be90 100644
--- a/pki/base/util/src/netscape/security/provider/Sun.java
+++ b/pki/base/util/src/netscape/security/provider/Sun.java
@@ -17,9 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.io.*;
-import java.util.*;
-import java.security.*;
+import java.security.Provider;
 
 /**
  * The SUN Security Provider.
diff --git a/pki/base/util/src/netscape/security/provider/SystemIdentity.java b/pki/base/util/src/netscape/security/provider/SystemIdentity.java
index ec06810f..e9fadf26 100644
--- a/pki/base/util/src/netscape/security/provider/SystemIdentity.java
+++ b/pki/base/util/src/netscape/security/provider/SystemIdentity.java
@@ -18,8 +18,12 @@
 package netscape.security.provider;
 
 import java.io.Serializable;
-import java.util.Enumeration;
-import java.security.*;
+import java.security.Certificate;
+import java.security.Identity;
+import java.security.IdentityScope;
+import java.security.InvalidParameterException;
+import java.security.KeyManagementException;
+import java.security.PublicKey;
 
 /**
  * An identity.
diff --git a/pki/base/util/src/netscape/security/provider/SystemSigner.java b/pki/base/util/src/netscape/security/provider/SystemSigner.java
index ffce2401..3b5be37e 100644
--- a/pki/base/util/src/netscape/security/provider/SystemSigner.java
+++ b/pki/base/util/src/netscape/security/provider/SystemSigner.java
@@ -17,8 +17,14 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.util.*;
-import java.security.*;
+import java.security.Certificate;
+import java.security.IdentityScope;
+import java.security.InvalidParameterException;
+import java.security.KeyException;
+import java.security.KeyManagementException;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.Signer;
 
 /**
  * SunSecurity signer.
diff --git a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java
index 6fa19fa5..22d25329 100644
--- a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java
+++ b/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java
@@ -17,14 +17,16 @@
 // --- END COPYRIGHT BLOCK ---
 package netscape.security.provider;
 
-import java.security.cert.*;
 import java.io.InputStream;
+import java.security.cert.CRL;
+import java.security.cert.CRLException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactorySpi;
 import java.util.Collection;
-import java.security.Provider;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import netscape.security.x509.X509CertImpl;
+
 import netscape.security.x509.X509CRLImpl;
+import netscape.security.x509.X509CertImpl;
 import netscape.security.x509.X509ExtensionException;
 
 public class X509CertificateFactory  extends CertificateFactorySpi {