OSDN Git Service

2005-04-18 Michael Koch <konqueror@gmx.de>
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 18 Apr 2005 18:40:27 +0000 (18:40 +0000)
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 18 Apr 2005 18:40:27 +0000 (18:40 +0000)
* gnu/java/awt/Buffers.java,
gnu/java/awt/image/ImageDecoder.java,
gnu/java/awt/image/XBMDecoder.java,
gnu/java/awt/peer/ClasspathFontPeer.java,
gnu/java/net/CRLFInputStream.java,
gnu/java/net/EmptyX509TrustManager.java,
gnu/java/net/LineInputStream.java,
gnu/java/net/protocol/ftp/ActiveModeDTP.java,
gnu/java/net/protocol/ftp/BlockInputStream.java,
gnu/java/net/protocol/ftp/CompressedInputStream.java,
gnu/java/net/protocol/ftp/DTP.java,
gnu/java/net/protocol/ftp/DTPInputStream.java,
gnu/java/net/protocol/ftp/FTPConnection.java,
gnu/java/net/protocol/ftp/FTPURLConnection.java,
gnu/java/net/protocol/ftp/PassiveModeDTP.java,
gnu/java/net/protocol/ftp/StreamInputStream.java,
gnu/java/net/protocol/http/ChunkedInputStream.java,
gnu/java/net/protocol/http/HTTPConnection.java,
gnu/java/net/protocol/http/HTTPURLConnection.java,
gnu/java/net/protocol/http/Headers.java,
gnu/java/net/protocol/http/Request.java,
gnu/java/nio/ChannelInputStream.java,
gnu/java/nio/ChannelOutputStream.java,
gnu/java/nio/InputStreamChannel.java,
gnu/java/nio/OutputStreamChannel.java,
gnu/java/nio/SelectorProviderImpl.java,
gnu/java/rmi/RMIMarshalledObjectInputStream.java,
gnu/java/rmi/RMIMarshalledObjectOutputStream.java,
gnu/java/rmi/dgc/DGCImpl.java,
gnu/java/rmi/registry/RegistryImpl.java,
gnu/java/rmi/server/ProtocolConstants.java,
gnu/java/rmi/server/RMIDefaultSocketFactory.java,
gnu/java/rmi/server/RMIIncomingThread.java,
gnu/java/rmi/server/RMIObjectInputStream.java,
gnu/java/rmi/server/RMIObjectOutputStream.java,
gnu/java/rmi/server/RMIVoidValue.java,
gnu/java/rmi/server/UnicastConnectionManager.java,
gnu/java/rmi/server/UnicastRef.java,
gnu/java/rmi/server/UnicastRemoteCall.java,
gnu/java/rmi/server/UnicastRemoteStub.java,
gnu/java/rmi/server/UnicastServerRef.java,
gnu/java/security/OID.java,
gnu/java/security/der/DERReader.java,
gnu/java/security/provider/CollectionCertStoreImpl.java,
gnu/java/security/provider/DSAParameterGenerator.java,
gnu/java/security/provider/DefaultPolicy.java,
gnu/java/security/provider/EncodedKeyFactory.java,
gnu/java/security/provider/GnuDHPublicKey.java,
gnu/java/security/provider/GnuDSAPrivateKey.java,
gnu/java/security/provider/GnuDSAPublicKey.java,
gnu/java/security/provider/GnuRSAPrivateKey.java,
gnu/java/security/provider/GnuRSAPublicKey.java,
gnu/java/security/provider/PKIXCertPathValidatorImpl.java,
gnu/java/security/provider/RSA.java,
gnu/java/security/provider/SHA1PRNG.java,
gnu/java/security/provider/SHA1withRSA.java,
gnu/java/security/provider/X509CertificateFactory.java,
gnu/java/security/x509/GnuPKIExtension.java,
gnu/java/security/x509/X500DistinguishedName.java,
gnu/java/security/x509/X509CRL.java,
gnu/java/security/x509/X509CRLEntry.java,
gnu/java/security/x509/X509CertPath.java,
gnu/java/security/x509/X509CertSelectorImpl.java,
gnu/java/security/x509/X509Certificate.java,
gnu/java/security/x509/ext/AuthorityKeyIdentifier.java,
gnu/java/security/x509/ext/BasicConstraints.java,
gnu/java/security/x509/ext/CRLNumber.java,
gnu/java/security/x509/ext/CertificatePolicies.java,
gnu/java/security/x509/ext/ExtendedKeyUsage.java,
gnu/java/security/x509/ext/Extension.java,
gnu/java/security/x509/ext/GeneralNames.java,
gnu/java/security/x509/ext/IssuerAlternativeNames.java,
gnu/java/security/x509/ext/KeyUsage.java,
gnu/java/security/x509/ext/PolicyConstraint.java,
gnu/java/security/x509/ext/PolicyMappings.java,
gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java,
gnu/java/security/x509/ext/ReasonCode.java,
gnu/java/security/x509/ext/SubjectAlternativeNames.java,
gnu/java/security/x509/ext/SubjectKeyIdentifier.java:
Reorganized import statements.

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

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

index ece7148..c6e9cf0 100644 (file)
@@ -1,5 +1,88 @@
 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,
        gnu/java/awt/color/ClutProfileConverter.java,
        gnu/java/awt/color/ColorLookUpTable.java,
index 3f25474..22fc1f8 100644 (file)
@@ -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
index d279d56..63d3937 100644 (file)
@@ -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;
 
index da58dbb..568745d 100644 (file)
@@ -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;
index 79b1adf..d34e863 100644 (file)
@@ -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
index 706c234..9bfb50d 100644 (file)
@@ -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.
index c7e9055..18d433b 100644 (file)
@@ -40,6 +40,7 @@ package gnu.java.net;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+
 import javax.net.ssl.X509TrustManager;
 
 /**
index 491e6f7..5028fe4 100644 (file)
@@ -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.
index ab387e4..5e38bfd 100644 (file)
@@ -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;
index f72d8df..882e79a 100644 (file)
@@ -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.
index 4e2eb71..8a5a34a 100644 (file)
@@ -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;
 
 /**
index 54016b8..6c90897 100644 (file)
@@ -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;
 
 /**
index 73b6aa6..a9df390 100644 (file)
@@ -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.
index 2c12373..5ead9c8 100644 (file)
@@ -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;
index 368c035..efc6f63 100644 (file)
@@ -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;
index c08eb5c..495a59d 100644 (file)
@@ -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;
index 0ee8857..0efd2ff 100644 (file)
@@ -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.
index cb051bf..cd4a88d 100644 (file)
@@ -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;
 
 /**
index a3f14b5..20383be 100644 (file)
@@ -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;
index b289860..2938dfc 100644 (file)
@@ -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;
index e56139f..0db9a55 100644 (file)
@@ -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;
index 62a1a53..53e08c5 100644 (file)
@@ -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;
index 4cf4875..b7b1974 100644 (file)
@@ -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;
index 96dc761..73fd7dc 100644 (file)
@@ -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;
 
index 49e8b3c..6e0119e 100644 (file)
@@ -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;
index 37ded3b..98f3f15 100644 (file)
@@ -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;
index 41966ef..37f4074 100644 (file)
@@ -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
 {
index 8835280..e20dda8 100644 (file)
@@ -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 
index 53a5bf1..931116a 100644 (file)
@@ -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 
index 483ac54..a41dabd 100644 (file)
@@ -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;
 
 /**
index 43033c4..056ab80 100644 (file)
@@ -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 {
index 7837a8e..9f214c9 100644 (file)
@@ -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.
 
index 887be9a..b58be1a 100644 (file)
@@ -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 {
index 2855c03..a6e2fee 100644 (file)
@@ -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.
 
index ffdccba..c890a14 100644 (file)
@@ -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;
index 1ae2000..32aa531 100644 (file)
@@ -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 {
index 7829fc6..bad8b96 100644 (file)
@@ -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.
 
index ef01c82..c8c1d57 100644 (file)
@@ -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;
index 60a745e..77042d7 100644 (file)
@@ -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.
 
index abbe027..e38f0f9 100644 (file)
@@ -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;
 
index 97b9110..f19eccc 100644 (file)
@@ -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 {
index ce4420c..71c84a5 100644 (file)
@@ -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;
 
index 0b935c4..9184351 100644 (file)
@@ -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;
 
 /**
index 688b509..aab3a2f 100644 (file)
@@ -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
index 1b22cc8..b67a433 100644 (file)
@@ -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;
index f481f29..92032fa 100644 (file)
@@ -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;
index f3385fa..f7ef782 100644 (file)
@@ -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
index 7dc5ee9..dd1a06a 100644 (file)
@@ -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;
index fbf9d9f..d62fcc9 100644 (file)
@@ -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
 {
 
index 72fe387..8cac9c3 100644 (file)
@@ -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
index 9ec827d..6f3a29d 100644 (file)
@@ -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
index 455326d..45a2125 100644 (file)
@@ -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
 {
 
index 502fccc..0537744 100644 (file)
@@ -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
 {
 
index 7bba502..3e493ee 100644 (file)
@@ -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;
index 5afa8b7..4fd4633 100644 (file)
@@ -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
 {
 
index 97a8b9e..058dc6d 100644 (file)
@@ -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
 {
index 64e93f9..7e10619 100644 (file)
@@ -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
 {
 
index 7533006..7cfa1f6 100644 (file)
@@ -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
 {
 
index 8294e65..36ce84d 100644 (file)
@@ -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
 {
 
index daf76a2..6c34f05 100644 (file)
@@ -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
 {
 
index 33263af..5fe255c 100644 (file)
@@ -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;
 
index da16115..4f7e1c2 100644 (file)
@@ -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.
  *
index 0990abd..598dbeb 100644 (file)
@@ -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.
  *
index 4535cce..c355dc1 100644 (file)
@@ -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;
index 721439e..29606d1 100644 (file)
@@ -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.
  *
index 5441521..dafb3ba 100644 (file)
@@ -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
 {
 
index f720d22..a51e7a8 100644 (file)
@@ -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
 {
 
index 556aa30..1c3e01e 100644 (file)
@@ -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
 {
 
index 9c14dc9..266a4c3 100644 (file)
@@ -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
 {
 
index e2a98e0..cd551a9 100644 (file)
@@ -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
 {
 
index ccbd60c..28a32fe 100644 (file)
@@ -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
 {
 
index fc9a73b..66473ee 100644 (file)
@@ -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
 {
 
index 0d0beb0..7576b6d 100644 (file)
@@ -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
 {
index 7d5d7c6..a6fd775 100644 (file)
@@ -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
 {
 
index e33f960..866f015 100644 (file)
@@ -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
 {
 
index 827e83f..81cb88c 100644 (file)
@@ -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
 {
 
index 108af4b..8e7e9e2 100644 (file)
@@ -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
 {
 
index 779611d..d965165 100644 (file)
@@ -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
 {
 
index 19c0bde..73f36b1 100644 (file)
@@ -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
 {
 
index 2d48f7c..910decc 100644 (file)
@@ -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
 {