AlgorithmParameterGenerator.java, [...]: Import statements reorganized...

2004-10-20  Michael Koch  <konqueror@gmx.de>

	* java/security/AlgorithmParameterGenerator.java,
	java/security/AlgorithmParameters.java,
	java/security/DigestInputStream.java,
	java/security/Identity.java,
	java/security/KeyFactory.java,
	java/security/KeyPairGenerator.java,
	java/security/KeyStore.java,
	java/security/MessageDigest.java,
	java/security/MessageDigestSpi.java,
	java/security/Policy.java,
	java/security/SecureRandom.java,
	java/security/Security.java,
	java/security/Signature.java,
	java/security/SignatureSpi.java,
	java/security/cert/CertPathBuilder.java,
	java/security/cert/CertPathValidator.java,
	java/security/cert/CertStore.java,
	java/security/cert/Certificate.java,
	java/security/cert/CertificateFactory.java,
	java/security/cert/PolicyQualifierInfo.java,
	java/security/cert/TrustAnchor.java,
	java/security/cert/X509CRL.java,
	java/security/cert/X509CRLEntry.java,
	java/security/cert/X509Certificate.java,
	java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java:
	Import statements reorganized, some little formatting issues,
	used java-style array declarations, added comments in empty catch
	blocks.

From-SVN: r89319

10 files changed, 16 insertions, 23 deletions

diff --git a/libjava/java/security/cert/CertPathBuilder.java b/libjava/java/security/cert/CertPathBuilder.java
index af93536..c7cef43 100644
--- a/libjava/java/security/cert/CertPathBuilder.java
+++ b/libjava/java/security/cert/CertPathBuilder.java
@@ -130,8 +130,9 @@ public class CertPathBuilder
           {
             return getInstance(algorithm, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored)
+        catch (NoSuchAlgorithmException e)
           {
+	    // Ignored.
           }
       }
 
diff --git a/libjava/java/security/cert/CertPathValidator.java b/libjava/java/security/cert/CertPathValidator.java
index 4c1262d..2ccce72 100644
--- a/libjava/java/security/cert/CertPathValidator.java
+++ b/libjava/java/security/cert/CertPathValidator.java
@@ -142,8 +142,9 @@ public class CertPathValidator {
           {
             return getInstance(algorithm, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored)
+        catch (NoSuchAlgorithmException e)
           {
+	    // Ignored.
           }
       }
     throw new NoSuchAlgorithmException(algorithm);
diff --git a/libjava/java/security/cert/CertStore.java b/libjava/java/security/cert/CertStore.java
index 55326a4..84e2350 100644
--- a/libjava/java/security/cert/CertStore.java
+++ b/libjava/java/security/cert/CertStore.java
@@ -146,8 +146,9 @@ public class CertStore
           {
             return getInstance(type, params, p[i]);
           }
-        catch (NoSuchAlgorithmException ignored)
+        catch (NoSuchAlgorithmException e)
           {
+	    // Ignored.
           }
       }
 
diff --git a/libjava/java/security/cert/Certificate.java b/libjava/java/security/cert/Certificate.java
index f4aff41..72842fc 100644
--- a/libjava/java/security/cert/Certificate.java
+++ b/libjava/java/security/cert/Certificate.java
@@ -43,7 +43,6 @@ import java.security.NoSuchAlgorithmException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchProviderException;
 import java.security.SignatureException;
-import java.io.ObjectInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.InvalidObjectException;
 import java.io.ObjectStreamException;
@@ -116,8 +115,8 @@ public abstract class Certificate implements Serializable
 	if( getEncoded().length != x.getEncoded().length )
 	  return false;
 
-	byte b1[] = getEncoded();
-	byte b2[] = x.getEncoded();
+	byte[] b1 = getEncoded();
+	byte[] b2 = x.getEncoded();
 
 	for( int i = 0; i < b1.length; i++ )
 	  if( b1[i] != b2[i] )
diff --git a/libjava/java/security/cert/CertificateFactory.java b/libjava/java/security/cert/CertificateFactory.java
index e606954..92736e3 100644
--- a/libjava/java/security/cert/CertificateFactory.java
+++ b/libjava/java/security/cert/CertificateFactory.java
@@ -110,8 +110,9 @@ public class CertificateFactory
           {
             return getInstance(type, p[i]);
           }
-        catch (CertificateException ignored)
+        catch (CertificateException e)
           {
+	    // Ignored.
           }
       }
 
diff --git a/libjava/java/security/cert/PolicyQualifierInfo.java b/libjava/java/security/cert/PolicyQualifierInfo.java
index 8dede47..ab83901 100644
--- a/libjava/java/security/cert/PolicyQualifierInfo.java
+++ b/libjava/java/security/cert/PolicyQualifierInfo.java
@@ -39,16 +39,12 @@ exception statement from your version. */
 package java.security.cert;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import gnu.java.io.ASN1ParsingException;
 import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DEREncodingException;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
-import gnu.java.security.der.DERWriter;
 
 /**
  * The PolicyQualifierInfo X.509 certificate extension.
diff --git a/libjava/java/security/cert/TrustAnchor.java b/libjava/java/security/cert/TrustAnchor.java
index ccd2a9f..3bb6ede 100644
--- a/libjava/java/security/cert/TrustAnchor.java
+++ b/libjava/java/security/cert/TrustAnchor.java
@@ -38,9 +38,6 @@ exception statement from your version. */
 
 package java.security.cert;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
 import java.security.PublicKey;
 
 import gnu.java.security.x509.X500DistinguishedName;
diff --git a/libjava/java/security/cert/X509CRL.java b/libjava/java/security/cert/X509CRL.java
index 6794ccb..74f090c 100644
--- a/libjava/java/security/cert/X509CRL.java
+++ b/libjava/java/security/cert/X509CRL.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 
 package java.security.cert;
+
 import java.math.BigInteger;
 import java.security.Principal;
 import java.security.PublicKey;
@@ -126,8 +127,8 @@ public abstract class X509CRL extends CRL implements X509Extension
 	if( getEncoded().length != x.getEncoded().length )
 	  return false;
 
-	byte b1[] = getEncoded();
-	byte b2[] = x.getEncoded();
+	byte[] b1 = getEncoded();
+	byte[] b2 = x.getEncoded();
 
 	for( int i = 0; i < b1.length; i++ )
 	  if( b1[i] != b2[i] )
diff --git a/libjava/java/security/cert/X509CRLEntry.java b/libjava/java/security/cert/X509CRLEntry.java
index f9e0424..99ff615 100644
--- a/libjava/java/security/cert/X509CRLEntry.java
+++ b/libjava/java/security/cert/X509CRLEntry.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 
 package java.security.cert;
+
 import java.math.BigInteger;
 import java.util.Date;
 
@@ -96,8 +97,8 @@ public abstract class X509CRLEntry implements X509Extension
 	if( getEncoded().length != xe.getEncoded().length )
 	  return false;
 
-	byte b1[] = getEncoded();
-	byte b2[] = xe.getEncoded();
+	byte[] b1 = getEncoded();
+	byte[] b2 = xe.getEncoded();
 
 	for( int i = 0; i < b1.length; i++ )
 	  if( b1[i] != b2[i] )
diff --git a/libjava/java/security/cert/X509Certificate.java b/libjava/java/security/cert/X509Certificate.java
index 413fea0..6b76484 100644
--- a/libjava/java/security/cert/X509Certificate.java
+++ b/libjava/java/security/cert/X509Certificate.java
@@ -40,11 +40,6 @@ package java.security.cert;
 
 import java.math.BigInteger;
 import java.security.Principal;
-import java.security.PublicKey;
-import java.security.NoSuchAlgorithmException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchProviderException;
-import java.security.SignatureException;
 import java.util.Date;
 
 /**