From fb227d5c24332c619453fcc81789df9e8973b5a1 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 18 Apr 2005 18:40:27 +0000 Subject: 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 --- .../java/security/x509/ext/AuthorityKeyIdentifier.java | 6 +++--- libjava/gnu/java/security/x509/ext/BasicConstraints.java | 10 +++++----- libjava/gnu/java/security/x509/ext/CRLNumber.java | 6 +++--- .../gnu/java/security/x509/ext/CertificatePolicies.java | 11 +++++------ libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java | 10 +++++----- libjava/gnu/java/security/x509/ext/Extension.java | 10 +++++----- libjava/gnu/java/security/x509/ext/GeneralNames.java | 16 +++++++--------- .../java/security/x509/ext/IssuerAlternativeNames.java | 3 ++- libjava/gnu/java/security/x509/ext/KeyUsage.java | 4 ++-- libjava/gnu/java/security/x509/ext/PolicyConstraint.java | 6 +++--- libjava/gnu/java/security/x509/ext/PolicyMappings.java | 10 +++++----- .../java/security/x509/ext/PrivateKeyUsagePeriod.java | 6 +++--- libjava/gnu/java/security/x509/ext/ReasonCode.java | 6 +++--- .../java/security/x509/ext/SubjectAlternativeNames.java | 4 ++-- .../gnu/java/security/x509/ext/SubjectKeyIdentifier.java | 4 ++-- 15 files changed, 55 insertions(+), 57 deletions(-) (limited to 'libjava/gnu/java/security/x509/ext') diff --git a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java index 5441521..dafb3ba 100644 --- a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java +++ b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java @@ -38,15 +38,15 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; import gnu.java.security.x509.Util; +import java.io.IOException; +import java.math.BigInteger; + public class AuthorityKeyIdentifier extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/BasicConstraints.java b/libjava/gnu/java/security/x509/ext/BasicConstraints.java index f720d22..a51e7a8 100644 --- a/libjava/gnu/java/security/x509/ext/BasicConstraints.java +++ b/libjava/gnu/java/security/x509/ext/BasicConstraints.java @@ -38,16 +38,16 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + public class BasicConstraints extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/CRLNumber.java b/libjava/gnu/java/security/x509/ext/CRLNumber.java index 556aa30..1c3e01e 100644 --- a/libjava/gnu/java/security/x509/ext/CRLNumber.java +++ b/libjava/gnu/java/security/x509/ext/CRLNumber.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.math.BigInteger; + public class CRLNumber extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/CertificatePolicies.java b/libjava/gnu/java/security/x509/ext/CertificatePolicies.java index 9c14dc9..266a4c3 100644 --- a/libjava/gnu/java/security/x509/ext/CertificatePolicies.java +++ b/libjava/gnu/java/security/x509/ext/CertificatePolicies.java @@ -38,9 +38,13 @@ exception statement from your version. */ package gnu.java.security.x509.ext; +import gnu.java.security.OID; +import gnu.java.security.der.DER; +import gnu.java.security.der.DERReader; +import gnu.java.security.der.DERValue; + import java.io.IOException; import java.security.cert.PolicyQualifierInfo; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -49,11 +53,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import gnu.java.security.OID; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; - public class CertificatePolicies extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java b/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java index e2a98e0..cd551a9 100644 --- a/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java +++ b/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java @@ -38,16 +38,16 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + public class ExtendedKeyUsage extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/Extension.java b/libjava/gnu/java/security/x509/ext/Extension.java index ccbd60c..28a32fe 100644 --- a/libjava/gnu/java/security/x509/ext/Extension.java +++ b/libjava/gnu/java/security/x509/ext/Extension.java @@ -38,17 +38,17 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; import gnu.java.security.x509.Util; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class Extension { diff --git a/libjava/gnu/java/security/x509/ext/GeneralNames.java b/libjava/gnu/java/security/x509/ext/GeneralNames.java index fc9a73b..66473ee 100644 --- a/libjava/gnu/java/security/x509/ext/GeneralNames.java +++ b/libjava/gnu/java/security/x509/ext/GeneralNames.java @@ -1,4 +1,4 @@ -/* GeneralNames.java -- the GeneralNames object. +/* GeneralNames.java -- the GeneralNames object Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,22 +38,20 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; +import gnu.java.security.OID; +import gnu.java.security.der.DER; +import gnu.java.security.der.DERReader; +import gnu.java.security.der.DERValue; +import gnu.java.security.x509.X500DistinguishedName; +import java.io.IOException; import java.net.InetAddress; - import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import gnu.java.security.OID; -import gnu.java.security.x509.X500DistinguishedName; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; - public class GeneralNames { diff --git a/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java b/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java index 0d0beb0..7576b6d 100644 --- a/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java +++ b/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java @@ -38,9 +38,10 @@ exception statement from your version. */ package gnu.java.security.x509.ext; +import gnu.java.security.OID; + import java.io.IOException; import java.util.List; -import gnu.java.security.OID; public class IssuerAlternativeNames extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/KeyUsage.java b/libjava/gnu/java/security/x509/ext/KeyUsage.java index 7d5d7c6..a6fd775 100644 --- a/libjava/gnu/java/security/x509/ext/KeyUsage.java +++ b/libjava/gnu/java/security/x509/ext/KeyUsage.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; - import gnu.java.security.OID; import gnu.java.security.der.BitString; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; + public class KeyUsage extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/PolicyConstraint.java b/libjava/gnu/java/security/x509/ext/PolicyConstraint.java index e33f960..866f015 100644 --- a/libjava/gnu/java/security/x509/ext/PolicyConstraint.java +++ b/libjava/gnu/java/security/x509/ext/PolicyConstraint.java @@ -38,13 +38,13 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; - import gnu.java.security.OID; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.math.BigInteger; + public class PolicyConstraint extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/PolicyMappings.java b/libjava/gnu/java/security/x509/ext/PolicyMappings.java index 827e83f..81cb88c 100644 --- a/libjava/gnu/java/security/x509/ext/PolicyMappings.java +++ b/libjava/gnu/java/security/x509/ext/PolicyMappings.java @@ -38,16 +38,16 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + public class PolicyMappings extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java index 108af4b..8e7e9e2 100644 --- a/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java +++ b/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.util.Date; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.util.Date; + public class PrivateKeyUsagePeriod extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/ReasonCode.java b/libjava/gnu/java/security/x509/ext/ReasonCode.java index 779611d..d965165 100644 --- a/libjava/gnu/java/security/x509/ext/ReasonCode.java +++ b/libjava/gnu/java/security/x509/ext/ReasonCode.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; -import java.math.BigInteger; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; +import java.io.IOException; +import java.math.BigInteger; + public class ReasonCode extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java b/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java index 19c0bde..73f36b1 100644 --- a/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java +++ b/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java @@ -38,11 +38,11 @@ exception statement from your version. */ package gnu.java.security.x509.ext; +import gnu.java.security.OID; + import java.io.IOException; import java.util.List; -import gnu.java.security.OID; - public class SubjectAlternativeNames extends Extension.Value { diff --git a/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java b/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java index 2d48f7c..910decc 100644 --- a/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java +++ b/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java @@ -38,14 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509.ext; -import java.io.IOException; - import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; import gnu.java.security.x509.Util; +import java.io.IOException; + public class SubjectKeyIdentifier extends Extension.Value { -- cgit v1.1