[Patch] import statements cleaned up
Michael Koch
konqueror@gmx.de
Mon Apr 18 18:42:00 GMT 2005
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.
-------------- next part --------------
Index: gnu/java/awt/Buffers.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/Buffers.java,v
retrieving revision 1.3
diff -u -r1.3 Buffers.java
--- gnu/java/awt/Buffers.java 20 Apr 2004 08:37:47 -0000 1.3
+++ gnu/java/awt/Buffers.java 18 Apr 2005 18:39:40 -0000
@@ -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 @@
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: gnu/java/awt/image/ImageDecoder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/image/ImageDecoder.java,v
retrieving revision 1.6
diff -u -r1.6 ImageDecoder.java
--- gnu/java/awt/image/ImageDecoder.java 16 Feb 2005 20:01:17 -0000 1.6
+++ gnu/java/awt/image/ImageDecoder.java 18 Apr 2005 18:39:40 -0000
@@ -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.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: gnu/java/awt/image/XBMDecoder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/image/XBMDecoder.java,v
retrieving revision 1.3
diff -u -r1.3 XBMDecoder.java
--- gnu/java/awt/image/XBMDecoder.java 30 Nov 2004 23:58:33 -0000 1.3
+++ gnu/java/awt/image/XBMDecoder.java 18 Apr 2005 18:39:40 -0000
@@ -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 @@
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: gnu/java/awt/peer/ClasspathFontPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/ClasspathFontPeer.java,v
retrieving revision 1.5
diff -u -r1.5 ClasspathFontPeer.java
--- gnu/java/awt/peer/ClasspathFontPeer.java 30 Nov 2004 23:58:34 -0000 1.5
+++ gnu/java/awt/peer/ClasspathFontPeer.java 18 Apr 2005 18:39:40 -0000
@@ -38,14 +38,24 @@
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: gnu/java/net/CRLFInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/CRLFInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 CRLFInputStream.java
--- gnu/java/net/CRLFInputStream.java 19 Feb 2005 08:53:53 -0000 1.1
+++ gnu/java/net/CRLFInputStream.java 18 Apr 2005 18:39:40 -0000
@@ -39,8 +39,8 @@
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: gnu/java/net/EmptyX509TrustManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/EmptyX509TrustManager.java,v
retrieving revision 1.1
diff -u -r1.1 EmptyX509TrustManager.java
--- gnu/java/net/EmptyX509TrustManager.java 11 Jan 2005 20:19:54 -0000 1.1
+++ gnu/java/net/EmptyX509TrustManager.java 18 Apr 2005 18:39:40 -0000
@@ -40,6 +40,7 @@
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+
import javax.net.ssl.X509TrustManager;
/**
Index: gnu/java/net/LineInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/LineInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 LineInputStream.java
--- gnu/java/net/LineInputStream.java 11 Jan 2005 20:19:54 -0000 1.1
+++ gnu/java/net/LineInputStream.java 18 Apr 2005 18:39:40 -0000
@@ -40,8 +40,8 @@
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: gnu/java/net/protocol/ftp/ActiveModeDTP.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/ActiveModeDTP.java,v
retrieving revision 1.1
diff -u -r1.1 ActiveModeDTP.java
--- gnu/java/net/protocol/ftp/ActiveModeDTP.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/ActiveModeDTP.java 18 Apr 2005 18:39:40 -0000
@@ -38,8 +38,8 @@
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: gnu/java/net/protocol/ftp/BlockInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/BlockInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 BlockInputStream.java
--- gnu/java/net/protocol/ftp/BlockInputStream.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/BlockInputStream.java 18 Apr 2005 18:39:40 -0000
@@ -38,8 +38,8 @@
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: gnu/java/net/protocol/ftp/CompressedInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/CompressedInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 CompressedInputStream.java
--- gnu/java/net/protocol/ftp/CompressedInputStream.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/CompressedInputStream.java 18 Apr 2005 18:39:40 -0000
@@ -38,8 +38,8 @@
package gnu.java.net.protocol.ftp;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.ProtocolException;
/**
Index: gnu/java/net/protocol/ftp/DTP.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/DTP.java,v
retrieving revision 1.1
diff -u -r1.1 DTP.java
--- gnu/java/net/protocol/ftp/DTP.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/DTP.java 18 Apr 2005 18:39:40 -0000
@@ -38,8 +38,8 @@
package gnu.java.net.protocol.ftp;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
/**
Index: gnu/java/net/protocol/ftp/DTPInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/DTPInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 DTPInputStream.java
--- gnu/java/net/protocol/ftp/DTPInputStream.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/DTPInputStream.java 18 Apr 2005 18:39:40 -0000
@@ -39,8 +39,8 @@
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: gnu/java/net/protocol/ftp/FTPConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/FTPConnection.java,v
retrieving revision 1.1
diff -u -r1.1 FTPConnection.java
--- gnu/java/net/protocol/ftp/FTPConnection.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/FTPConnection.java 18 Apr 2005 18:39:40 -0000
@@ -45,8 +45,8 @@
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: gnu/java/net/protocol/ftp/FTPURLConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/FTPURLConnection.java,v
retrieving revision 1.1
diff -u -r1.1 FTPURLConnection.java
--- gnu/java/net/protocol/ftp/FTPURLConnection.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/FTPURLConnection.java 18 Apr 2005 18:39:40 -0000
@@ -44,8 +44,8 @@
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: gnu/java/net/protocol/ftp/PassiveModeDTP.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/PassiveModeDTP.java,v
retrieving revision 1.1
diff -u -r1.1 PassiveModeDTP.java
--- gnu/java/net/protocol/ftp/PassiveModeDTP.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/PassiveModeDTP.java 18 Apr 2005 18:39:40 -0000
@@ -38,8 +38,8 @@
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: gnu/java/net/protocol/ftp/StreamInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/ftp/StreamInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 StreamInputStream.java
--- gnu/java/net/protocol/ftp/StreamInputStream.java 19 Feb 2005 08:53:52 -0000 1.1
+++ gnu/java/net/protocol/ftp/StreamInputStream.java 18 Apr 2005 18:39:40 -0000
@@ -38,8 +38,8 @@
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: gnu/java/net/protocol/http/ChunkedInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/http/ChunkedInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 ChunkedInputStream.java
--- gnu/java/net/protocol/http/ChunkedInputStream.java 11 Jan 2005 20:19:54 -0000 1.1
+++ gnu/java/net/protocol/http/ChunkedInputStream.java 18 Apr 2005 18:39:40 -0000
@@ -39,8 +39,8 @@
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: gnu/java/net/protocol/http/HTTPConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/http/HTTPConnection.java,v
retrieving revision 1.2
diff -u -r1.2 HTTPConnection.java
--- gnu/java/net/protocol/http/HTTPConnection.java 17 Feb 2005 18:26:26 -0000 1.2
+++ gnu/java/net/protocol/http/HTTPConnection.java 18 Apr 2005 18:39:40 -0000
@@ -39,16 +39,16 @@
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.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: gnu/java/net/protocol/http/HTTPURLConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java,v
retrieving revision 1.1
diff -u -r1.1 HTTPURLConnection.java
--- gnu/java/net/protocol/http/HTTPURLConnection.java 11 Jan 2005 20:19:54 -0000 1.1
+++ gnu/java/net/protocol/http/HTTPURLConnection.java 18 Apr 2005 18:39:40 -0000
@@ -40,19 +40,20 @@
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: gnu/java/net/protocol/http/Headers.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/http/Headers.java,v
retrieving revision 1.1
diff -u -r1.1 Headers.java
--- gnu/java/net/protocol/http/Headers.java 11 Jan 2005 20:19:54 -0000 1.1
+++ gnu/java/net/protocol/http/Headers.java 18 Apr 2005 18:39:41 -0000
@@ -40,8 +40,8 @@
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: gnu/java/net/protocol/http/Request.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/protocol/http/Request.java,v
retrieving revision 1.2
diff -u -r1.2 Request.java
--- gnu/java/net/protocol/http/Request.java 17 Feb 2005 18:26:26 -0000 1.2
+++ gnu/java/net/protocol/http/Request.java 18 Apr 2005 18:39:41 -0000
@@ -38,12 +38,12 @@
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: gnu/java/nio/ChannelInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/ChannelInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 ChannelInputStream.java
--- gnu/java/nio/ChannelInputStream.java 19 Dec 2003 19:06:34 -0000 1.1
+++ gnu/java/nio/ChannelInputStream.java 18 Apr 2005 18:39:41 -0000
@@ -38,8 +38,8 @@
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: gnu/java/nio/ChannelOutputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/ChannelOutputStream.java,v
retrieving revision 1.1
diff -u -r1.1 ChannelOutputStream.java
--- gnu/java/nio/ChannelOutputStream.java 19 Dec 2003 20:42:00 -0000 1.1
+++ gnu/java/nio/ChannelOutputStream.java 18 Apr 2005 18:39:41 -0000
@@ -38,8 +38,8 @@
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: gnu/java/nio/InputStreamChannel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/InputStreamChannel.java,v
retrieving revision 1.1
diff -u -r1.1 InputStreamChannel.java
--- gnu/java/nio/InputStreamChannel.java 19 Dec 2003 15:22:33 -0000 1.1
+++ gnu/java/nio/InputStreamChannel.java 18 Apr 2005 18:39:41 -0000
@@ -38,8 +38,8 @@
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: gnu/java/nio/OutputStreamChannel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/OutputStreamChannel.java,v
retrieving revision 1.1
diff -u -r1.1 OutputStreamChannel.java
--- gnu/java/nio/OutputStreamChannel.java 19 Dec 2003 16:31:59 -0000 1.1
+++ gnu/java/nio/OutputStreamChannel.java 18 Apr 2005 18:39:41 -0000
@@ -38,8 +38,8 @@
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: gnu/java/nio/SelectorProviderImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/SelectorProviderImpl.java,v
retrieving revision 1.3
diff -u -r1.3 SelectorProviderImpl.java
--- gnu/java/nio/SelectorProviderImpl.java 12 Oct 2003 13:39:07 -0000 1.3
+++ gnu/java/nio/SelectorProviderImpl.java 18 Apr 2005 18:39:41 -0000
@@ -42,8 +42,8 @@
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: gnu/java/rmi/RMIMarshalledObjectInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/RMIMarshalledObjectInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 RMIMarshalledObjectInputStream.java
--- gnu/java/rmi/RMIMarshalledObjectInputStream.java 1 Oct 2002 03:46:41 -0000 1.1
+++ gnu/java/rmi/RMIMarshalledObjectInputStream.java 18 Apr 2005 18:39:41 -0000
@@ -39,9 +39,10 @@
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: gnu/java/rmi/RMIMarshalledObjectOutputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/RMIMarshalledObjectOutputStream.java,v
retrieving revision 1.3
diff -u -r1.3 RMIMarshalledObjectOutputStream.java
--- gnu/java/rmi/RMIMarshalledObjectOutputStream.java 16 Oct 2004 18:27:47 -0000 1.3
+++ gnu/java/rmi/RMIMarshalledObjectOutputStream.java 18 Apr 2005 18:39:41 -0000
@@ -40,10 +40,10 @@
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: gnu/java/rmi/dgc/DGCImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/dgc/DGCImpl.java,v
retrieving revision 1.5
diff -u -r1.5 DGCImpl.java
--- gnu/java/rmi/dgc/DGCImpl.java 17 Feb 2005 18:26:27 -0000 1.5
+++ gnu/java/rmi/dgc/DGCImpl.java 18 Apr 2005 18:39:41 -0000
@@ -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 @@
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: gnu/java/rmi/registry/RegistryImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/registry/RegistryImpl.java,v
retrieving revision 1.5
diff -u -r1.5 RegistryImpl.java
--- gnu/java/rmi/registry/RegistryImpl.java 18 Feb 2005 20:52:15 -0000 1.5
+++ gnu/java/rmi/registry/RegistryImpl.java 18 Apr 2005 18:39:41 -0000
@@ -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 @@
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: gnu/java/rmi/server/ProtocolConstants.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/ProtocolConstants.java,v
retrieving revision 1.3
diff -u -r1.3 ProtocolConstants.java
--- gnu/java/rmi/server/ProtocolConstants.java 11 Oct 2003 18:56:54 -0000 1.3
+++ gnu/java/rmi/server/ProtocolConstants.java 18 Apr 2005 18:39:41 -0000
@@ -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: gnu/java/rmi/server/RMIDefaultSocketFactory.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/RMIDefaultSocketFactory.java,v
retrieving revision 1.2
diff -u -r1.2 RMIDefaultSocketFactory.java
--- gnu/java/rmi/server/RMIDefaultSocketFactory.java 22 Jan 2002 22:40:01 -0000 1.2
+++ gnu/java/rmi/server/RMIDefaultSocketFactory.java 18 Apr 2005 18:39:41 -0000
@@ -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 @@
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: gnu/java/rmi/server/RMIIncomingThread.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/RMIIncomingThread.java,v
retrieving revision 1.1
diff -u -r1.1 RMIIncomingThread.java
--- gnu/java/rmi/server/RMIIncomingThread.java 20 Mar 2004 20:30:56 -0000 1.1
+++ gnu/java/rmi/server/RMIIncomingThread.java 18 Apr 2005 18:39:41 -0000
@@ -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: gnu/java/rmi/server/RMIObjectInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/RMIObjectInputStream.java,v
retrieving revision 1.6
diff -u -r1.6 RMIObjectInputStream.java
--- gnu/java/rmi/server/RMIObjectInputStream.java 16 Oct 2004 18:27:49 -0000 1.6
+++ gnu/java/rmi/server/RMIObjectInputStream.java 18 Apr 2005 18:39:41 -0000
@@ -39,8 +39,8 @@
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: gnu/java/rmi/server/RMIObjectOutputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/RMIObjectOutputStream.java,v
retrieving revision 1.5
diff -u -r1.5 RMIObjectOutputStream.java
--- gnu/java/rmi/server/RMIObjectOutputStream.java 16 Oct 2004 18:27:49 -0000 1.5
+++ gnu/java/rmi/server/RMIObjectOutputStream.java 18 Apr 2005 18:39:41 -0000
@@ -43,8 +43,8 @@
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: gnu/java/rmi/server/RMIVoidValue.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/RMIVoidValue.java,v
retrieving revision 1.1
diff -u -r1.1 RMIVoidValue.java
--- gnu/java/rmi/server/RMIVoidValue.java 26 Dec 2003 16:13:01 -0000 1.1
+++ gnu/java/rmi/server/RMIVoidValue.java 18 Apr 2005 18:39:41 -0000
@@ -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: gnu/java/rmi/server/UnicastConnectionManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/UnicastConnectionManager.java,v
retrieving revision 1.10
diff -u -r1.10 UnicastConnectionManager.java
--- gnu/java/rmi/server/UnicastConnectionManager.java 17 Feb 2005 18:26:27 -0000 1.10
+++ gnu/java/rmi/server/UnicastConnectionManager.java 18 Apr 2005 18:39:41 -0000
@@ -39,20 +39,17 @@
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: gnu/java/rmi/server/UnicastRef.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/UnicastRef.java,v
retrieving revision 1.6
diff -u -r1.6 UnicastRef.java
--- gnu/java/rmi/server/UnicastRef.java 20 Mar 2004 20:30:56 -0000 1.6
+++ gnu/java/rmi/server/UnicastRef.java 18 Apr 2005 18:39:41 -0000
@@ -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: gnu/java/rmi/server/UnicastRemoteCall.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/UnicastRemoteCall.java,v
retrieving revision 1.10
diff -u -r1.10 UnicastRemoteCall.java
--- gnu/java/rmi/server/UnicastRemoteCall.java 6 Nov 2004 23:38:51 -0000 1.10
+++ gnu/java/rmi/server/UnicastRemoteCall.java 18 Apr 2005 18:39:42 -0000
@@ -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.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: gnu/java/rmi/server/UnicastRemoteStub.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/UnicastRemoteStub.java,v
retrieving revision 1.2
diff -u -r1.2 UnicastRemoteStub.java
--- gnu/java/rmi/server/UnicastRemoteStub.java 22 Jan 2002 22:40:01 -0000 1.2
+++ gnu/java/rmi/server/UnicastRemoteStub.java 18 Apr 2005 18:39:42 -0000
@@ -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 @@
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: gnu/java/rmi/server/UnicastServerRef.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/server/UnicastServerRef.java,v
retrieving revision 1.11
diff -u -r1.11 UnicastServerRef.java
--- gnu/java/rmi/server/UnicastServerRef.java 16 Oct 2004 18:27:49 -0000 1.11
+++ gnu/java/rmi/server/UnicastServerRef.java 18 Apr 2005 18:39:42 -0000
@@ -41,17 +41,17 @@
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: gnu/java/security/OID.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/OID.java,v
retrieving revision 1.3
diff -u -r1.3 OID.java
--- gnu/java/security/OID.java 17 Oct 2004 08:00:10 -0000 1.3
+++ gnu/java/security/OID.java 18 Apr 2005 18:39:42 -0000
@@ -41,8 +41,8 @@
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: gnu/java/security/der/DERReader.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/der/DERReader.java,v
retrieving revision 1.4
diff -u -r1.4 DERReader.java
--- gnu/java/security/der/DERReader.java 16 Feb 2005 23:11:05 -0000 1.4
+++ gnu/java/security/der/DERReader.java 18 Apr 2005 18:39:42 -0000
@@ -38,21 +38,19 @@
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: gnu/java/security/provider/CollectionCertStoreImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/CollectionCertStoreImpl.java,v
retrieving revision 1.1
diff -u -r1.1 CollectionCertStoreImpl.java
--- gnu/java/security/provider/CollectionCertStoreImpl.java 15 Nov 2004 20:02:04 -0000 1.1
+++ gnu/java/security/provider/CollectionCertStoreImpl.java 18 Apr 2005 18:39:42 -0000
@@ -39,15 +39,14 @@
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: gnu/java/security/provider/DSAParameterGenerator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/DSAParameterGenerator.java,v
retrieving revision 1.3
diff -u -r1.3 DSAParameterGenerator.java
--- gnu/java/security/provider/DSAParameterGenerator.java 11 Aug 2002 12:08:03 -0000 1.3
+++ gnu/java/security/provider/DSAParameterGenerator.java 18 Apr 2005 18:39:42 -0000
@@ -38,9 +38,11 @@
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.InvalidParameterSpecException;
import java.util.Random;
-import gnu.java.security.util.Prime;
-
public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi
{
private int size;
Index: gnu/java/security/provider/DefaultPolicy.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/DefaultPolicy.java,v
retrieving revision 1.5
diff -u -r1.5 DefaultPolicy.java
--- gnu/java/security/provider/DefaultPolicy.java 11 Aug 2002 12:08:03 -0000 1.5
+++ gnu/java/security/provider/DefaultPolicy.java 18 Apr 2005 18:39:42 -0000
@@ -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 @@
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: gnu/java/security/provider/EncodedKeyFactory.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/EncodedKeyFactory.java,v
retrieving revision 1.2
diff -u -r1.2 EncodedKeyFactory.java
--- gnu/java/security/provider/EncodedKeyFactory.java 17 Feb 2005 18:26:29 -0000 1.2
+++ gnu/java/security/provider/EncodedKeyFactory.java 18 Apr 2005 18:39:42 -0000
@@ -44,9 +44,7 @@
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.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: gnu/java/security/provider/GnuDHPublicKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/GnuDHPublicKey.java,v
retrieving revision 1.2
diff -u -r1.2 GnuDHPublicKey.java
--- gnu/java/security/provider/GnuDHPublicKey.java 17 Feb 2005 18:26:29 -0000 1.2
+++ gnu/java/security/provider/GnuDHPublicKey.java 18 Apr 2005 18:39:42 -0000
@@ -38,18 +38,17 @@
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: gnu/java/security/provider/GnuDSAPrivateKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java,v
retrieving revision 1.6
diff -u -r1.6 GnuDSAPrivateKey.java
--- gnu/java/security/provider/GnuDSAPrivateKey.java 17 Feb 2005 18:26:29 -0000 1.6
+++ gnu/java/security/provider/GnuDSAPrivateKey.java 18 Apr 2005 18:39:42 -0000
@@ -45,13 +45,10 @@
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: gnu/java/security/provider/GnuDSAPublicKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/GnuDSAPublicKey.java,v
retrieving revision 1.6
diff -u -r1.6 GnuDSAPublicKey.java
--- gnu/java/security/provider/GnuDSAPublicKey.java 17 Feb 2005 18:26:29 -0000 1.6
+++ gnu/java/security/provider/GnuDSAPublicKey.java 18 Apr 2005 18:39:42 -0000
@@ -46,13 +46,10 @@
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: gnu/java/security/provider/GnuRSAPrivateKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/GnuRSAPrivateKey.java,v
retrieving revision 1.1
diff -u -r1.1 GnuRSAPrivateKey.java
--- gnu/java/security/provider/GnuRSAPrivateKey.java 15 Nov 2004 20:02:04 -0000 1.1
+++ gnu/java/security/provider/GnuRSAPrivateKey.java 18 Apr 2005 18:39:42 -0000
@@ -38,17 +38,15 @@
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: gnu/java/security/provider/GnuRSAPublicKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/GnuRSAPublicKey.java,v
retrieving revision 1.1
diff -u -r1.1 GnuRSAPublicKey.java
--- gnu/java/security/provider/GnuRSAPublicKey.java 15 Nov 2004 20:02:04 -0000 1.1
+++ gnu/java/security/provider/GnuRSAPublicKey.java 18 Apr 2005 18:39:42 -0000
@@ -38,16 +38,16 @@
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: gnu/java/security/provider/PKIXCertPathValidatorImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java,v
retrieving revision 1.2
diff -u -r1.2 PKIXCertPathValidatorImpl.java
--- gnu/java/security/provider/PKIXCertPathValidatorImpl.java 17 Feb 2005 18:26:29 -0000 1.2
+++ gnu/java/security/provider/PKIXCertPathValidatorImpl.java 18 Apr 2005 18:39:43 -0000
@@ -41,8 +41,8 @@
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.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.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: gnu/java/security/provider/RSA.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/RSA.java,v
retrieving revision 1.1
diff -u -r1.1 RSA.java
--- gnu/java/security/provider/RSA.java 15 Nov 2004 20:02:04 -0000 1.1
+++ gnu/java/security/provider/RSA.java 18 Apr 2005 18:39:43 -0000
@@ -38,11 +38,15 @@
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.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: gnu/java/security/provider/SHA1PRNG.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/SHA1PRNG.java,v
retrieving revision 1.5
diff -u -r1.5 SHA1PRNG.java
--- gnu/java/security/provider/SHA1PRNG.java 11 Feb 2003 00:08:32 -0000 1.5
+++ gnu/java/security/provider/SHA1PRNG.java 18 Apr 2005 18:39:43 -0000
@@ -38,11 +38,11 @@
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: gnu/java/security/provider/SHA1withRSA.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/SHA1withRSA.java,v
retrieving revision 1.1
diff -u -r1.1 SHA1withRSA.java
--- gnu/java/security/provider/SHA1withRSA.java 15 Nov 2004 20:02:04 -0000 1.1
+++ gnu/java/security/provider/SHA1withRSA.java 18 Apr 2005 18:39:43 -0000
@@ -38,11 +38,11 @@
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: gnu/java/security/provider/X509CertificateFactory.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/X509CertificateFactory.java,v
retrieving revision 1.2
diff -u -r1.2 X509CertificateFactory.java
--- gnu/java/security/provider/X509CertificateFactory.java 15 Nov 2004 20:02:04 -0000 1.2
+++ gnu/java/security/provider/X509CertificateFactory.java 18 Apr 2005 18:39:43 -0000
@@ -38,29 +38,27 @@
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: gnu/java/security/x509/GnuPKIExtension.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/GnuPKIExtension.java,v
retrieving revision 1.1
diff -u -r1.1 GnuPKIExtension.java
--- gnu/java/security/x509/GnuPKIExtension.java 15 Nov 2004 20:02:05 -0000 1.1
+++ gnu/java/security/x509/GnuPKIExtension.java 18 Apr 2005 18:39:43 -0000
@@ -38,12 +38,12 @@
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: gnu/java/security/x509/X500DistinguishedName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/X500DistinguishedName.java,v
retrieving revision 1.4
diff -u -r1.4 X500DistinguishedName.java
--- gnu/java/security/x509/X500DistinguishedName.java 17 Feb 2005 18:26:29 -0000 1.4
+++ gnu/java/security/x509/X500DistinguishedName.java 18 Apr 2005 18:39:43 -0000
@@ -38,14 +38,17 @@
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.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: gnu/java/security/x509/X509CRL.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/X509CRL.java,v
retrieving revision 1.4
diff -u -r1.4 X509CRL.java
--- gnu/java/security/x509/X509CRL.java 17 Feb 2005 18:26:30 -0000 1.4
+++ gnu/java/security/x509/X509CRL.java 18 Apr 2005 18:39:43 -0000
@@ -45,23 +45,23 @@
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: gnu/java/security/x509/X509CRLEntry.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/X509CRLEntry.java,v
retrieving revision 1.3
diff -u -r1.3 X509CRLEntry.java
--- gnu/java/security/x509/X509CRLEntry.java 17 Feb 2005 18:26:30 -0000 1.3
+++ gnu/java/security/x509/X509CRLEntry.java 18 Apr 2005 18:39:43 -0000
@@ -38,12 +38,14 @@
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.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: gnu/java/security/x509/X509CertPath.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/X509CertPath.java,v
retrieving revision 1.1
diff -u -r1.1 X509CertPath.java
--- gnu/java/security/x509/X509CertPath.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/X509CertPath.java 18 Apr 2005 18:39:43 -0000
@@ -38,18 +38,21 @@
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.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: gnu/java/security/x509/X509CertSelectorImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/X509CertSelectorImpl.java,v
retrieving revision 1.1
diff -u -r1.1 X509CertSelectorImpl.java
--- gnu/java/security/x509/X509CertSelectorImpl.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/X509CertSelectorImpl.java 18 Apr 2005 18:39:43 -0000
@@ -39,12 +39,10 @@
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: gnu/java/security/x509/X509Certificate.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/X509Certificate.java,v
retrieving revision 1.5
diff -u -r1.5 X509Certificate.java
--- gnu/java/security/x509/X509Certificate.java 17 Feb 2005 18:26:30 -0000 1.5
+++ gnu/java/security/x509/X509Certificate.java 18 Apr 2005 18:39:43 -0000
@@ -38,14 +38,24 @@
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.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 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: gnu/java/security/x509/ext/AuthorityKeyIdentifier.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java,v
retrieving revision 1.2
diff -u -r1.2 AuthorityKeyIdentifier.java
--- gnu/java/security/x509/ext/AuthorityKeyIdentifier.java 17 Feb 2005 18:26:31 -0000 1.2
+++ gnu/java/security/x509/ext/AuthorityKeyIdentifier.java 18 Apr 2005 18:39:43 -0000
@@ -38,15 +38,15 @@
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: gnu/java/security/x509/ext/BasicConstraints.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/BasicConstraints.java,v
retrieving revision 1.1
diff -u -r1.1 BasicConstraints.java
--- gnu/java/security/x509/ext/BasicConstraints.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/BasicConstraints.java 18 Apr 2005 18:39:43 -0000
@@ -38,16 +38,16 @@
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: gnu/java/security/x509/ext/CRLNumber.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/CRLNumber.java,v
retrieving revision 1.1
diff -u -r1.1 CRLNumber.java
--- gnu/java/security/x509/ext/CRLNumber.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/CRLNumber.java 18 Apr 2005 18:39:43 -0000
@@ -38,14 +38,14 @@
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: gnu/java/security/x509/ext/CertificatePolicies.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/CertificatePolicies.java,v
retrieving revision 1.2
diff -u -r1.2 CertificatePolicies.java
--- gnu/java/security/x509/ext/CertificatePolicies.java 17 Feb 2005 18:26:31 -0000 1.2
+++ gnu/java/security/x509/ext/CertificatePolicies.java 18 Apr 2005 18:39:43 -0000
@@ -38,9 +38,13 @@
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.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: gnu/java/security/x509/ext/ExtendedKeyUsage.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/ExtendedKeyUsage.java,v
retrieving revision 1.1
diff -u -r1.1 ExtendedKeyUsage.java
--- gnu/java/security/x509/ext/ExtendedKeyUsage.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/ExtendedKeyUsage.java 18 Apr 2005 18:39:43 -0000
@@ -38,16 +38,16 @@
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: gnu/java/security/x509/ext/Extension.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/Extension.java,v
retrieving revision 1.1
diff -u -r1.1 Extension.java
--- gnu/java/security/x509/ext/Extension.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/Extension.java 18 Apr 2005 18:39:43 -0000
@@ -38,17 +38,17 @@
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: gnu/java/security/x509/ext/GeneralNames.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/GeneralNames.java,v
retrieving revision 1.1
diff -u -r1.1 GeneralNames.java
--- gnu/java/security/x509/ext/GeneralNames.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/GeneralNames.java 18 Apr 2005 18:39:43 -0000
@@ -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 @@
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: gnu/java/security/x509/ext/IssuerAlternativeNames.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/IssuerAlternativeNames.java,v
retrieving revision 1.1
diff -u -r1.1 IssuerAlternativeNames.java
--- gnu/java/security/x509/ext/IssuerAlternativeNames.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/IssuerAlternativeNames.java 18 Apr 2005 18:39:43 -0000
@@ -38,9 +38,10 @@
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: gnu/java/security/x509/ext/KeyUsage.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/KeyUsage.java,v
retrieving revision 1.1
diff -u -r1.1 KeyUsage.java
--- gnu/java/security/x509/ext/KeyUsage.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/KeyUsage.java 18 Apr 2005 18:39:43 -0000
@@ -38,14 +38,14 @@
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: gnu/java/security/x509/ext/PolicyConstraint.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/PolicyConstraint.java,v
retrieving revision 1.2
diff -u -r1.2 PolicyConstraint.java
--- gnu/java/security/x509/ext/PolicyConstraint.java 17 Feb 2005 18:26:31 -0000 1.2
+++ gnu/java/security/x509/ext/PolicyConstraint.java 18 Apr 2005 18:39:43 -0000
@@ -38,13 +38,13 @@
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: gnu/java/security/x509/ext/PolicyMappings.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/PolicyMappings.java,v
retrieving revision 1.1
diff -u -r1.1 PolicyMappings.java
--- gnu/java/security/x509/ext/PolicyMappings.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/PolicyMappings.java 18 Apr 2005 18:39:43 -0000
@@ -38,16 +38,16 @@
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: gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java,v
retrieving revision 1.1
diff -u -r1.1 PrivateKeyUsagePeriod.java
--- gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java 18 Apr 2005 18:39:43 -0000
@@ -38,14 +38,14 @@
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: gnu/java/security/x509/ext/ReasonCode.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/ReasonCode.java,v
retrieving revision 1.1
diff -u -r1.1 ReasonCode.java
--- gnu/java/security/x509/ext/ReasonCode.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/ReasonCode.java 18 Apr 2005 18:39:43 -0000
@@ -38,14 +38,14 @@
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: gnu/java/security/x509/ext/SubjectAlternativeNames.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/SubjectAlternativeNames.java,v
retrieving revision 1.1
diff -u -r1.1 SubjectAlternativeNames.java
--- gnu/java/security/x509/ext/SubjectAlternativeNames.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/SubjectAlternativeNames.java 18 Apr 2005 18:39:43 -0000
@@ -38,11 +38,11 @@
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: gnu/java/security/x509/ext/SubjectKeyIdentifier.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/x509/ext/SubjectKeyIdentifier.java,v
retrieving revision 1.1
diff -u -r1.1 SubjectKeyIdentifier.java
--- gnu/java/security/x509/ext/SubjectKeyIdentifier.java 15 Nov 2004 20:02:06 -0000 1.1
+++ gnu/java/security/x509/ext/SubjectKeyIdentifier.java 18 Apr 2005 18:39:43 -0000
@@ -38,14 +38,14 @@
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
{
More information about the Java-patches
mailing list