From fb227d5c24332c619453fcc81789df9e8973b5a1 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 18 Apr 2005 18:40:27 +0000 Subject: [PATCH] Buffers.java, [...]: Reorganized import statements. 2005-04-18 Michael Koch * 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 --- libjava/ChangeLog | 83 +++++++++++++++++++ libjava/gnu/java/awt/Buffers.java | 12 ++- libjava/gnu/java/awt/image/ImageDecoder.java | 4 +- libjava/gnu/java/awt/image/XBMDecoder.java | 4 +- .../gnu/java/awt/peer/ClasspathFontPeer.java | 26 ++++-- libjava/gnu/java/net/CRLFInputStream.java | 2 +- .../gnu/java/net/EmptyX509TrustManager.java | 1 + libjava/gnu/java/net/LineInputStream.java | 2 +- .../java/net/protocol/ftp/ActiveModeDTP.java | 2 +- .../net/protocol/ftp/BlockInputStream.java | 2 +- .../protocol/ftp/CompressedInputStream.java | 2 +- libjava/gnu/java/net/protocol/ftp/DTP.java | 2 +- .../java/net/protocol/ftp/DTPInputStream.java | 2 +- .../java/net/protocol/ftp/FTPConnection.java | 2 +- .../net/protocol/ftp/FTPURLConnection.java | 2 +- .../java/net/protocol/ftp/PassiveModeDTP.java | 2 +- .../net/protocol/ftp/StreamInputStream.java | 2 +- .../net/protocol/http/ChunkedInputStream.java | 2 +- .../net/protocol/http/HTTPConnection.java | 5 +- .../net/protocol/http/HTTPURLConnection.java | 5 +- .../gnu/java/net/protocol/http/Headers.java | 2 +- .../gnu/java/net/protocol/http/Request.java | 4 +- libjava/gnu/java/nio/ChannelInputStream.java | 2 +- libjava/gnu/java/nio/ChannelOutputStream.java | 2 +- libjava/gnu/java/nio/InputStreamChannel.java | 2 +- libjava/gnu/java/nio/OutputStreamChannel.java | 2 +- .../gnu/java/nio/SelectorProviderImpl.java | 2 +- .../rmi/RMIMarshalledObjectInputStream.java | 5 +- .../rmi/RMIMarshalledObjectOutputStream.java | 4 +- libjava/gnu/java/rmi/dgc/DGCImpl.java | 11 +-- .../gnu/java/rmi/registry/RegistryImpl.java | 25 +++--- .../java/rmi/server/ProtocolConstants.java | 4 +- .../rmi/server/RMIDefaultSocketFactory.java | 8 +- .../java/rmi/server/RMIIncomingThread.java | 4 +- .../java/rmi/server/RMIObjectInputStream.java | 2 +- .../rmi/server/RMIObjectOutputStream.java | 2 +- libjava/gnu/java/rmi/server/RMIVoidValue.java | 4 +- .../rmi/server/UnicastConnectionManager.java | 11 +-- libjava/gnu/java/rmi/server/UnicastRef.java | 5 +- .../java/rmi/server/UnicastRemoteCall.java | 7 +- .../java/rmi/server/UnicastRemoteStub.java | 6 +- .../gnu/java/rmi/server/UnicastServerRef.java | 10 +-- libjava/gnu/java/security/OID.java | 2 +- libjava/gnu/java/security/der/DERReader.java | 8 +- .../provider/CollectionCertStoreImpl.java | 5 +- .../provider/DSAParameterGenerator.java | 6 +- .../java/security/provider/DefaultPolicy.java | 9 +- .../security/provider/EncodedKeyFactory.java | 5 +- .../security/provider/GnuDHPublicKey.java | 11 ++- .../security/provider/GnuDSAPrivateKey.java | 5 +- .../security/provider/GnuDSAPublicKey.java | 5 +- .../security/provider/GnuRSAPrivateKey.java | 10 +-- .../security/provider/GnuRSAPublicKey.java | 10 +-- .../provider/PKIXCertPathValidatorImpl.java | 11 +-- libjava/gnu/java/security/provider/RSA.java | 15 ++-- .../gnu/java/security/provider/SHA1PRNG.java | 6 +- .../java/security/provider/SHA1withRSA.java | 4 +- .../provider/X509CertificateFactory.java | 20 ++--- .../java/security/x509/GnuPKIExtension.java | 6 +- .../security/x509/X500DistinguishedName.java | 14 ++-- libjava/gnu/java/security/x509/X509CRL.java | 8 +- .../gnu/java/security/x509/X509CRLEntry.java | 12 ++- .../gnu/java/security/x509/X509CertPath.java | 19 ++--- .../security/x509/X509CertSelectorImpl.java | 4 +- .../java/security/x509/X509Certificate.java | 25 +++--- .../x509/ext/AuthorityKeyIdentifier.java | 6 +- .../security/x509/ext/BasicConstraints.java | 10 +-- .../gnu/java/security/x509/ext/CRLNumber.java | 6 +- .../x509/ext/CertificatePolicies.java | 11 ++- .../security/x509/ext/ExtendedKeyUsage.java | 10 +-- .../gnu/java/security/x509/ext/Extension.java | 10 +-- .../java/security/x509/ext/GeneralNames.java | 16 ++-- .../x509/ext/IssuerAlternativeNames.java | 3 +- .../gnu/java/security/x509/ext/KeyUsage.java | 4 +- .../security/x509/ext/PolicyConstraint.java | 6 +- .../security/x509/ext/PolicyMappings.java | 10 +-- .../x509/ext/PrivateKeyUsagePeriod.java | 6 +- .../java/security/x509/ext/ReasonCode.java | 6 +- .../x509/ext/SubjectAlternativeNames.java | 4 +- .../x509/ext/SubjectKeyIdentifier.java | 4 +- 80 files changed, 350 insertions(+), 270 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ece71487d77..c6e9cf0d935 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,86 @@ +2005-04-18 Michael Koch + + * 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. + 2005-04-18 Michael Koch * gnu/java/awt/color/CieXyzConverter.java, diff --git a/libjava/gnu/java/awt/Buffers.java b/libjava/gnu/java/awt/Buffers.java index 3f254749e0b..22fc1f8ab59 100644 --- a/libjava/gnu/java/awt/Buffers.java +++ b/libjava/gnu/java/awt/Buffers.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2000, 2002, 2004 Free Software Foundation +/* Buffers.java -- + Copyright (C) 2000, 2002, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -34,9 +35,16 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package gnu.java.awt; -import java.awt.image.*; +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferByte; +import java.awt.image.DataBufferDouble; +import java.awt.image.DataBufferFloat; +import java.awt.image.DataBufferInt; +import java.awt.image.DataBufferShort; +import java.awt.image.DataBufferUShort; /** * Utility class for creating and accessing data buffers of arbitrary diff --git a/libjava/gnu/java/awt/image/ImageDecoder.java b/libjava/gnu/java/awt/image/ImageDecoder.java index d279d567467..63d3937bfa8 100644 --- a/libjava/gnu/java/awt/image/ImageDecoder.java +++ b/libjava/gnu/java/awt/image/ImageDecoder.java @@ -1,4 +1,4 @@ -/* ImageDecoder.java +/* ImageDecoder.java -- Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,8 +41,8 @@ import java.awt.image.ImageConsumer; import java.awt.image.ImageProducer; import java.io.ByteArrayInputStream; import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.Vector; diff --git a/libjava/gnu/java/awt/image/XBMDecoder.java b/libjava/gnu/java/awt/image/XBMDecoder.java index da58dbbcfe3..568745dab19 100644 --- a/libjava/gnu/java/awt/image/XBMDecoder.java +++ b/libjava/gnu/java/awt/image/XBMDecoder.java @@ -1,4 +1,4 @@ -/* XBMDecoder -- Decodes X-bitmaps +/* XBMDecoder.java -- Decodes X-bitmaps Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,9 +41,9 @@ package gnu.java.awt.image; import java.awt.image.ColorModel; import java.awt.image.ImageConsumer; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.IOException; import java.io.Reader; import java.net.URL; import java.util.StringTokenizer; diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer.java b/libjava/gnu/java/awt/peer/ClasspathFontPeer.java index 79b1adf1807..d34e86300a0 100644 --- a/libjava/gnu/java/awt/peer/ClasspathFontPeer.java +++ b/libjava/gnu/java/awt/peer/ClasspathFontPeer.java @@ -38,14 +38,24 @@ exception statement from your version. */ package gnu.java.awt.peer; -import java.awt.*; -import java.awt.peer.*; -import java.awt.font.*; -import java.awt.geom.*; -import java.text.*; -import java.util.*; -import gnu.java.awt.*; - +import gnu.java.awt.ClasspathToolkit; + +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Toolkit; +import java.awt.font.FontRenderContext; +import java.awt.font.GlyphVector; +import java.awt.font.LineMetrics; +import java.awt.font.TextAttribute; +import java.awt.font.TransformAttribute; +import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; +import java.awt.peer.FontPeer; +import java.text.AttributedCharacterIterator; +import java.text.CharacterIterator; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; /** * A peer for fonts that are used inside Classpath. The purpose of diff --git a/libjava/gnu/java/net/CRLFInputStream.java b/libjava/gnu/java/net/CRLFInputStream.java index 706c23447be..9bfb50db6dc 100644 --- a/libjava/gnu/java/net/CRLFInputStream.java +++ b/libjava/gnu/java/net/CRLFInputStream.java @@ -39,8 +39,8 @@ exception statement from your version. */ package gnu.java.net; import java.io.FilterInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * An input stream that filters out CR/LF pairs into LFs. diff --git a/libjava/gnu/java/net/EmptyX509TrustManager.java b/libjava/gnu/java/net/EmptyX509TrustManager.java index c7e9055a3ab..18d433b53f1 100644 --- a/libjava/gnu/java/net/EmptyX509TrustManager.java +++ b/libjava/gnu/java/net/EmptyX509TrustManager.java @@ -40,6 +40,7 @@ package gnu.java.net; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; + import javax.net.ssl.X509TrustManager; /** diff --git a/libjava/gnu/java/net/LineInputStream.java b/libjava/gnu/java/net/LineInputStream.java index 491e6f78e07..5028fe480c9 100644 --- a/libjava/gnu/java/net/LineInputStream.java +++ b/libjava/gnu/java/net/LineInputStream.java @@ -40,8 +40,8 @@ package gnu.java.net; import java.io.ByteArrayOutputStream; import java.io.FilterInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * An input stream that can read lines of input. diff --git a/libjava/gnu/java/net/protocol/ftp/ActiveModeDTP.java b/libjava/gnu/java/net/protocol/ftp/ActiveModeDTP.java index ab387e4a96f..5e38bfdbd14 100644 --- a/libjava/gnu/java/net/protocol/ftp/ActiveModeDTP.java +++ b/libjava/gnu/java/net/protocol/ftp/ActiveModeDTP.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.net.protocol.ftp; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.InetAddress; import java.net.ServerSocket; diff --git a/libjava/gnu/java/net/protocol/ftp/BlockInputStream.java b/libjava/gnu/java/net/protocol/ftp/BlockInputStream.java index f72d8df25c2..882e79aee9b 100644 --- a/libjava/gnu/java/net/protocol/ftp/BlockInputStream.java +++ b/libjava/gnu/java/net/protocol/ftp/BlockInputStream.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.net.protocol.ftp; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * A DTP input stream that implements the FTP block transfer mode. diff --git a/libjava/gnu/java/net/protocol/ftp/CompressedInputStream.java b/libjava/gnu/java/net/protocol/ftp/CompressedInputStream.java index 4e2eb717613..8a5a34a248d 100644 --- a/libjava/gnu/java/net/protocol/ftp/CompressedInputStream.java +++ b/libjava/gnu/java/net/protocol/ftp/CompressedInputStream.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.net.protocol.ftp; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.ProtocolException; /** diff --git a/libjava/gnu/java/net/protocol/ftp/DTP.java b/libjava/gnu/java/net/protocol/ftp/DTP.java index 54016b8a4fe..6c908971065 100644 --- a/libjava/gnu/java/net/protocol/ftp/DTP.java +++ b/libjava/gnu/java/net/protocol/ftp/DTP.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.net.protocol.ftp; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; /** diff --git a/libjava/gnu/java/net/protocol/ftp/DTPInputStream.java b/libjava/gnu/java/net/protocol/ftp/DTPInputStream.java index 73b6aa63512..a9df39087c0 100644 --- a/libjava/gnu/java/net/protocol/ftp/DTPInputStream.java +++ b/libjava/gnu/java/net/protocol/ftp/DTPInputStream.java @@ -39,8 +39,8 @@ exception statement from your version. */ package gnu.java.net.protocol.ftp; import java.io.FilterInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * An input stream that notifies a DTP on completion. diff --git a/libjava/gnu/java/net/protocol/ftp/FTPConnection.java b/libjava/gnu/java/net/protocol/ftp/FTPConnection.java index 2c1237349f5..5ead9c814de 100644 --- a/libjava/gnu/java/net/protocol/ftp/FTPConnection.java +++ b/libjava/gnu/java/net/protocol/ftp/FTPConnection.java @@ -45,8 +45,8 @@ import gnu.java.net.LineInputStream; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.BindException; import java.net.InetAddress; diff --git a/libjava/gnu/java/net/protocol/ftp/FTPURLConnection.java b/libjava/gnu/java/net/protocol/ftp/FTPURLConnection.java index 368c035c339..efc6f635bc9 100644 --- a/libjava/gnu/java/net/protocol/ftp/FTPURLConnection.java +++ b/libjava/gnu/java/net/protocol/ftp/FTPURLConnection.java @@ -44,8 +44,8 @@ import gnu.java.security.action.GetPropertyAction; import java.io.FileNotFoundException; import java.io.FilterInputStream; import java.io.FilterOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.InetAddress; import java.net.URL; diff --git a/libjava/gnu/java/net/protocol/ftp/PassiveModeDTP.java b/libjava/gnu/java/net/protocol/ftp/PassiveModeDTP.java index c08eb5ca18f..495a59d730a 100644 --- a/libjava/gnu/java/net/protocol/ftp/PassiveModeDTP.java +++ b/libjava/gnu/java/net/protocol/ftp/PassiveModeDTP.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.net.protocol.ftp; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/libjava/gnu/java/net/protocol/ftp/StreamInputStream.java b/libjava/gnu/java/net/protocol/ftp/StreamInputStream.java index 0ee8857f852..0efd2ffc962 100644 --- a/libjava/gnu/java/net/protocol/ftp/StreamInputStream.java +++ b/libjava/gnu/java/net/protocol/ftp/StreamInputStream.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.net.protocol.ftp; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * A DTP input stream that implements the FTP stream data transfer mode. diff --git a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.java b/libjava/gnu/java/net/protocol/http/ChunkedInputStream.java index cb051bf71a5..cd4a88d9fb8 100644 --- a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.java +++ b/libjava/gnu/java/net/protocol/http/ChunkedInputStream.java @@ -39,8 +39,8 @@ exception statement from your version. */ package gnu.java.net.protocol.http; import java.io.FilterInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.ProtocolException; /** diff --git a/libjava/gnu/java/net/protocol/http/HTTPConnection.java b/libjava/gnu/java/net/protocol/http/HTTPConnection.java index a3f14b51012..20383be59cc 100644 --- a/libjava/gnu/java/net/protocol/http/HTTPConnection.java +++ b/libjava/gnu/java/net/protocol/http/HTTPConnection.java @@ -39,16 +39,16 @@ exception statement from your version. */ package gnu.java.net.protocol.http; import gnu.classpath.Configuration; +import gnu.java.net.EmptyX509TrustManager; import gnu.java.net.protocol.http.event.ConnectionEvent; import gnu.java.net.protocol.http.event.ConnectionListener; import gnu.java.net.protocol.http.event.RequestEvent; import gnu.java.net.protocol.http.event.RequestListener; -import gnu.java.net.EmptyX509TrustManager; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.Socket; @@ -58,6 +58,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; + import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; diff --git a/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java b/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java index b289860ebdd..2938dfc953a 100644 --- a/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java +++ b/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java @@ -40,19 +40,20 @@ package gnu.java.net.protocol.http; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.ProtocolException; import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.cert.Certificate; -import java.util.Date; import java.util.Collections; +import java.util.Date; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; + import javax.net.ssl.HandshakeCompletedEvent; import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.HostnameVerifier; diff --git a/libjava/gnu/java/net/protocol/http/Headers.java b/libjava/gnu/java/net/protocol/http/Headers.java index e56139f0284..0db9a552a0f 100644 --- a/libjava/gnu/java/net/protocol/http/Headers.java +++ b/libjava/gnu/java/net/protocol/http/Headers.java @@ -40,8 +40,8 @@ package gnu.java.net.protocol.http; import gnu.java.net.LineInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.text.DateFormat; import java.text.ParseException; import java.util.Collection; diff --git a/libjava/gnu/java/net/protocol/http/Request.java b/libjava/gnu/java/net/protocol/http/Request.java index 62a1a535a12..53e08c556a7 100644 --- a/libjava/gnu/java/net/protocol/http/Request.java +++ b/libjava/gnu/java/net/protocol/http/Request.java @@ -38,12 +38,12 @@ exception statement from your version. */ package gnu.java.net.protocol.http; -import gnu.java.net.protocol.http.event.RequestEvent; import gnu.java.net.BASE64; import gnu.java.net.LineInputStream; +import gnu.java.net.protocol.http.event.RequestEvent; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.ProtocolException; import java.security.MessageDigest; diff --git a/libjava/gnu/java/nio/ChannelInputStream.java b/libjava/gnu/java/nio/ChannelInputStream.java index 4cf4875c334..b7b1974cfbd 100644 --- a/libjava/gnu/java/nio/ChannelInputStream.java +++ b/libjava/gnu/java/nio/ChannelInputStream.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.nio; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.channels.IllegalBlockingModeException; import java.nio.channels.ReadableByteChannel; diff --git a/libjava/gnu/java/nio/ChannelOutputStream.java b/libjava/gnu/java/nio/ChannelOutputStream.java index 96dc7610654..73fd7dc3c1c 100644 --- a/libjava/gnu/java/nio/ChannelOutputStream.java +++ b/libjava/gnu/java/nio/ChannelOutputStream.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.nio; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; diff --git a/libjava/gnu/java/nio/InputStreamChannel.java b/libjava/gnu/java/nio/InputStreamChannel.java index 49e8b3c7e73..6e0119eb5d8 100644 --- a/libjava/gnu/java/nio/InputStreamChannel.java +++ b/libjava/gnu/java/nio/InputStreamChannel.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.nio; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; import java.nio.channels.ReadableByteChannel; diff --git a/libjava/gnu/java/nio/OutputStreamChannel.java b/libjava/gnu/java/nio/OutputStreamChannel.java index 37ded3b1169..98f3f15dcc2 100644 --- a/libjava/gnu/java/nio/OutputStreamChannel.java +++ b/libjava/gnu/java/nio/OutputStreamChannel.java @@ -38,8 +38,8 @@ exception statement from your version. */ package gnu.java.nio; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; import java.nio.channels.WritableByteChannel; diff --git a/libjava/gnu/java/nio/SelectorProviderImpl.java b/libjava/gnu/java/nio/SelectorProviderImpl.java index 41966ef14a1..37f4074cba5 100644 --- a/libjava/gnu/java/nio/SelectorProviderImpl.java +++ b/libjava/gnu/java/nio/SelectorProviderImpl.java @@ -42,8 +42,8 @@ import java.nio.channels.DatagramChannel; import java.nio.channels.Pipe; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; -import java.nio.channels.spi.SelectorProvider; import java.nio.channels.spi.AbstractSelector; +import java.nio.channels.spi.SelectorProvider; public class SelectorProviderImpl extends SelectorProvider { diff --git a/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java b/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java index 8835280a0e0..e20dda8eb78 100644 --- a/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java +++ b/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java @@ -39,9 +39,10 @@ exception statement from your version. */ package gnu.java.rmi; import gnu.java.rmi.server.RMIObjectInputStream; -import java.io.ObjectInputStream; -import java.io.IOException; + import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; /** * This class is only for java.rmi.MarshalledObject to deserialize object from diff --git a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java index 53a5bf159df..931116a2234 100644 --- a/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java +++ b/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java @@ -40,10 +40,10 @@ package gnu.java.rmi; import gnu.java.rmi.server.RMIObjectOutputStream; -import java.io.OutputStream; -import java.io.ObjectOutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.OutputStream; /** * This class is only for java.rmi.MarshalledObject to serialize object and diff --git a/libjava/gnu/java/rmi/dgc/DGCImpl.java b/libjava/gnu/java/rmi/dgc/DGCImpl.java index 483ac54f192..a41dabdedfe 100644 --- a/libjava/gnu/java/rmi/dgc/DGCImpl.java +++ b/libjava/gnu/java/rmi/dgc/DGCImpl.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* DGCImpl.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,14 +38,14 @@ exception statement from your version. */ package gnu.java.rmi.dgc; +import gnu.java.rmi.server.UnicastServerRef; + +import java.rmi.RemoteException; import java.rmi.dgc.DGC; import java.rmi.dgc.Lease; import java.rmi.dgc.VMID; import java.rmi.server.ObjID; -import java.rmi.RemoteException; import java.rmi.server.RMISocketFactory; -import gnu.java.rmi.server.UnicastServerRef; - import java.util.Hashtable; /** diff --git a/libjava/gnu/java/rmi/registry/RegistryImpl.java b/libjava/gnu/java/rmi/registry/RegistryImpl.java index 43033c4b8ad..056ab804cd1 100644 --- a/libjava/gnu/java/rmi/registry/RegistryImpl.java +++ b/libjava/gnu/java/rmi/registry/RegistryImpl.java @@ -1,6 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005 - Free Software Foundation, Inc. +/* RegistryImpl.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,21 +38,22 @@ exception statement from your version. */ package gnu.java.rmi.registry; -import java.rmi.registry.Registry; -import java.rmi.registry.LocateRegistry; -import java.rmi.RemoteException; -import java.rmi.NotBoundException; +import gnu.java.rmi.server.UnicastServerRef; + import java.rmi.AccessException; import java.rmi.AlreadyBoundException; +import java.rmi.NotBoundException; import java.rmi.Remote; -import java.rmi.server.UnicastRemoteObject; +import java.rmi.RemoteException; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; import java.rmi.server.ObjID; -import java.util.Hashtable; -import java.util.Enumeration; -import java.rmi.server.RMISocketFactory; import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; -import gnu.java.rmi.server.UnicastServerRef; +import java.rmi.server.RMISocketFactory; +import java.rmi.server.UnicastRemoteObject; +import java.util.Enumeration; +import java.util.Hashtable; public class RegistryImpl extends UnicastRemoteObject implements Registry { diff --git a/libjava/gnu/java/rmi/server/ProtocolConstants.java b/libjava/gnu/java/rmi/server/ProtocolConstants.java index 7837a8e5132..9f214c96aa9 100644 --- a/libjava/gnu/java/rmi/server/ProtocolConstants.java +++ b/libjava/gnu/java/rmi/server/ProtocolConstants.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* ProtocolConstants.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java b/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java index 887be9a4dd9..b58be1adefd 100644 --- a/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java +++ b/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* RMIDefaultSocketFactory.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,10 +37,10 @@ exception statement from your version. */ package gnu.java.rmi.server; -import java.rmi.server.RMISocketFactory; import java.io.IOException; -import java.net.Socket; import java.net.ServerSocket; +import java.net.Socket; +import java.rmi.server.RMISocketFactory; public class RMIDefaultSocketFactory extends RMISocketFactory { diff --git a/libjava/gnu/java/rmi/server/RMIIncomingThread.java b/libjava/gnu/java/rmi/server/RMIIncomingThread.java index 2855c039e87..a6e2fee83c4 100644 --- a/libjava/gnu/java/rmi/server/RMIIncomingThread.java +++ b/libjava/gnu/java/rmi/server/RMIIncomingThread.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* RMIIncomingThread.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java index ffdccba4f62..c890a14337e 100644 --- a/libjava/gnu/java/rmi/server/RMIObjectInputStream.java +++ b/libjava/gnu/java/rmi/server/RMIObjectInputStream.java @@ -39,8 +39,8 @@ exception statement from your version. */ package gnu.java.rmi.server; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.lang.reflect.Proxy; diff --git a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java index 1ae2000da08..32aa5314ed5 100644 --- a/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java +++ b/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java @@ -43,8 +43,8 @@ import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; import java.rmi.Remote; -import java.rmi.server.RemoteStub; import java.rmi.server.RMIClassLoader; +import java.rmi.server.RemoteStub; public class RMIObjectOutputStream extends ObjectOutputStream { diff --git a/libjava/gnu/java/rmi/server/RMIVoidValue.java b/libjava/gnu/java/rmi/server/RMIVoidValue.java index 7829fc60138..bad8b96523f 100644 --- a/libjava/gnu/java/rmi/server/RMIVoidValue.java +++ b/libjava/gnu/java/rmi/server/RMIVoidValue.java @@ -1,5 +1,5 @@ -/* RMIVoidValue.java - Copyright (c) 2003 Free Software Foundation, Inc. +/* RMIVoidValue.java -- + Copyright (c) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java index ef01c8264e5..c8c1d57ca59 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java +++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java @@ -39,20 +39,17 @@ exception statement from your version. */ package gnu.java.rmi.server; -import gnu.java.rmi.server.RMIIncomingThread; -import gnu.java.rmi.server.UnicastConnection; - import java.io.IOException; -import java.io.ObjectOutput; import java.io.ObjectInput; +import java.io.ObjectOutput; import java.net.InetAddress; -import java.net.Socket; import java.net.ServerSocket; +import java.net.Socket; import java.net.UnknownHostException; import java.rmi.RemoteException; -import java.rmi.server.RMISocketFactory; -import java.rmi.server.RMIServerSocketFactory; import java.rmi.server.RMIClientSocketFactory; +import java.rmi.server.RMIServerSocketFactory; +import java.rmi.server.RMISocketFactory; import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.Hashtable; diff --git a/libjava/gnu/java/rmi/server/UnicastRef.java b/libjava/gnu/java/rmi/server/UnicastRef.java index 60a745e84f5..77042d724b0 100644 --- a/libjava/gnu/java/rmi/server/UnicastRef.java +++ b/libjava/gnu/java/rmi/server/UnicastRef.java @@ -1,5 +1,6 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +/* UnicastRef.java -- + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005 + Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java index abbe0272544..e38f0f92bb3 100644 --- a/libjava/gnu/java/rmi/server/UnicastRemoteCall.java +++ b/libjava/gnu/java/rmi/server/UnicastRemoteCall.java @@ -1,5 +1,6 @@ /* UnicastRemoteCall.java - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004, 2005 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,11 +45,11 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.StreamCorruptedException; -import java.rmi.RemoteException; import java.rmi.MarshalException; +import java.rmi.RemoteException; import java.rmi.UnmarshalException; -import java.rmi.server.RemoteCall; import java.rmi.server.ObjID; +import java.rmi.server.RemoteCall; import java.rmi.server.UID; import java.util.Vector; diff --git a/libjava/gnu/java/rmi/server/UnicastRemoteStub.java b/libjava/gnu/java/rmi/server/UnicastRemoteStub.java index 97b91104783..f19ecccb925 100644 --- a/libjava/gnu/java/rmi/server/UnicastRemoteStub.java +++ b/libjava/gnu/java/rmi/server/UnicastRemoteStub.java @@ -1,5 +1,5 @@ -/* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* UnicastRemoteStub.java -- + Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,8 +37,8 @@ exception statement from your version. */ package gnu.java.rmi.server; -import java.rmi.server.RemoteStub; import java.rmi.server.RemoteRef; +import java.rmi.server.RemoteStub; public class UnicastRemoteStub extends RemoteStub { diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java index ce4420c4701..71c84a58aed 100644 --- a/libjava/gnu/java/rmi/server/UnicastServerRef.java +++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java @@ -41,17 +41,17 @@ package gnu.java.rmi.server; import java.io.ObjectInputStream; import java.lang.reflect.Constructor; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.rmi.Remote; import java.rmi.RemoteException; -import java.rmi.server.RemoteStub; import java.rmi.server.ObjID; -import java.rmi.server.ServerRef; -import java.rmi.server.RemoteServer; +import java.rmi.server.RMIServerSocketFactory; import java.rmi.server.RemoteRef; +import java.rmi.server.RemoteServer; +import java.rmi.server.RemoteStub; import java.rmi.server.ServerNotActiveException; -import java.rmi.server.RMIServerSocketFactory; +import java.rmi.server.ServerRef; import java.rmi.server.Skeleton; import java.util.Hashtable; diff --git a/libjava/gnu/java/security/OID.java b/libjava/gnu/java/security/OID.java index 0b935c48c23..91843510895 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 688b509eb2c..aab3a2fc8c2 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 1b22cc891e5..b67a4332c55 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 f481f294dda..92032fa9431 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 f3385fa04fb..f7ef782fcee 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 7dc5ee9337b..dd1a06a791a 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 fbf9d9f8633..d62fcc93a96 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 72fe38784d5..8cac9c351f9 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 9ec827d41ae..6f3a29da9af 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 455326dd082..45a212552a9 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 502fcccbf0f..05377446745 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 7bba5021338..3e493ee6d08 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 5afa8b74065..4fd4633784d 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 97a8b9e3433..058dc6daa3f 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 64e93f9b0d8..7e106192966 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 753300651b9..7cfa1f610d8 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 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 { -- 2.30.2