Buffers.java, [...]: Reorganized import statements.

2005-04-18  Michael Koch  <konqueror@gmx.de>

	* gnu/java/awt/Buffers.java,
	gnu/java/awt/image/ImageDecoder.java,
	gnu/java/awt/image/XBMDecoder.java,
	gnu/java/awt/peer/ClasspathFontPeer.java,
	gnu/java/net/CRLFInputStream.java,
	gnu/java/net/EmptyX509TrustManager.java,
	gnu/java/net/LineInputStream.java,
	gnu/java/net/protocol/ftp/ActiveModeDTP.java,
	gnu/java/net/protocol/ftp/BlockInputStream.java,
	gnu/java/net/protocol/ftp/CompressedInputStream.java,
	gnu/java/net/protocol/ftp/DTP.java,
	gnu/java/net/protocol/ftp/DTPInputStream.java,
	gnu/java/net/protocol/ftp/FTPConnection.java,
	gnu/java/net/protocol/ftp/FTPURLConnection.java,
	gnu/java/net/protocol/ftp/PassiveModeDTP.java,
	gnu/java/net/protocol/ftp/StreamInputStream.java,
	gnu/java/net/protocol/http/ChunkedInputStream.java,
	gnu/java/net/protocol/http/HTTPConnection.java,
	gnu/java/net/protocol/http/HTTPURLConnection.java,
	gnu/java/net/protocol/http/Headers.java,
	gnu/java/net/protocol/http/Request.java,
	gnu/java/nio/ChannelInputStream.java,
	gnu/java/nio/ChannelOutputStream.java,
	gnu/java/nio/InputStreamChannel.java,
	gnu/java/nio/OutputStreamChannel.java,
	gnu/java/nio/SelectorProviderImpl.java,
	gnu/java/rmi/RMIMarshalledObjectInputStream.java,
	gnu/java/rmi/RMIMarshalledObjectOutputStream.java,
	gnu/java/rmi/dgc/DGCImpl.java,
	gnu/java/rmi/registry/RegistryImpl.java,
	gnu/java/rmi/server/ProtocolConstants.java,
	gnu/java/rmi/server/RMIDefaultSocketFactory.java,
	gnu/java/rmi/server/RMIIncomingThread.java,
	gnu/java/rmi/server/RMIObjectInputStream.java,
	gnu/java/rmi/server/RMIObjectOutputStream.java,
	gnu/java/rmi/server/RMIVoidValue.java,
	gnu/java/rmi/server/UnicastConnectionManager.java,
	gnu/java/rmi/server/UnicastRef.java,
	gnu/java/rmi/server/UnicastRemoteCall.java,
	gnu/java/rmi/server/UnicastRemoteStub.java,
	gnu/java/rmi/server/UnicastServerRef.java,
	gnu/java/security/OID.java,
	gnu/java/security/der/DERReader.java,
	gnu/java/security/provider/CollectionCertStoreImpl.java,
	gnu/java/security/provider/DSAParameterGenerator.java,
	gnu/java/security/provider/DefaultPolicy.java,
	gnu/java/security/provider/EncodedKeyFactory.java,
	gnu/java/security/provider/GnuDHPublicKey.java,
	gnu/java/security/provider/GnuDSAPrivateKey.java,
	gnu/java/security/provider/GnuDSAPublicKey.java,
	gnu/java/security/provider/GnuRSAPrivateKey.java,
	gnu/java/security/provider/GnuRSAPublicKey.java,
	gnu/java/security/provider/PKIXCertPathValidatorImpl.java,
	gnu/java/security/provider/RSA.java,
	gnu/java/security/provider/SHA1PRNG.java,
	gnu/java/security/provider/SHA1withRSA.java,
	gnu/java/security/provider/X509CertificateFactory.java,
	gnu/java/security/x509/GnuPKIExtension.java,
	gnu/java/security/x509/X500DistinguishedName.java,
	gnu/java/security/x509/X509CRL.java,
	gnu/java/security/x509/X509CRLEntry.java,
	gnu/java/security/x509/X509CertPath.java,
	gnu/java/security/x509/X509CertSelectorImpl.java,
	gnu/java/security/x509/X509Certificate.java,
	gnu/java/security/x509/ext/AuthorityKeyIdentifier.java,
	gnu/java/security/x509/ext/BasicConstraints.java,
	gnu/java/security/x509/ext/CRLNumber.java,
	gnu/java/security/x509/ext/CertificatePolicies.java,
	gnu/java/security/x509/ext/ExtendedKeyUsage.java,
	gnu/java/security/x509/ext/Extension.java,
	gnu/java/security/x509/ext/GeneralNames.java,
	gnu/java/security/x509/ext/IssuerAlternativeNames.java,
	gnu/java/security/x509/ext/KeyUsage.java,
	gnu/java/security/x509/ext/PolicyConstraint.java,
	gnu/java/security/x509/ext/PolicyMappings.java,
	gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java,
	gnu/java/security/x509/ext/ReasonCode.java,
	gnu/java/security/x509/ext/SubjectAlternativeNames.java,
	gnu/java/security/x509/ext/SubjectKeyIdentifier.java:
	Reorganized import statements.

From-SVN: r98339

38 files changed, 153 insertions, 179 deletions

diff --git a/libjava/gnu/java/security/OID.java b/libjava/gnu/java/security/OID.java
index 0b935c4..9184351 100644
--- a/libjava/gnu/java/security/OID.java
+++ b/libjava/gnu/java/security/OID.java
@@ -41,8 +41,8 @@ package gnu.java.security;
 import gnu.java.security.der.DEREncodingException;
 
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.StringTokenizer;
 
 /**
diff --git a/libjava/gnu/java/security/der/DERReader.java b/libjava/gnu/java/security/der/DERReader.java
index 688b509..aab3a2f 100644
--- a/libjava/gnu/java/security/der/DERReader.java
+++ b/libjava/gnu/java/security/der/DERReader.java
@@ -38,21 +38,19 @@ exception statement from your version. */
 
 package gnu.java.security.der;
 
+import gnu.java.security.OID;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
-import java.io.InputStream;
 import java.io.IOException;
-
+import java.io.InputStream;
 import java.math.BigInteger;
-
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-import gnu.java.security.OID;
-
 /**
  * This class decodes DER sequences into Java objects. The methods of
  * this class do not have knowledge of higher-levels of structure in the
diff --git a/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java b/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java
index 1b22cc8..b67a433 100644
--- a/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java
+++ b/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java
@@ -39,15 +39,14 @@ exception statement from your version. */
 package gnu.java.security.provider;
 
 import java.security.InvalidAlgorithmParameterException;
-import java.security.cert.Certificate;
-import java.security.cert.CertSelector;
 import java.security.cert.CRL;
 import java.security.cert.CRLSelector;
+import java.security.cert.CertSelector;
 import java.security.cert.CertStoreException;
 import java.security.cert.CertStoreParameters;
 import java.security.cert.CertStoreSpi;
+import java.security.cert.Certificate;
 import java.security.cert.CollectionCertStoreParameters;
-
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/libjava/gnu/java/security/provider/DSAParameterGenerator.java b/libjava/gnu/java/security/provider/DSAParameterGenerator.java
index f481f29..92032fa 100644
--- a/libjava/gnu/java/security/provider/DSAParameterGenerator.java
+++ b/libjava/gnu/java/security/provider/DSAParameterGenerator.java
@@ -38,9 +38,11 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
+import gnu.java.security.util.Prime;
+
 import java.math.BigInteger;
-import java.security.AlgorithmParameters;
 import java.security.AlgorithmParameterGeneratorSpi;
+import java.security.AlgorithmParameters;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -49,8 +51,6 @@ import java.security.spec.DSAParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.util.Random;
 
-import gnu.java.security.util.Prime;
-
 public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi
 {
   private int size;
diff --git a/libjava/gnu/java/security/provider/DefaultPolicy.java b/libjava/gnu/java/security/provider/DefaultPolicy.java
index f3385fa..f7ef782 100644
--- a/libjava/gnu/java/security/provider/DefaultPolicy.java
+++ b/libjava/gnu/java/security/provider/DefaultPolicy.java
@@ -1,4 +1,4 @@
-/* DefaultPolicy.java 
+/* DefaultPolicy.java --
    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,12 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
-import java.security.*;
+import java.security.AllPermission;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Policy;
 
 /** 
   * This is just a stub policy implementation which grants all permissions
diff --git a/libjava/gnu/java/security/provider/EncodedKeyFactory.java b/libjava/gnu/java/security/provider/EncodedKeyFactory.java
index 7dc5ee9..dd1a06a 100644
--- a/libjava/gnu/java/security/provider/EncodedKeyFactory.java
+++ b/libjava/gnu/java/security/provider/EncodedKeyFactory.java
@@ -44,9 +44,7 @@ import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
 import java.io.IOException;
-
 import java.math.BigInteger;
-
 import java.security.AlgorithmParameters;
 import java.security.InvalidKeyException;
 import java.security.Key;
@@ -54,10 +52,9 @@ import java.security.KeyFactorySpi;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-
 import java.security.spec.DSAParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.InvalidKeySpecException;
+import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.RSAPrivateCrtKeySpec;
diff --git a/libjava/gnu/java/security/provider/GnuDHPublicKey.java b/libjava/gnu/java/security/provider/GnuDHPublicKey.java
index fbf9d9f..d62fcc9 100644
--- a/libjava/gnu/java/security/provider/GnuDHPublicKey.java
+++ b/libjava/gnu/java/security/provider/GnuDHPublicKey.java
@@ -38,18 +38,17 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
-import java.math.BigInteger;
+import gnu.java.security.OID;
+import gnu.java.security.der.BitString;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERValue;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
 
 import javax.crypto.interfaces.DHPublicKey;
 import javax.crypto.spec.DHParameterSpec;
 
-import gnu.java.security.OID;
-import gnu.java.security.der.BitString;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERValue;
-
 public class GnuDHPublicKey implements DHPublicKey
 {
 
diff --git a/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java b/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java
index 72fe387..8cac9c3 100644
--- a/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java
+++ b/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java
@@ -45,13 +45,10 @@ import gnu.java.security.der.DERWriter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-
 import java.math.BigInteger;
-
-import java.security.interfaces.DSAPrivateKey;
 import java.security.interfaces.DSAParams;
+import java.security.interfaces.DSAPrivateKey;
 import java.security.spec.DSAParameterSpec;
-
 import java.util.ArrayList;
 
 public class GnuDSAPrivateKey implements DSAPrivateKey
diff --git a/libjava/gnu/java/security/provider/GnuDSAPublicKey.java b/libjava/gnu/java/security/provider/GnuDSAPublicKey.java
index 9ec827d..6f3a29d 100644
--- a/libjava/gnu/java/security/provider/GnuDSAPublicKey.java
+++ b/libjava/gnu/java/security/provider/GnuDSAPublicKey.java
@@ -46,13 +46,10 @@ import gnu.java.security.der.DERWriter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-
 import java.math.BigInteger;
-
-import java.security.interfaces.DSAPublicKey;
 import java.security.interfaces.DSAParams;
+import java.security.interfaces.DSAPublicKey;
 import java.security.spec.DSAParameterSpec;
-
 import java.util.ArrayList;
 
 public class GnuDSAPublicKey implements DSAPublicKey
diff --git a/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java b/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java
index 455326d..45a2125 100644
--- a/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java
+++ b/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java
@@ -38,17 +38,15 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
-import java.math.BigInteger;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERValue;
 
+import java.math.BigInteger;
 import java.security.interfaces.RSAPrivateCrtKey;
 import java.security.spec.RSAPrivateCrtKeySpec;
-
 import java.util.ArrayList;
 
-import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERValue;
-
 class GnuRSAPrivateKey implements RSAPrivateCrtKey
 {
 
diff --git a/libjava/gnu/java/security/provider/GnuRSAPublicKey.java b/libjava/gnu/java/security/provider/GnuRSAPublicKey.java
index 502fccc..0537744 100644
--- a/libjava/gnu/java/security/provider/GnuRSAPublicKey.java
+++ b/libjava/gnu/java/security/provider/GnuRSAPublicKey.java
@@ -38,16 +38,16 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
-import java.math.BigInteger;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.ArrayList;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERValue;
 
+import java.math.BigInteger;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.RSAPublicKeySpec;
+import java.util.ArrayList;
+
 class GnuRSAPublicKey implements RSAPublicKey
 {
 
diff --git a/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java b/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
index 7bba502..3e493ee 100644
--- a/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
+++ b/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
@@ -41,8 +41,8 @@ package gnu.java.security.provider;
 import gnu.java.security.OID;
 import gnu.java.security.x509.GnuPKIExtension;
 import gnu.java.security.x509.PolicyNodeImpl;
-import gnu.java.security.x509.X509CertSelectorImpl;
 import gnu.java.security.x509.X509CRLSelectorImpl;
+import gnu.java.security.x509.X509CertSelectorImpl;
 import gnu.java.security.x509.ext.BasicConstraints;
 import gnu.java.security.x509.ext.CertificatePolicies;
 import gnu.java.security.x509.ext.Extension;
@@ -50,12 +50,10 @@ import gnu.java.security.x509.ext.KeyUsage;
 import gnu.java.security.x509.ext.PolicyConstraint;
 
 import java.io.IOException;
-
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.PublicKey;
-
-import java.security.cert.CertificateException;
+import java.security.cert.CRL;
 import java.security.cert.CertPath;
 import java.security.cert.CertPathParameters;
 import java.security.cert.CertPathValidatorException;
@@ -63,16 +61,15 @@ import java.security.cert.CertPathValidatorResult;
 import java.security.cert.CertPathValidatorSpi;
 import java.security.cert.CertStore;
 import java.security.cert.CertStoreException;
-import java.security.cert.CRL;
+import java.security.cert.CertificateException;
 import java.security.cert.PKIXCertPathChecker;
 import java.security.cert.PKIXCertPathValidatorResult;
 import java.security.cert.PKIXParameters;
 import java.security.cert.TrustAnchor;
-import java.security.cert.X509Certificate;
 import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
 import java.security.interfaces.DSAParams;
 import java.security.interfaces.DSAPublicKey;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/libjava/gnu/java/security/provider/RSA.java b/libjava/gnu/java/security/provider/RSA.java
index 5afa8b7..4fd4633 100644
--- a/libjava/gnu/java/security/provider/RSA.java
+++ b/libjava/gnu/java/security/provider/RSA.java
@@ -38,11 +38,15 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.der.DERWriter;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-
 import java.math.BigInteger;
-
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.PrivateKey;
@@ -52,15 +56,8 @@ import java.security.SignatureException;
 import java.security.SignatureSpi;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
-
 import java.util.ArrayList;
 
-import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
-import gnu.java.security.der.DERWriter;
-
 public abstract class RSA extends SignatureSpi implements Cloneable
 {
 
diff --git a/libjava/gnu/java/security/provider/SHA1PRNG.java b/libjava/gnu/java/security/provider/SHA1PRNG.java
index 97a8b9e..058dc6d 100644
--- a/libjava/gnu/java/security/provider/SHA1PRNG.java
+++ b/libjava/gnu/java/security/provider/SHA1PRNG.java
@@ -38,11 +38,11 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
-import java.util.Random;
-import java.security.SecureRandomSpi;
+import java.io.Serializable;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.io.Serializable;
+import java.security.SecureRandomSpi;
+import java.util.Random;
 
 public class SHA1PRNG extends SecureRandomSpi implements Serializable
 {
diff --git a/libjava/gnu/java/security/provider/SHA1withRSA.java b/libjava/gnu/java/security/provider/SHA1withRSA.java
index 64e93f9..7e10619 100644
--- a/libjava/gnu/java/security/provider/SHA1withRSA.java
+++ b/libjava/gnu/java/security/provider/SHA1withRSA.java
@@ -38,11 +38,11 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
+import gnu.java.security.OID;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import gnu.java.security.OID;
-
 public class SHA1withRSA extends RSA
 {
 
diff --git a/libjava/gnu/java/security/provider/X509CertificateFactory.java b/libjava/gnu/java/security/provider/X509CertificateFactory.java
index 7533006..7cfa1f6 100644
--- a/libjava/gnu/java/security/provider/X509CertificateFactory.java
+++ b/libjava/gnu/java/security/provider/X509CertificateFactory.java
@@ -38,29 +38,27 @@ exception statement from your version. */
 
 package gnu.java.security.provider;
 
+import gnu.java.io.Base64InputStream;
+import gnu.java.security.x509.X509CRL;
+import gnu.java.security.x509.X509CertPath;
+import gnu.java.security.x509.X509Certificate;
+
 import java.io.BufferedInputStream;
 import java.io.EOFException;
-import java.io.InputStream;
 import java.io.IOException;
-
+import java.io.InputStream;
+import java.security.cert.CRL;
+import java.security.cert.CRLException;
+import java.security.cert.CertPath;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactorySpi;
-import java.security.cert.CertPath;
-import java.security.cert.CRL;
-import java.security.cert.CRLException;
-
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import gnu.java.io.Base64InputStream;
-import gnu.java.security.x509.X509Certificate;
-import gnu.java.security.x509.X509CertPath;
-import gnu.java.security.x509.X509CRL;
-
 public class X509CertificateFactory extends CertificateFactorySpi
 {
 
diff --git a/libjava/gnu/java/security/x509/GnuPKIExtension.java b/libjava/gnu/java/security/x509/GnuPKIExtension.java
index 8294e65..36ce84d 100644
--- a/libjava/gnu/java/security/x509/GnuPKIExtension.java
+++ b/libjava/gnu/java/security/x509/GnuPKIExtension.java
@@ -38,12 +38,12 @@ exception statement from your version. */
 
 package gnu.java.security.x509;
 
-import java.security.cert.X509Extension;
-import java.util.Collection;
-
 import gnu.java.security.OID;
 import gnu.java.security.x509.ext.Extension;
 
+import java.security.cert.X509Extension;
+import java.util.Collection;
+
 public interface GnuPKIExtension extends X509Extension
 {
 
diff --git a/libjava/gnu/java/security/x509/X500DistinguishedName.java b/libjava/gnu/java/security/x509/X500DistinguishedName.java
index daf76a2..6c34f05 100644
--- a/libjava/gnu/java/security/x509/X500DistinguishedName.java
+++ b/libjava/gnu/java/security/x509/X500DistinguishedName.java
@@ -38,14 +38,17 @@ exception statement from your version. */
 
 package gnu.java.security.x509;
 
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+
 import java.io.EOFException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
-
 import java.security.Principal;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -56,11 +59,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
-import gnu.java.security.OID;
-
 public class X500DistinguishedName implements Principal
 {
 
diff --git a/libjava/gnu/java/security/x509/X509CRL.java b/libjava/gnu/java/security/x509/X509CRL.java
index 33263af..5fe255c 100644
--- a/libjava/gnu/java/security/x509/X509CRL.java
+++ b/libjava/gnu/java/security/x509/X509CRL.java
@@ -45,23 +45,23 @@ import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 import gnu.java.security.x509.ext.Extension;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
-import java.security.PublicKey;
 import java.security.Principal;
+import java.security.PublicKey;
 import java.security.Signature;
 import java.security.SignatureException;
-import java.security.cert.Certificate;
 import java.security.cert.CRLException;
+import java.security.cert.Certificate;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
diff --git a/libjava/gnu/java/security/x509/X509CRLEntry.java b/libjava/gnu/java/security/x509/X509CRLEntry.java
index da16115..4f7e1c2 100644
--- a/libjava/gnu/java/security/x509/X509CRLEntry.java
+++ b/libjava/gnu/java/security/x509/X509CRLEntry.java
@@ -38,12 +38,14 @@ exception statement from your version. */
 
 package gnu.java.security.x509;
 
-import java.io.IOException;
+import gnu.java.security.OID;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.x509.ext.Extension;
 
+import java.io.IOException;
 import java.math.BigInteger;
-
 import java.security.cert.CRLException;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -52,10 +54,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import gnu.java.security.OID;
-import gnu.java.security.der.*;
-import gnu.java.security.x509.ext.*;
-
 /**
  * A single entry in a X.509 certificate revocation list.
  *
diff --git a/libjava/gnu/java/security/x509/X509CertPath.java b/libjava/gnu/java/security/x509/X509CertPath.java
index 0990abd..598dbeb 100644
--- a/libjava/gnu/java/security/x509/X509CertPath.java
+++ b/libjava/gnu/java/security/x509/X509CertPath.java
@@ -38,18 +38,21 @@ exception statement from your version. */
 
 package gnu.java.security.x509;
 
+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 java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
-
+import java.io.InputStream;
 import java.math.BigInteger;
-
+import java.security.cert.CertPath;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
-import java.security.cert.CertPath;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -57,12 +60,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-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;
-
 /**
  * A certificate path (or certificate chain) of X509Certificates.
  *
diff --git a/libjava/gnu/java/security/x509/X509CertSelectorImpl.java b/libjava/gnu/java/security/x509/X509CertSelectorImpl.java
index 4535cce..c355dc1 100644
--- a/libjava/gnu/java/security/x509/X509CertSelectorImpl.java
+++ b/libjava/gnu/java/security/x509/X509CertSelectorImpl.java
@@ -39,12 +39,10 @@ exception statement from your version. */
 package gnu.java.security.x509;
 
 import java.io.IOException;
-
 import java.security.Principal;
-import java.security.cert.Certificate;
 import java.security.cert.CertSelector;
+import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/libjava/gnu/java/security/x509/X509Certificate.java b/libjava/gnu/java/security/x509/X509Certificate.java
index 721439e..29606d1 100644
--- a/libjava/gnu/java/security/x509/X509Certificate.java
+++ b/libjava/gnu/java/security/x509/X509Certificate.java
@@ -38,14 +38,24 @@ exception statement from your version. */
 
 package gnu.java.security.x509;
 
-import java.io.InputStream;
+import gnu.java.security.OID;
+import gnu.java.security.der.BitString;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.x509.ext.BasicConstraints;
+import gnu.java.security.x509.ext.ExtendedKeyUsage;
+import gnu.java.security.x509.ext.Extension;
+import gnu.java.security.x509.ext.IssuerAlternativeNames;
+import gnu.java.security.x509.ext.KeyUsage;
+import gnu.java.security.x509.ext.SubjectAlternativeNames;
+
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.io.StringWriter;
-
 import java.math.BigInteger;
-
 import java.security.AlgorithmParameters;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
@@ -55,20 +65,17 @@ import java.security.Principal;
 import java.security.PublicKey;
 import java.security.Signature;
 import java.security.SignatureException;
-
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.CertificateParsingException;
-
 import java.security.interfaces.DSAParams;
 import java.security.interfaces.DSAPublicKey;
 import java.security.spec.DSAParameterSpec;
 import java.security.spec.X509EncodedKeySpec;
-
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -81,10 +88,6 @@ import java.util.Set;
 
 import javax.security.auth.x500.X500Principal;
 
-import gnu.java.security.OID;
-import gnu.java.security.der.*;
-import gnu.java.security.x509.ext.*;
-
 /**
  * An implementation of X.509 certificates.
  *
diff --git a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java
index 5441521..dafb3ba 100644
--- a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java
+++ b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.math.BigInteger;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 import gnu.java.security.x509.Util;
 
+import java.io.IOException;
+import java.math.BigInteger;
+
 public class AuthorityKeyIdentifier extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/BasicConstraints.java b/libjava/gnu/java/security/x509/ext/BasicConstraints.java
index f720d22..a51e7a8 100644
--- a/libjava/gnu/java/security/x509/ext/BasicConstraints.java
+++ b/libjava/gnu/java/security/x509/ext/BasicConstraints.java
@@ -38,16 +38,16 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
 public class BasicConstraints extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/CRLNumber.java b/libjava/gnu/java/security/x509/ext/CRLNumber.java
index 556aa30..1c3e01e 100644
--- a/libjava/gnu/java/security/x509/ext/CRLNumber.java
+++ b/libjava/gnu/java/security/x509/ext/CRLNumber.java
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.math.BigInteger;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.IOException;
+import java.math.BigInteger;
+
 public class CRLNumber extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/CertificatePolicies.java b/libjava/gnu/java/security/x509/ext/CertificatePolicies.java
index 9c14dc9..266a4c3 100644
--- a/libjava/gnu/java/security/x509/ext/CertificatePolicies.java
+++ b/libjava/gnu/java/security/x509/ext/CertificatePolicies.java
@@ -38,9 +38,13 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+
 import java.io.IOException;
 import java.security.cert.PolicyQualifierInfo;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -49,11 +53,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
-
 public class CertificatePolicies extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java b/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java
index e2a98e0..cd551a9 100644
--- a/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java
+++ b/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java
@@ -38,16 +38,16 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
 public class ExtendedKeyUsage extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/Extension.java b/libjava/gnu/java/security/x509/ext/Extension.java
index ccbd60c..28a32fe 100644
--- a/libjava/gnu/java/security/x509/ext/Extension.java
+++ b/libjava/gnu/java/security/x509/ext/Extension.java
@@ -38,17 +38,17 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 import gnu.java.security.x509.Util;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class Extension
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/GeneralNames.java b/libjava/gnu/java/security/x509/ext/GeneralNames.java
index fc9a73b..66473ee 100644
--- a/libjava/gnu/java/security/x509/ext/GeneralNames.java
+++ b/libjava/gnu/java/security/x509/ext/GeneralNames.java
@@ -1,4 +1,4 @@
-/* GeneralNames.java -- the GeneralNames object.
+/* GeneralNames.java -- the GeneralNames object
    Copyright (C) 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,22 +38,20 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.x509.X500DistinguishedName;
 
+import java.io.IOException;
 import java.net.InetAddress;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import gnu.java.security.OID;
-import gnu.java.security.x509.X500DistinguishedName;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
-
 public class GeneralNames
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java b/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java
index 0d0beb0..7576b6d 100644
--- a/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java
+++ b/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
+import gnu.java.security.OID;
+
 import java.io.IOException;
 import java.util.List;
-import gnu.java.security.OID;
 
 public class IssuerAlternativeNames extends Extension.Value
 {
diff --git a/libjava/gnu/java/security/x509/ext/KeyUsage.java b/libjava/gnu/java/security/x509/ext/KeyUsage.java
index 7d5d7c6..a6fd775 100644
--- a/libjava/gnu/java/security/x509/ext/KeyUsage.java
+++ b/libjava/gnu/java/security/x509/ext/KeyUsage.java
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.IOException;
+
 public class KeyUsage extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/PolicyConstraint.java b/libjava/gnu/java/security/x509/ext/PolicyConstraint.java
index e33f960..866f015 100644
--- a/libjava/gnu/java/security/x509/ext/PolicyConstraint.java
+++ b/libjava/gnu/java/security/x509/ext/PolicyConstraint.java
@@ -38,13 +38,13 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.math.BigInteger;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.IOException;
+import java.math.BigInteger;
+
 public class PolicyConstraint extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/PolicyMappings.java b/libjava/gnu/java/security/x509/ext/PolicyMappings.java
index 827e83f..81cb88c 100644
--- a/libjava/gnu/java/security/x509/ext/PolicyMappings.java
+++ b/libjava/gnu/java/security/x509/ext/PolicyMappings.java
@@ -38,16 +38,16 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 public class PolicyMappings extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java
index 108af4b..8e7e9e2 100644
--- a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java
+++ b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.util.Date;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.IOException;
+import java.util.Date;
+
 public class PrivateKeyUsagePeriod extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/ReasonCode.java b/libjava/gnu/java/security/x509/ext/ReasonCode.java
index 779611d..d965165 100644
--- a/libjava/gnu/java/security/x509/ext/ReasonCode.java
+++ b/libjava/gnu/java/security/x509/ext/ReasonCode.java
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-import java.math.BigInteger;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
+import java.io.IOException;
+import java.math.BigInteger;
+
 public class ReasonCode extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java b/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java
index 19c0bde..73f36b1 100644
--- a/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java
+++ b/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java
@@ -38,11 +38,11 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
+import gnu.java.security.OID;
+
 import java.io.IOException;
 import java.util.List;
 
-import gnu.java.security.OID;
-
 public class SubjectAlternativeNames extends Extension.Value
 {
 
diff --git a/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java b/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java
index 2d48f7c..910decc 100644
--- a/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java
+++ b/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package gnu.java.security.x509.ext;
 
-import java.io.IOException;
-
 import gnu.java.security.OID;
 import gnu.java.security.der.DER;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 import gnu.java.security.x509.Util;
 
+import java.io.IOException;
+
 public class SubjectKeyIdentifier extends Extension.Value
 {