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

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

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

From-SVN: r98339

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ece71487d77a8df582e89fd17a9b0f948ee6103f..c6e9cf0d9351c31b40776a312fb9f976d0694bd3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,86 @@
+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.
+
 2005-04-18  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/awt/color/CieXyzConverter.java,

diff --git a/libjava/gnu/java/awt/Buffers.java b/libjava/gnu/java/awt/Buffers.java
index 3f254749e0ba2a96e807f275b88df1a48de15fbf..22fc1f8ab59e12bbf449be57c881066b5dce7db5 100644 (file)
--- 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 d279d567467b75fa380f57d5642d916c176f9c88..63d3937bfa8fe7c55a856c9a17c8d2abae7c3529 100644 (file)
--- 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 da58dbbcfe39a809ea88a91550ec557cb72cbc6a..568745dab19f172d2eb82373a7686d5618a99c20 100644 (file)
--- 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 79b1adf1807009b5b0036fc34dc1d075cf6c34b7..d34e86300a09e5edd7e9750e6b8f07c8ca98512c 100644 (file)
--- 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 706c23447bec1771e68b46b7bde72632db79247a..9bfb50db6dcf4c61d6c97e1ef8d0421f2bcd8ad5 100644 (file)
--- 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 c7e9055a3ab2fdf5df867af9dfac36ee3505a512..18d433b53f171ced0efdc616c5e96b2720473032 100644 (file)
--- 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 491e6f78e0770831e73f4e9b1048c97cdc717111..5028fe480c93e0f8146200521398f5d60ef419c0 100644 (file)
--- 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 ab387e4a96fb12f027bd4cef19f791ac92298461..5e38bfdbd14f97248d82a836d921f56287e0dc34 100644 (file)
--- 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 f72d8df25c2a6ec6e7ced67bda3d05a02a23c90c..882e79aee9b7a53c452a52d6b7da90a8ad0f40ef 100644 (file)
--- 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 4e2eb717613507f57e6ec7fb6fe83d0cc90bfbb7..8a5a34a248dff81d676a55648429a61a5d0e4899 100644 (file)
--- 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 54016b8a4feebb0a3b82c5cee710ca618ef1ce9e..6c908971065ea6c15f83e32089a98a4c7e8ee449 100644 (file)
--- 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 73b6aa63512f97b438895250d5d8d72f2f0c453a..a9df39087c0840fc34b78e8011453005fdfac367 100644 (file)
--- 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 2c1237349f55cf66d29e55332facf1a3efd17b50..5ead9c814ded415c1455277d58b800147354b06a 100644 (file)
--- 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 368c035c33902065c5e115c37d537c7d4ace8010..efc6f635bc976c3ee626fc13016f96c304cb978d 100644 (file)
--- 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 c08eb5ca18f5868fc959f9a67b5931cf5c8bc53c..495a59d730a3de9646bb6b33a757625ba5b83b0d 100644 (file)
--- 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 0ee8857f85298651fdce8bdd86930532fb12d55d..0efd2ffc962f526724f9defca9d1c83e58b28150 100644 (file)
--- 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 cb051bf71a5f06d532aac6c9042cf98acbecf0ed..cd4a88d9fb8dbb9ed26e296028afd87c3bda788a 100644 (file)
--- 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 a3f14b51012ff572d0e493381b1702dd9545e923..20383be59cc015aa96177cb6d7a0ad1ba3b5f93e 100644 (file)
--- 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 b289860ebddee9aed455aa9e5acd0ad831551d4d..2938dfc953aa660edb87c0a4628a19a314060279 100644 (file)
--- 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 e56139f0284fa08ae4bc2ef33e508163968666f7..0db9a552a0f91f6ed8b484a86d581c4d69be1f15 100644 (file)
--- 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 62a1a535a1252333a484073f8fb1a30be6f95613..53e08c556a7939d6df055d5e98ee894cd6a5ba21 100644 (file)
--- 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 4cf4875c3345a435974ca5e7f81a96de5db9560a..b7b1974cfbd6b03b80afab767a78307b11fe9f89 100644 (file)
--- 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 96dc761065434fb3f8d76e2a69af52c3827570a5..73fd7dc3c1ca1130d8173474d63869e7aea5361d 100644 (file)
--- 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 49e8b3c7e732c138759f2faaa74a0a8e5c9c802d..6e0119eb5d8988d0cea490d9096d1968ef321c64 100644 (file)
--- 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 37ded3b11699445f2c869b3b0dae2abcbeb946f1..98f3f15dcc298643486b0961b64955b0d8edc3f3 100644 (file)
--- 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 41966ef14a1f06cc732a5fa391e25c3abb0a9552..37f4074cba5bad4bfc1517eb898c914876f9b796 100644 (file)
--- 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 8835280a0e012057890638961e192af964469384..e20dda8eb782f1da490f08f45147bf37eee54962 100644 (file)
--- 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 53a5bf159dfe8fd6a9c90c8a0bbca97a2f28576c..931116a22348149a9b218265085590c815431906 100644 (file)
--- 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 483ac54f19204df3215d20bbc3d8011a74d82adc..a41dabdedfe81659a343aff95f4329f487461074 100644 (file)
--- 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 43033c4b8ad84e656f6ca1f3075b2a35ffff1326..056ab804cd1a471c01fe975a00dff09a31c74ffc 100644 (file)
--- 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 7837a8e513257a61166e4ff64ab0c4b6ca5e3569..9f214c96aa92f23b785c8014f9fe473ba6518392 100644 (file)
--- 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 887be9a4dd9d1e8b21c0899c75b536e0973bd03c..b58be1adefd8c05bfad4d7e3a92015d0995f4b0f 100644 (file)
--- 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 2855c039e872b8e0e7cbae3b20b85648d3a20016..a6e2fee83c482e955a756a6b4a126ab3e30650a2 100644 (file)
--- 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 ffdccba4f62769b76b887e358102ec1a0d0cdbab..c890a14337e4b2075262beb084d8136c46a84279 100644 (file)
--- 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 1ae2000da08307446b3f50474d5072689935d786..32aa5314ed520e78551dd24bd16148730330bc99 100644 (file)
--- 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 7829fc601380b420f14ec88cb8271da1ed50c68a..bad8b96523f225a7e9e4673fe9357855742417f8 100644 (file)
--- 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 ef01c8264e58166b28c3a2643b94395fb12b491a..c8c1d57ca590026244deb6b735b8d8463843cae8 100644 (file)
--- 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 60a745e84f578cba9d30fc817ee0e10daf16b3bf..77042d724b08d90c0921957377f2a41678d8cc9d 100644 (file)
--- 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 abbe0272544894b883f2f12e6df25569290ea5b0..e38f0f92bb3d1b1ad1bc71a34ba0e1ef65529441 100644 (file)
--- 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 97b91104783dc2a960407162848323cd0affa016..f19ecccb925142a7ed2e239bc535919d17261ec2 100644 (file)
--- 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 ce4420c4701b5a5768d0d7e40845fcdd7a913cea..71c84a58aed27ef109b16628179413d9049211a6 100644 (file)
--- 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 0b935c48c2388c4afb551ee97e6245d6591cf685..91843510895d1364bbe8f2c8e37a15c5d7afd56a 100644 (file)
--- 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 688b509eb2ce6ac65d1ba8f9e6b0e950d8debdfc..aab3a2fc8c2b15d715a7031b3929828746f0a365 100644 (file)
--- 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 1b22cc891e55fc0d8f9e7f9809813b47f960671d..b67a4332c555045b22814ddb1027676c669fdb59 100644 (file)
--- 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 f481f294dda04fe32dad9ba3fe28595b0ae7ca8f..92032fa943174a004c2fc70ef002791f904b9721 100644 (file)
--- 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 f3385fa04fb85003318e2d814edaaf2872f8c664..f7ef782fceef7688e185465c771c4483707a9074 100644 (file)
--- 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 7dc5ee9337b0be74fe78941ae157e8ea60b01894..dd1a06a791a74f379574d5470976533ea60dd8ce 100644 (file)
--- 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 fbf9d9f863384a39c71a29cd9002836214b1ab34..d62fcc93a96957b38d838183d85bdad534079868 100644 (file)
--- 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 72fe38784d5e0f9732c19575780f464ddc5a8c13..8cac9c351f9466bc317312245e064ae4e74381ee 100644 (file)
--- 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 9ec827d41aee4bfcd9348d09c69ba0cabc4b857a..6f3a29da9af209d066adf1393dbba33e786e50d6 100644 (file)
--- 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 455326dd082a3a5c484a2f9666f1691f08164ee1..45a212552a953cfc09104bff9318f2937380b97c 100644 (file)
--- 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 502fcccbf0f719b02a636b146a600bafaeca0641..053774467454251626342f7538562e4143761b50 100644 (file)
--- 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 7bba5021338f09cb16a154b59337917e6116dca4..3e493ee6d0828b589444dc9d421f23de581e786e 100644 (file)
--- 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 5afa8b740655aaee6058febac8a181d97e8a7428..4fd4633784d027805d2aeef63ab8fb3bc2fef82a 100644 (file)
--- 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 97a8b9e34334c1c095246dded593427ddcffc1f8..058dc6daa3ffe756d49054f58fd9a80abebb90de 100644 (file)
--- 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 64e93f9b0d883aa24b6b0a699f62104c71d6dc7c..7e10619296659e9969535c5afa7f02a2c8cb3218 100644 (file)
--- 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 753300651b99add685b9280d40aff639f5383d14..7cfa1f610d8ac594b211bee5dcace0ff7df27b8c 100644 (file)
--- 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 8294e654bc14581055364f2bbea4b6d020889290..36ce84db0f1e9f2d95b461bcee7d9d61ffe87690 100644 (file)
--- 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 daf76a22dfa94d50b16485212f6f967819ffe809..6c34f0579c8fc645693095acb5aa71534ca78b30 100644 (file)
--- 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 33263af43254fd5a61dcc85a6b7ec4e1f2f89cfb..5fe255c2adf3a9eac01f92ce6b6c7ae0b8997e8c 100644 (file)
--- 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 da161153c624331fea1ce5d400ed2b13c8fffcef..4f7e1c2587a7ef3ada354cc6d4d94e2f959cfe30 100644 (file)
--- 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 0990abda0593d7395c9b3afb09db09f178f6b7d8..598dbeb9491f89f496e9952c768fe3c501dfb486 100644 (file)
--- 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 4535cce6d7d03fce00c1b28b1d6da10974a487dd..c355dc1767e9f400e380722be9aa3b5203b722ef 100644 (file)
--- 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 721439ef23839fe74aed861d692a319ea9fcece6..29606d11979bbd73575f26bd42fbea8dc57021f9 100644 (file)
--- 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 5441521990b83ea3acfcffc5b007e8ef596ba8fa..dafb3ba23094fd118cf300daef6f1a6c6d943d53 100644 (file)
--- 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 f720d22a9c041cd56ae5b33459bf3601ea8a2766..a51e7a8f0ca6dc5539ab1312991db11ed4d135c3 100644 (file)
--- 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 556aa303a3b3f91c58527bbd6ba96bfd474986ed..1c3e01e360197cbf0221b9a2efa513be7829a7bb 100644 (file)
--- 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 9c14dc96ef7f8ab03118d7c8ea1e27e446b5e3f9..266a4c3c6af4907c818a2d3e77e7ebe3a17472a3 100644 (file)
--- 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 e2a98e0a361b4ba5ffab8a14d192bf55613c8c15..cd551a99e5ac6cfdacd2a9cf4b16e322aa5f82ff 100644 (file)
--- 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 ccbd60c15eb2ab80a2e9be7c0c99a4aa52f8533d..28a32fecc9da5150a8ff984de9517275d69ac427 100644 (file)
--- 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 fc9a73ba3dcfa651cf83812f5a15f6eb2eaec694..66473ee60ebf2cdcdb1d0531ef891451996302ba 100644 (file)
--- 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 0d0beb04bc519d0cb50a6d7526b2f331aefb5b23..7576b6d34bab654e59d3b9b824dee0ef25ee4f37 100644 (file)
--- 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 7d5d7c62c4c1a8b25251bad49f4a1370bd1b66ac..a6fd77573db620f15ad8aae5757154abc081819b 100644 (file)
--- 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 e33f960b30bb90ef84ff1b4ccbcaefb09e60bc6e..866f015cdd58d15f272d0e4b4db4835f477df4ce 100644 (file)
--- 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 827e83fe0a3a80df54a6df3a2ae174b608a574aa..81cb88c13701aa0aa78f9985a50e596d8975e605 100644 (file)
--- 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 108af4bcf90dc4c05ffea818180369cf05b5637d..8e7e9e230a76626b3240225f17d394cd8233b94e 100644 (file)
--- 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 779611de1fa4bbc155791bf00fb1c363fb09ad8b..d9651652c303ced5446b9c70f2459d2369302881 100644 (file)
--- 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 19c0bdee8c4fa7b9095050b51290287e8c173fe6..73f36b1e3957cd995dcdbf0d707640eeea939899 100644 (file)
--- 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 2d48f7c368e6ff85ae7a6a79c0918dadd61a5e1c..910decc794c8da03e7d887378ea38291e26039b7 100644 (file)
--- 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
 {