[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small cleanups in gnu.*

Kaffe CVS cvs-commits at kaffe.org
Fri Oct 15 04:30:54 PDT 2004


PatchSet 5293 
Date: 2004/10/15 10:41:39
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small cleanups in gnu.*

2004-10-15  Dalibor Topic <robilad at kaffe.org>

        * libraries/javalib/gnu/java/awt/BitwiseXORComposite.java,
        libraries/javalib/gnu/java/awt/ClasspathToolkit.java,
        libraries/javalib/gnu/java/awt/image/XBMDecoder.java,
        libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java,
        libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java,
        libraries/javalib/gnu/java/net/protocol/http/Connection.java,
        libraries/javalib/gnu/java/nio/NIODatagramSocket.java,
        libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java,
        libraries/javalib/gnu/java/nio/charset/UTF_16.java,
        libraries/javalib/gnu/java/nio/charset/UTF_16BE.java,
        libraries/javalib/gnu/java/nio/charset/UTF_16LE.java,
        libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java,
        libraries/javalib/gnu/java/rmi/rmic/RMIC.java,
        libraries/javalib/gnu/java/rmi/server/RMIHashes.java,
        libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java,
        libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java,
        libraries/javalib/gnu/java/rmi/server/UnicastConnection.java,
        libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java,
        libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java,
        libraries/javalib/gnu/java/rmi/server/UnicastServer.java,
        libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java,
        libraries/javalib/gnu/java/security/OID.java,
        libraries/javalib/gnu/java/security/provider/DSAParameters.java,
        libraries/javalib/gnu/java/security/provider/DSASignature.java,
        libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java,
        libraries/javalib/gnu/java/security/x509/X509CRL.java,
        libraries/javalib/gnu/javax/rmi/PortableServer.java,
        libraries/javalib/gnu/javax/rmi/CORBA/DelegateFactory.java,
        libraries/javalib/gnu/javax/rmi/CORBA/GetDelegateInstanceException.java,
        libraries/javalib/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java,
        libraries/javalib/gnu/javax/rmi/CORBA/StubDelegateImpl.java:
        Resynced with GNU Classpath.
        2004-10-13  Michael Koch  <konqueror at gmx.de>

        * gnu/java/awt/BitwiseXORComposite.java,
        gnu/java/awt/ClasspathToolkit.java,
        gnu/java/awt/image/XBMDecoder.java,
        gnu/java/awt/peer/GLightweightPeer.java,
        gnu/java/awt/peer/gtk/GdkGlyphVector.java,
        gnu/java/net/protocol/http/Connection.java,
        gnu/java/nio/NIODatagramSocket.java,
        gnu/java/nio/ServerSocketChannelImpl.java,
        gnu/java/nio/charset/UTF_16.java,
        gnu/java/nio/charset/UTF_16BE.java,
        gnu/java/nio/charset/UTF_16LE.java,
        gnu/java/rmi/RMIMarshalledObjectOutputStream.java,
        gnu/java/rmi/rmic/RMIC.java,
        gnu/java/rmi/server/RMIHashes.java,
        gnu/java/rmi/server/RMIObjectInputStream.java,
        gnu/java/rmi/server/RMIObjectOutputStream.java,
        gnu/java/rmi/server/UnicastConnection.java,
        gnu/java/rmi/server/UnicastConnectionManager.java,
        gnu/java/rmi/server/UnicastRemoteCall.java,
        gnu/java/rmi/server/UnicastServer.java,
        gnu/java/rmi/server/UnicastServerRef.java,
        gnu/java/security/OID.java,
        gnu/java/security/provider/DSAParameters.java,
        gnu/java/security/provider/DSASignature.java,
        gnu/java/security/x509/X500DistinguishedName.java,
        gnu/java/security/x509/X509CRL.java,
        gnu/javax/rmi/CORBA/DelegateFactory.java,
        gnu/javax/rmi/CORBA/GetDelegateInstanceException.java,
        gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java,
        gnu/javax/rmi/CORBA/StubDelegateImpl.java,
        gnu/javax/rmi/PortableServer.java:
        Reorganized import statements.

Members: 
	ChangeLog:1.2845->1.2846 
	libraries/javalib/gnu/java/awt/BitwiseXORComposite.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.3->1.4 
	libraries/javalib/gnu/java/awt/image/XBMDecoder.java:1.1->1.2 
	libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.2->1.3 
	libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java:1.3->1.4 
	libraries/javalib/gnu/java/net/protocol/http/Connection.java:1.12->1.13 
	libraries/javalib/gnu/java/nio/NIODatagramSocket.java:1.4->1.5 
	libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.8->1.9 
	libraries/javalib/gnu/java/nio/charset/UTF_16.java:1.3->1.4 
	libraries/javalib/gnu/java/nio/charset/UTF_16BE.java:1.3->1.4 
	libraries/javalib/gnu/java/nio/charset/UTF_16LE.java:1.3->1.4 
	libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java:1.2->1.3 
	libraries/javalib/gnu/java/rmi/rmic/RMIC.java:1.5->1.6 
	libraries/javalib/gnu/java/rmi/server/RMIHashes.java:1.3->1.4 
	libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:1.3->1.4 
	libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:1.3->1.4 
	libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:1.4->1.5 
	libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.6->1.7 
	libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.6->1.7 
	libraries/javalib/gnu/java/rmi/server/UnicastServer.java:1.5->1.6 
	libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.7->1.8 
	libraries/javalib/gnu/java/security/OID.java:1.2->1.3 
	libraries/javalib/gnu/java/security/provider/DSAParameters.java:1.1->1.2 
	libraries/javalib/gnu/java/security/provider/DSASignature.java:1.1->1.2 
	libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java:1.3->1.4 
	libraries/javalib/gnu/java/security/x509/X509CRL.java:1.1->1.2 
	libraries/javalib/gnu/javax/rmi/PortableServer.java:1.2->1.3 
	libraries/javalib/gnu/javax/rmi/CORBA/DelegateFactory.java:1.3->1.4 
	libraries/javalib/gnu/javax/rmi/CORBA/GetDelegateInstanceException.java:1.2->1.3 
	libraries/javalib/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java:1.2->1.3 
	libraries/javalib/gnu/javax/rmi/CORBA/StubDelegateImpl.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2845 kaffe/ChangeLog:1.2846
--- kaffe/ChangeLog:1.2845	Fri Oct 15 09:55:34 2004
+++ kaffe/ChangeLog	Fri Oct 15 10:41:39 2004
@@ -1,5 +1,75 @@
 2004-10-15  Dalibor Topic <robilad at kaffe.org>
 
+	* libraries/javalib/gnu/java/awt/BitwiseXORComposite.java,
+	libraries/javalib/gnu/java/awt/ClasspathToolkit.java,
+	libraries/javalib/gnu/java/awt/image/XBMDecoder.java,
+	libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java,
+	libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java,
+	libraries/javalib/gnu/java/net/protocol/http/Connection.java,
+	libraries/javalib/gnu/java/nio/NIODatagramSocket.java,
+	libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java,
+	libraries/javalib/gnu/java/nio/charset/UTF_16.java,
+	libraries/javalib/gnu/java/nio/charset/UTF_16BE.java,
+	libraries/javalib/gnu/java/nio/charset/UTF_16LE.java,
+	libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java,
+	libraries/javalib/gnu/java/rmi/rmic/RMIC.java,
+	libraries/javalib/gnu/java/rmi/server/RMIHashes.java,
+	libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java,
+	libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastConnection.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastServer.java,
+	libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java,
+	libraries/javalib/gnu/java/security/OID.java,
+	libraries/javalib/gnu/java/security/provider/DSAParameters.java,
+	libraries/javalib/gnu/java/security/provider/DSASignature.java,
+	libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java,
+	libraries/javalib/gnu/java/security/x509/X509CRL.java,
+	libraries/javalib/gnu/javax/rmi/PortableServer.java,
+	libraries/javalib/gnu/javax/rmi/CORBA/DelegateFactory.java,
+	libraries/javalib/gnu/javax/rmi/CORBA/GetDelegateInstanceException.java,
+	libraries/javalib/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java,
+	libraries/javalib/gnu/javax/rmi/CORBA/StubDelegateImpl.java:
+	Resynced with GNU Classpath.
+
+	2004-10-13  Michael Koch  <konqueror at gmx.de>
+
+        * gnu/java/awt/BitwiseXORComposite.java,
+        gnu/java/awt/ClasspathToolkit.java,
+        gnu/java/awt/image/XBMDecoder.java,
+        gnu/java/awt/peer/GLightweightPeer.java,
+        gnu/java/awt/peer/gtk/GdkGlyphVector.java,
+        gnu/java/net/protocol/http/Connection.java,
+        gnu/java/nio/NIODatagramSocket.java,
+        gnu/java/nio/ServerSocketChannelImpl.java,
+        gnu/java/nio/charset/UTF_16.java,
+        gnu/java/nio/charset/UTF_16BE.java,
+        gnu/java/nio/charset/UTF_16LE.java,
+        gnu/java/rmi/RMIMarshalledObjectOutputStream.java,
+        gnu/java/rmi/rmic/RMIC.java,
+        gnu/java/rmi/server/RMIHashes.java,
+        gnu/java/rmi/server/RMIObjectInputStream.java,
+        gnu/java/rmi/server/RMIObjectOutputStream.java,
+        gnu/java/rmi/server/UnicastConnection.java,
+        gnu/java/rmi/server/UnicastConnectionManager.java,
+        gnu/java/rmi/server/UnicastRemoteCall.java,
+        gnu/java/rmi/server/UnicastServer.java,
+        gnu/java/rmi/server/UnicastServerRef.java,
+        gnu/java/security/OID.java,
+        gnu/java/security/provider/DSAParameters.java,
+        gnu/java/security/provider/DSASignature.java,
+        gnu/java/security/x509/X500DistinguishedName.java,
+        gnu/java/security/x509/X509CRL.java,
+        gnu/javax/rmi/CORBA/DelegateFactory.java,
+        gnu/javax/rmi/CORBA/GetDelegateInstanceException.java,
+        gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java,
+        gnu/javax/rmi/CORBA/StubDelegateImpl.java,
+        gnu/javax/rmi/PortableServer.java:
+        Reorganized import statements.
+
+2004-10-15  Dalibor Topic <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/gnu/java/awt/BitwiseXORComposite.java
diff -u kaffe/libraries/javalib/gnu/java/awt/BitwiseXORComposite.java:1.1 kaffe/libraries/javalib/gnu/java/awt/BitwiseXORComposite.java:1.2
--- kaffe/libraries/javalib/gnu/java/awt/BitwiseXORComposite.java:1.1	Thu Jul 22 19:20:08 2004
+++ kaffe/libraries/javalib/gnu/java/awt/BitwiseXORComposite.java	Fri Oct 15 10:41:40 2004
@@ -1,5 +1,5 @@
 /* BitwiseXORComposite.java -- Composite for emulating old-style XOR.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,7 +41,6 @@
 import java.awt.Color;
 import java.awt.Composite;
 import java.awt.CompositeContext;
-import java.awt.Graphics;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.image.ColorModel;
Index: kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java
diff -u kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.3 kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.4
--- kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.3	Sat Oct  9 22:18:47 2004
+++ kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java	Fri Oct 15 10:41:40 2004
@@ -1,5 +1,5 @@
 /* ClasspathToolkit.java -- Abstract superclass for Classpath toolkits.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,29 +38,26 @@
 
 package gnu.java.awt;
 
+import gnu.java.awt.peer.ClasspathFontPeer;
+import gnu.java.awt.peer.ClasspathTextLayoutPeer;
+
 import java.awt.Image;
 import java.awt.Dimension;
 import java.awt.DisplayMode;
 import java.awt.Font;
-import java.awt.FontFormatException;
 import java.awt.FontMetrics;
 import java.awt.GraphicsEnvironment;
-import java.awt.HeadlessException;
 import java.awt.Toolkit;
 import java.awt.font.FontRenderContext;
 import java.awt.image.ColorModel;
 import java.awt.image.ImageProducer;
 import java.io.File;
 import java.io.InputStream;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.AttributedString;
 import java.util.HashMap;
 import java.util.Map;
-
-import gnu.java.awt.peer.ClasspathFontPeer;
-import gnu.java.awt.peer.ClasspathTextLayoutPeer;
 
 
 /**
Index: kaffe/libraries/javalib/gnu/java/awt/image/XBMDecoder.java
diff -u kaffe/libraries/javalib/gnu/java/awt/image/XBMDecoder.java:1.1 kaffe/libraries/javalib/gnu/java/awt/image/XBMDecoder.java:1.2
--- kaffe/libraries/javalib/gnu/java/awt/image/XBMDecoder.java:1.1	Thu Jul 22 19:20:11 2004
+++ kaffe/libraries/javalib/gnu/java/awt/image/XBMDecoder.java	Fri Oct 15 10:41:41 2004
@@ -1,5 +1,5 @@
 /* XBMDecoder -- Decodes X-bitmaps
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,13 +35,19 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.awt.image;
 
-import java.awt.*;
-import java.awt.image.*;
-import java.util.*;
-import java.io.*;
+import java.awt.image.ColorModel;
+import java.awt.image.ImageConsumer;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.Reader;
 import java.net.URL;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
 public class XBMDecoder extends ImageDecoder
 {
Index: kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.2	Sun Aug  8 19:45:54 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java	Fri Oct 15 10:41:41 2004
@@ -35,6 +35,7 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.awt.peer;
 
 import java.awt.AWTEvent;
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java:1.3 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java:1.4
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java:1.3	Sat Oct  9 22:18:49 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGlyphVector.java	Fri Oct 15 10:41:42 2004
@@ -50,14 +50,6 @@
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.text.AttributedCharacterIterator;
-import java.text.CharacterIterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
 
 public class GdkGlyphVector extends GlyphVector
 {
Index: kaffe/libraries/javalib/gnu/java/net/protocol/http/Connection.java
diff -u kaffe/libraries/javalib/gnu/java/net/protocol/http/Connection.java:1.12 kaffe/libraries/javalib/gnu/java/net/protocol/http/Connection.java:1.13
--- kaffe/libraries/javalib/gnu/java/net/protocol/http/Connection.java:1.12	Sun Aug  8 19:45:57 2004
+++ kaffe/libraries/javalib/gnu/java/net/protocol/http/Connection.java	Fri Oct 15 10:41:42 2004
@@ -39,6 +39,9 @@
 
 package gnu.java.net.protocol.http;
 
+import gnu.java.net.HeaderFieldHelper;
+import gnu.java.security.action.GetPropertyAction;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
@@ -52,14 +55,11 @@
 import java.net.ProtocolException;
 import java.net.Socket;
 import java.net.URL;
-import java.net.URLConnection;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import gnu.java.net.HeaderFieldHelper;
-import gnu.java.security.action.GetPropertyAction;
 
 /**
  * This subclass of java.net.URLConnection models a URLConnection via
Index: kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java
diff -u kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java:1.4 kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java:1.5
--- kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java:1.4	Mon Apr 12 11:40:22 2004
+++ kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java	Fri Oct 15 10:41:42 2004
@@ -39,7 +39,7 @@
 package gnu.java.nio;
 
 import gnu.java.net.PlainDatagramSocketImpl;
-import java.io.IOException;
+
 import java.net.DatagramSocket;
 import java.nio.channels.DatagramChannel;
 
Index: kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.8 kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.9
--- kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.8	Mon Apr 12 11:40:23 2004
+++ kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java	Fri Oct 15 10:41:42 2004
@@ -38,13 +38,8 @@
 
 package gnu.java.nio;
 
-import gnu.java.net.PlainSocketImpl;
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.NotYetBoundException;
Index: kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16.java:1.3 kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16.java:1.4
--- kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16.java:1.3	Mon Apr 12 11:40:24 2004
+++ kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16.java	Fri Oct 15 10:41:44 2004
@@ -1,5 +1,5 @@
 /* UTF_16.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,14 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.nio.charset;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 
 /**
  * UTF-16 charset.
Index: kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16BE.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16BE.java:1.3 kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16BE.java:1.4
--- kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16BE.java:1.3	Mon Apr 12 11:40:24 2004
+++ kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16BE.java	Fri Oct 15 10:41:44 2004
@@ -1,5 +1,5 @@
 /* UTF_16BE.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,14 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.nio.charset;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 
 /**
  * UTF-16BE charset.
Index: kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16LE.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16LE.java:1.3 kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16LE.java:1.4
--- kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16LE.java:1.3	Mon Apr 12 11:40:24 2004
+++ kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16LE.java	Fri Oct 15 10:41:44 2004
@@ -1,5 +1,5 @@
 /* UTF_16LE.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,14 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.nio.charset;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 
 /**
  * UTF-16LE charset.
Index: kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java:1.2 kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java:1.3
--- kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java:1.2	Mon Mar 22 11:24:20 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/RMIMarshalledObjectOutputStream.java	Fri Oct 15 10:41:44 2004
@@ -1,5 +1,5 @@
 /* gnu.java.rmi.RMIMarshalledObjectOutputStream
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -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: kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java:1.5 kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java:1.6
--- kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java:1.5	Mon Oct  4 14:46:20 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/rmic/RMIC.java	Fri Oct 15 10:41:45 2004
@@ -36,15 +36,16 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.rmic;
 
 import gnu.java.rmi.server.RMIHashes;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.rmi.RemoteException;
 import java.util.Arrays;
 import java.util.HashSet;
Index: kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java:1.3 kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java:1.4
--- kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java:1.3	Mon Oct  4 14:46:20 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/RMIHashes.java	Fri Oct 15 10:41:45 2004
@@ -1,5 +1,5 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* RMIHashes.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,15 +35,15 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
-import java.lang.reflect.Method;
-import gnu.java.io.NullOutputStream;
 import gnu.java.lang.reflect.TypeSignature;
-import java.security.MessageDigest;
-import java.security.DigestOutputStream;
-import java.io.DataOutputStream;
+
 import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.lang.reflect.Method;
+import java.security.MessageDigest;
 
 public class RMIHashes
 {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:1.3 kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:1.4
--- kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java:1.3	Mon Oct  4 14:46:20 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectInputStream.java	Fri Oct 15 10:41:45 2004
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* RMIObjectInputStream.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,14 +36,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
-import java.io.ObjectStreamClass;
-import java.io.ObjectInputStream;
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
 import java.lang.reflect.Proxy;
-import java.net.URL;
 import java.net.MalformedURLException;
 import java.rmi.server.RMIClassLoader;
 
Index: kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:1.3 kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:1.4
--- kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java:1.3	Mon Oct  4 14:46:20 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/RMIObjectOutputStream.java	Fri Oct 15 10:41:45 2004
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* RMIObjectOutputStream.java -
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,15 +36,15 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
+import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-import java.rmi.server.RMIClassLoader;
 import java.rmi.Remote;
 import java.rmi.server.RemoteStub;
-import java.rmi.server.ObjID;
+import java.rmi.server.RMIClassLoader;
 
 public class RMIObjectOutputStream
 	extends ObjectOutputStream {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:1.4 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:1.5
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java:1.4	Mon Oct  4 14:46:20 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnection.java	Fri Oct 15 10:41:45 2004
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* UnicastConnection.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,19 +36,17 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
 import java.net.Socket;
-import java.net.ServerSocket;
 import java.rmi.RemoteException;
 
 public class UnicastConnection 
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.6 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.7
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java:1.6	Sat Oct  9 22:18:52 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastConnectionManager.java	Fri Oct 15 10:41:45 2004
@@ -36,28 +36,28 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
-import java.rmi.server.RMISocketFactory;
-import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.RMIClientSocketFactory;
-import java.rmi.RemoteException;
+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.DataInputStream;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.ServerSocket;
 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.util.ArrayList;
 import java.util.ConcurrentModificationException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
-
-import gnu.java.rmi.server.UnicastConnection;
-import gnu.java.rmi.server.RMIIncomingThread;
 
 public class UnicastConnectionManager
 	implements Runnable, ProtocolConstants {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.6 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.7
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.6	Mon Oct  4 14:46:21 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java	Fri Oct 15 10:41:45 2004
@@ -1,5 +1,5 @@
 /* UnicastRemoteCall.java
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,22 +35,21 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.ObjectOutput;
 import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.io.StreamCorruptedException;
-import java.rmi.server.RemoteCall;
 import java.rmi.RemoteException;
 import java.rmi.MarshalException;
 import java.rmi.UnmarshalException;
-import java.rmi.server.UID;
+import java.rmi.server.RemoteCall;
 import java.rmi.server.ObjID;
-import java.rmi.server.RemoteObject;
-
+import java.rmi.server.UID;
 import java.util.Vector;
 
 public class UnicastRemoteCall
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java:1.5 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java:1.6
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java:1.5	Tue Sep 21 12:05:12 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java	Fri Oct 15 10:41:45 2004
@@ -1,5 +1,6 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* UnicastServer.java --
+   Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,25 +36,22 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
-import java.io.DataInputStream;
+import gnu.java.rmi.dgc.DGCImpl;
+
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.Hashtable;
-import java.net.UnknownHostException;
+import java.rmi.NoSuchObjectException;
 import java.rmi.Remote;
+import java.rmi.RemoteException;
 import java.rmi.ServerError;
 import java.rmi.server.ObjID;
-import java.rmi.server.UnicastRemoteObject;
 import java.rmi.server.UID;
-import java.rmi.server.RemoteRef;
-import java.rmi.RemoteException;
-import java.rmi.NoSuchObjectException;
-import gnu.java.rmi.dgc.DGCImpl;
+import java.util.Hashtable;
 
 public class UnicastServer
 	implements ProtocolConstants {
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.7 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.8
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.7	Mon Oct  4 14:46:21 2004
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java	Fri Oct 15 10:41:46 2004
@@ -36,12 +36,13 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.rmi.server;
 
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.io.ObjectInputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.rmi.server.RemoteStub;
@@ -50,21 +51,8 @@
 import java.rmi.server.RemoteServer;
 import java.rmi.server.RemoteRef;
 import java.rmi.server.ServerNotActiveException;
-import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.UID;
 import java.rmi.server.Skeleton;
-import java.rmi.server.RemoteCall;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.io.IOException;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.util.Hashtable;
 
 public class UnicastServerRef
Index: kaffe/libraries/javalib/gnu/java/security/OID.java
diff -u kaffe/libraries/javalib/gnu/java/security/OID.java:1.2 kaffe/libraries/javalib/gnu/java/security/OID.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/OID.java:1.2	Mon Mar 22 11:24:24 2004
+++ kaffe/libraries/javalib/gnu/java/security/OID.java	Fri Oct 15 10:41:46 2004
@@ -1,5 +1,5 @@
 /* OID.java -- numeric representation of an object identifier
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +7,7 @@
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -41,8 +41,8 @@
 import gnu.java.security.der.DEREncodingException;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
+import java.io.IOException;
 import java.util.StringTokenizer;
 
 /**
@@ -63,7 +63,7 @@
  * <p>OIDs may be relative, in which case the first two elements of the
  * OID are omitted.
  *
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
  */
 public class OID implements Cloneable, Comparable, java.io.Serializable
 {
@@ -334,7 +334,7 @@
 
   /* Nice idea, but possibly too expensive for whatever benefit it
    * provides.
-   
+
   public String getShortName()
   {
     return OIDTable.getShortName(this);
@@ -389,8 +389,8 @@
    */
   public boolean equals(Object o)
   {
-    if (this == o)
-      return true;
+    if (!(o instanceof OID))
+      return false;
     return java.util.Arrays.equals(components, ((OID) o).components);
   }
 
@@ -409,7 +409,7 @@
    */
   public int compareTo(Object o)
   {
-    if (o == this)
+    if (equals(o))
       return 0;
     int[] components2 = ((OID) o).components;
     int len = Math.min(components.length, components2.length);
Index: kaffe/libraries/javalib/gnu/java/security/provider/DSAParameters.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/DSAParameters.java:1.1 kaffe/libraries/javalib/gnu/java/security/provider/DSAParameters.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/provider/DSAParameters.java:1.1	Sat Sep 25 16:39:58 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/DSAParameters.java	Fri Oct 15 10:41:46 2004
@@ -1,5 +1,5 @@
 /* DSAParameters.java --- DSA Parameters Implementation
-   Copyright (C) 1999,2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 20032, 004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,30 +38,20 @@
 
 package gnu.java.security.provider;
 
-import java.io.ByteArrayInputStream;
+import gnu.java.io.ASN1ParsingException;
+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.AlgorithmParametersSpi;
-import java.security.InvalidAlgorithmParameterException;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.DSAParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
-
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import gnu.java.io.ASN1ParsingException;
-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 gnu.java.security.der.DERWriter;
-
-import gnu.java.security.util.Prime;
 
 /*
 	ASN.1 Encoding for DSA from rfc2459 
Index: kaffe/libraries/javalib/gnu/java/security/provider/DSASignature.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/DSASignature.java:1.1 kaffe/libraries/javalib/gnu/java/security/provider/DSASignature.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/provider/DSASignature.java:1.1	Sat Sep 25 16:39:58 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/DSASignature.java	Fri Oct 15 10:41:46 2004
@@ -1,5 +1,5 @@
-/* DSASignature.java
-   Copyright (C) 1999,2003 Free Software Foundation, Inc.
+/* DSASignature.java --
+   Copyright (C) 1999, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,14 +35,17 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.security.provider;
 
-import java.io.ByteArrayInputStream;
+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.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.InvalidParameterException;
@@ -57,17 +60,8 @@
 import java.security.interfaces.DSAPrivateKey;
 import java.security.interfaces.DSAPublicKey;
 import java.security.spec.AlgorithmParameterSpec;
-
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Random;
-
-import gnu.java.io.ASN1ParsingException;
-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 gnu.java.security.der.DERWriter;
 
 public class DSASignature extends SignatureSpi
 {
Index: kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java:1.3 kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java:1.4
--- kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java:1.3	Sat Sep 25 16:40:01 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java	Fri Oct 15 10:41:47 2004
@@ -1,5 +1,5 @@
 /* X500DistinguishedName.java -- X.500 name.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,24 +38,21 @@
 
 package gnu.java.security.x509;
 
+import gnu.java.io.ASN1ParsingException;
+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.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

*** Patch too long, truncated ***



More information about the kaffe mailing list