AlgorithmParameterGenerator.java, [...]: Import cleanup.

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

	* java/security/AlgorithmParameterGenerator.java,
	java/security/AlgorithmParameters.java,
	java/security/AlgorithmParametersSpi.java,
	java/security/AllPermission.java,
	java/security/BasicPermission.java,
	java/security/Certificate.java,
	java/security/CodeSource.java,
	java/security/DigestInputStream.java,
	java/security/DigestOutputStream.java,
	java/security/GuardedObject.java,
	java/security/KeyFactory.java,
	java/security/KeyFactorySpi.java,
	java/security/KeyPairGenerator.java,
	java/security/KeyStore.java,
	java/security/KeyStoreSpi.java,
	java/security/Permissions.java,
	java/security/Security.java,
	java/security/Signature.java,
	java/security/UnresolvedPermission.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/X509CRLSelector.java,
	java/security/cert/X509CertSelector.java:
	Import cleanup.

From-SVN: r89397

10 files changed, 37 insertions, 46 deletions

diff --git a/libjava/java/security/cert/CertPathBuilder.java b/libjava/java/security/cert/CertPathBuilder.java
index c7cef43..86808f4 100644
--- a/libjava/java/security/cert/CertPathBuilder.java
+++ b/libjava/java/security/cert/CertPathBuilder.java
@@ -1,5 +1,5 @@
 /* CertPathBuilder.java -- bulids CertPath objects from Certificates.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.java.security.Engine;
+
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.Provider;
 import java.security.Security;
 
-import gnu.java.security.Engine;
-
 /**
  * This class builds certificate paths (also called certificate chains),
  * which can be used to establish trust for a particular certificate by
diff --git a/libjava/java/security/cert/CertPathValidator.java b/libjava/java/security/cert/CertPathValidator.java
index 2ccce72..b8e4022 100644
--- a/libjava/java/security/cert/CertPathValidator.java
+++ b/libjava/java/security/cert/CertPathValidator.java
@@ -1,5 +1,5 @@
 /* CertPathValidator -- validates certificate paths.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.java.security.Engine;
+
 import java.security.AccessController;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
@@ -46,8 +48,6 @@ import java.security.PrivilegedAction;
 import java.security.Provider;
 import java.security.Security;
 
-import gnu.java.security.Engine;
-
 /**
  * Generic interface to classes that validate certificate paths.
  *
diff --git a/libjava/java/security/cert/CertStore.java b/libjava/java/security/cert/CertStore.java
index 84e2350..67e606c 100644
--- a/libjava/java/security/cert/CertStore.java
+++ b/libjava/java/security/cert/CertStore.java
@@ -1,5 +1,5 @@
 /* CertStore -- stores and retrieves certificates.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,17 +38,16 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.java.security.Engine;
+
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.PrivilegedAction;
 import java.security.Provider;
 import java.security.Security;
-
 import java.util.Collection;
 
-import gnu.java.security.Engine;
-
 /**
  * A CertStore is a read-only repository for certificates and
  * certificate revocation lists.
diff --git a/libjava/java/security/cert/Certificate.java b/libjava/java/security/cert/Certificate.java
index 72842fc..a9079fb 100644
--- a/libjava/java/security/cert/Certificate.java
+++ b/libjava/java/security/cert/Certificate.java
@@ -1,5 +1,5 @@
 /* Certificate.java --- Certificate class
-   Copyright (C) 1999,2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package java.security.cert;
 
-import java.security.PublicKey;
-import java.security.NoSuchAlgorithmException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchProviderException;
-import java.security.SignatureException;
 import java.io.ByteArrayInputStream;
 import java.io.InvalidObjectException;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.PublicKey;
+import java.security.SignatureException;
 
 /**
  * The Certificate class is an abstract class used to manage 
diff --git a/libjava/java/security/cert/CertificateFactory.java b/libjava/java/security/cert/CertificateFactory.java
index 92736e3..3166440 100644
--- a/libjava/java/security/cert/CertificateFactory.java
+++ b/libjava/java/security/cert/CertificateFactory.java
@@ -1,5 +1,5 @@
 /* CertificateFactory.java -- Certificate Factory Class
-   Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,19 +38,17 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.java.security.Engine;
+
+import java.io.InputStream;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.Provider;
 import java.security.Security;
-
-import java.io.InputStream;
-
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import gnu.java.security.Engine;
-
 /**
  * This class implements the CertificateFactory class interface used to
  * generate certificates, certificate revocation lists (CRLs), and certificate
diff --git a/libjava/java/security/cert/PolicyQualifierInfo.java b/libjava/java/security/cert/PolicyQualifierInfo.java
index ab83901..c53a325 100644
--- a/libjava/java/security/cert/PolicyQualifierInfo.java
+++ b/libjava/java/security/cert/PolicyQualifierInfo.java
@@ -1,5 +1,5 @@
 /* PolicyQualifierInfo.java -- policy qualifier info object.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package java.security.cert;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
 import gnu.java.io.ASN1ParsingException;
 import gnu.java.security.OID;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
 /**
  * The PolicyQualifierInfo X.509 certificate extension.
  * PolicyQualifierInfo objects are represented by the ASN.1 structure:
diff --git a/libjava/java/security/cert/TrustAnchor.java b/libjava/java/security/cert/TrustAnchor.java
index 3bb6ede..4758cf7 100644
--- a/libjava/java/security/cert/TrustAnchor.java
+++ b/libjava/java/security/cert/TrustAnchor.java
@@ -1,5 +1,5 @@
 /* TrustAnchor.java -- an ultimately-trusted certificate.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,10 +38,10 @@ exception statement from your version. */
 
 package java.security.cert;
 
-import java.security.PublicKey;
-
 import gnu.java.security.x509.X500DistinguishedName;
 
+import java.security.PublicKey;
+
 /**
  * An ultimately-trusted certificate to serve as the root of a
  * certificate chain.
diff --git a/libjava/java/security/cert/X509CRL.java b/libjava/java/security/cert/X509CRL.java
index 74f090c..a606253 100644
--- a/libjava/java/security/cert/X509CRL.java
+++ b/libjava/java/security/cert/X509CRL.java
@@ -1,5 +1,5 @@
 /* X509CRL.java --- X.509 Certificate Revocation List
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,11 +39,11 @@ exception statement from your version. */
 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.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.Principal;
+import java.security.PublicKey;
 import java.security.SignatureException;
 import java.util.Date;
 import java.util.Set;
diff --git a/libjava/java/security/cert/X509CRLSelector.java b/libjava/java/security/cert/X509CRLSelector.java
index a59791e..7ff8700 100644
--- a/libjava/java/security/cert/X509CRLSelector.java
+++ b/libjava/java/security/cert/X509CRLSelector.java
@@ -38,13 +38,14 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.java.security.action.GetPropertyAction;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+
 import java.io.IOException;
 import java.io.InputStream;
-
 import java.math.BigInteger;
-
 import java.security.AccessController;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -55,10 +56,6 @@ import java.util.List;
 
 import javax.security.auth.x500.X500Principal;
 
-import gnu.java.security.action.GetPropertyAction;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
-
 /**
  * A class for matching X.509 certificate revocation lists by criteria.
  *
diff --git a/libjava/java/security/cert/X509CertSelector.java b/libjava/java/security/cert/X509CertSelector.java
index c7914c1..0463142 100644
--- a/libjava/java/security/cert/X509CertSelector.java
+++ b/libjava/java/security/cert/X509CertSelector.java
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package java.security.cert;
 
-import java.io.IOException;
+import gnu.java.security.OID;
+import gnu.java.security.action.GetPropertyAction;
 
+import java.io.IOException;
 import java.math.BigInteger;
-
 import java.security.AccessController;
 import java.security.KeyFactory;
 import java.security.PublicKey;
 import java.security.spec.X509EncodedKeySpec;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -60,9 +60,6 @@ import java.util.Set;
 
 import javax.security.auth.x500.X500Principal;
 
-import gnu.java.security.OID;
-import gnu.java.security.action.GetPropertyAction;
-
 /**
  * A concrete implementation of {@link CertSelector} for X.509 certificates,
  * which allows a number of criteria to be set when accepting certificates,