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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98339 138bc75d-0d04-0410-961f-82ee72b054a4

22 files changed, 96 insertions, 104 deletions

diff --git a/libjava/gnu/java/security/x509/GnuPKIExtension.java b/libjava/gnu/java/security/x509/GnuPKIExtension.java
index 8294e654bc1..36ce84db0f1 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 daf76a22dfa..6c34f0579c8 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 33263af4325..5fe255c2adf 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 da161153c62..4f7e1c2587a 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 0990abda059..598dbeb9491 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 4535cce6d7d..c355dc1767e 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 721439ef238..29606d11979 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 5441521990b..dafb3ba2309 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 f720d22a9c0..a51e7a8f0ca 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 556aa303a3b..1c3e01e3601 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 9c14dc96ef7..266a4c3c6af 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 e2a98e0a361..cd551a99e5a 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 ccbd60c15eb..28a32fecc9d 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 fc9a73ba3dc..66473ee60eb 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 0d0beb04bc5..7576b6d34ba 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 7d5d7c62c4c..a6fd77573db 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 e33f960b30b..866f015cdd5 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 827e83fe0a3..81cb88c1370 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 108af4bcf90..8e7e9e230a7 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 779611de1fa..d9651652c30 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 19c0bdee8c4..73f36b1e395 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 2d48f7c368e..910decc794c 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
 {