This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: automated libgcj/classpath comparison
- From: tromey at redhat dot com (Tom Tromey)
- To: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Date: Tue, 13 Apr 2004 06:34:39 -0600 (MDT)
- Subject: Patch: FYI: automated libgcj/classpath comparison
This is an automated classpath/libgcj comparison check-in.
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* libgcj-classpath-compare.html: Rebuilt.
Index: libgcj-classpath-compare.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/libgcj-classpath-compare.html,v
retrieving revision 1.231
diff -u -r1.231 libgcj-classpath-compare.html
--- libgcj-classpath-compare.html 3 Apr 2004 14:28:18 -0000 1.231
+++ libgcj-classpath-compare.html 13 Apr 2004 12:46:06 -0000
@@ -9,7 +9,7 @@
<p>This page compares the "current" cvs libgcj against the "current"
cvs Classpath. It was generated using the <code>gen-classpath-compare</code>
script (available in gcc cvs repository in <code>wwwdocs/bin/</code>) on
-2004-04-03.
+2004-04-13.
This table intentionally omits certain classes which are not of
interest. If the third column shows a "Diff" link, then that means
the script believes that the class has been merged, but a difference
@@ -34,30 +34,54 @@
<tr> <td class="needsmerge">gnu.java.net.protocol.http.Connection</td> <td class="needsmerge"><a href="compare/gnu.java.net.protocol.http.Connection.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">gnu.java.net.protocol.jar.Connection</td> <td class="needsmerge"><a href="compare/gnu.java.net.protocol.jar.Connection.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">gnu.java.nio.FileLockImpl</td> <td class="needsmerge"><a href="compare/gnu.java.nio.FileLockImpl.diff">Diff</a></td> </tr>
-<tr> <td class="libgcj-only">gnu.java.nio.channels.FileChannelImpl</td> <td class="libgcj-only">GCJ-only</td> </tr>
+<tr> <td class="needsmerge">gnu.java.nio.channels.FileChannelImpl</td> <td class="needsmerge"><a href="compare/gnu.java.nio.channels.FileChannelImpl.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.awt.FontMetrics</td> <td class="needsmerge"><a href="compare/java.awt.FontMetrics.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.awt.Graphics</td> <td class="needsmerge"><a href="compare/java.awt.Graphics.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.awt.Polygon</td> <td class="needsmerge"><a href="compare/java.awt.Polygon.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.awt.event.MouseEvent</td> <td class="needsmerge"><a href="compare/java.awt.event.MouseEvent.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.awt.image.PixelGrabber</td> <td class="needsmerge"><a href="compare/java.awt.image.PixelGrabber.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.awt.image.Raster</td> <td class="needsmerge"><a href="compare/java.awt.image.Raster.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.awt.image.SampleModel</td> <td class="needsmerge"><a href="compare/java.awt.image.SampleModel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.awt.image.SinglePixelPackedSampleModel</td> <td class="needsmerge"><a href="compare/java.awt.image.SinglePixelPackedSampleModel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.BufferedWriter</td> <td class="needsmerge"><a href="compare/java.io.BufferedWriter.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.ByteArrayInputStream</td> <td class="needsmerge"><a href="compare/java.io.ByteArrayInputStream.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.CharArrayWriter</td> <td class="needsmerge"><a href="compare/java.io.CharArrayWriter.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.DataInput</td> <td class="needsmerge"><a href="compare/java.io.DataInput.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.DataInputStream</td> <td class="needsmerge"><a href="compare/java.io.DataInputStream.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.io.File</td> <td class="needsmerge"><a href="compare/java.io.File.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.io.FileDescriptor</td> <td class="needsmerge"><a href="compare/java.io.FileDescriptor.diff">Diff</a></td> </tr>
-<tr> <td class="needsmerge">java.io.FileInputStream</td> <td class="needsmerge"><a href="compare/java.io.FileInputStream.diff">Diff</a></td> </tr>
-<tr> <td class="needsmerge">java.io.FileOutputStream</td> <td class="needsmerge"><a href="compare/java.io.FileOutputStream.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.FilterInputStream</td> <td class="needsmerge"><a href="compare/java.io.FilterInputStream.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.InputStream</td> <td class="needsmerge"><a href="compare/java.io.InputStream.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.io.InputStreamReader</td> <td class="needsmerge"><a href="compare/java.io.InputStreamReader.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.io.ObjectInputStream</td> <td class="needsmerge"><a href="compare/java.io.ObjectInputStream.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.ObjectStreamClass</td> <td class="needsmerge"><a href="compare/java.io.ObjectStreamClass.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.ObjectStreamField</td> <td class="needsmerge"><a href="compare/java.io.ObjectStreamField.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.io.OutputStreamWriter</td> <td class="needsmerge"><a href="compare/java.io.OutputStreamWriter.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.PipedInputStream</td> <td class="needsmerge"><a href="compare/java.io.PipedInputStream.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.PipedReader</td> <td class="needsmerge"><a href="compare/java.io.PipedReader.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.io.PrintStream</td> <td class="needsmerge"><a href="compare/java.io.PrintStream.diff">Diff</a></td> </tr>
-<tr> <td class="needsmerge">java.io.RandomAccessFile</td> <td class="needsmerge"><a href="compare/java.io.RandomAccessFile.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.PushbackReader</td> <td class="needsmerge"><a href="compare/java.io.PushbackReader.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.SerializablePermission</td> <td class="needsmerge"><a href="compare/java.io.SerializablePermission.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.StreamTokenizer</td> <td class="needsmerge"><a href="compare/java.io.StreamTokenizer.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.StringWriter</td> <td class="needsmerge"><a href="compare/java.io.StringWriter.diff">Diff</a></td> </tr>
<tr> <td class="VM-specific">java.io.VMObjectStreamClass</td> <td class="VM-specific">VM-specific</td> </tr>
+<tr> <td class="needsmerge">java.io.WriteAbortedException</td> <td class="needsmerge"><a href="compare/java.io.WriteAbortedException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.io.Writer</td> <td class="needsmerge"><a href="compare/java.io.Writer.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.lang.Character</td> <td class="needsmerge"><a href="compare/java.lang.Character.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.lang.Class</td> <td class="needsmerge"><a href="compare/java.lang.Class.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.lang.ClassLoader</td> <td class="needsmerge"><a href="compare/java.lang.ClassLoader.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.lang.Compiler</td> <td class="needsmerge"><a href="compare/java.lang.Compiler.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.lang.Double</td> <td class="needsmerge"><a href="compare/java.lang.Double.diff">Diff</a></td> </tr>
<tr> <td class="GCJ-specific">java.lang.EcosProcess</td> <td class="GCJ-specific">GCJ-specific</td> </tr>
<tr> <td class="needsmerge">java.lang.Float</td> <td class="needsmerge"><a href="compare/java.lang.Float.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.lang.Long</td> <td class="needsmerge"><a href="compare/java.lang.Long.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.lang.Math</td> <td class="needsmerge"><a href="compare/java.lang.Math.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.lang.Object</td> <td class="needsmerge"><a href="compare/java.lang.Object.diff">Diff</a></td> </tr>
<tr> <td class="GCJ-specific">java.lang.PosixProcess</td> <td class="GCJ-specific">GCJ-specific</td> </tr>
<tr> <td class="needsmerge">java.lang.Runtime</td> <td class="needsmerge"><a href="compare/java.lang.Runtime.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.lang.RuntimePermission</td> <td class="needsmerge"><a href="compare/java.lang.RuntimePermission.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.lang.SecurityManager</td> <td class="needsmerge"><a href="compare/java.lang.SecurityManager.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.lang.Short</td> <td class="needsmerge"><a href="compare/java.lang.Short.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.lang.String</td> <td class="needsmerge"><a href="compare/java.lang.String.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.lang.StringBuffer</td> <td class="needsmerge"><a href="compare/java.lang.StringBuffer.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.lang.System</td> <td class="needsmerge"><a href="compare/java.lang.System.diff">Diff</a></td> </tr>
@@ -70,20 +94,113 @@
<tr> <td class="needsmerge">java.lang.reflect.Array</td> <td class="needsmerge"><a href="compare/java.lang.reflect.Array.diff">Diff</a></td> </tr>
<tr> <td class="VM-specific">java.lang.reflect.Constructor</td> <td class="VM-specific">VM-specific</td> </tr>
<tr> <td class="VM-specific">java.lang.reflect.Field</td> <td class="VM-specific">VM-specific</td> </tr>
+<tr> <td class="needsmerge">java.lang.reflect.InvocationHandler</td> <td class="needsmerge"><a href="compare/java.lang.reflect.InvocationHandler.diff">Diff</a></td> </tr>
<tr> <td class="VM-specific">java.lang.reflect.Method</td> <td class="VM-specific">VM-specific</td> </tr>
<tr> <td class="needsmerge">java.lang.reflect.Modifier</td> <td class="needsmerge"><a href="compare/java.lang.reflect.Modifier.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.lang.reflect.Proxy</td> <td class="needsmerge"><a href="compare/java.lang.reflect.Proxy.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.Authenticator</td> <td class="needsmerge"><a href="compare/java.net.Authenticator.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.BindException</td> <td class="needsmerge"><a href="compare/java.net.BindException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.ConnectException</td> <td class="needsmerge"><a href="compare/java.net.ConnectException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.ContentHandler</td> <td class="needsmerge"><a href="compare/java.net.ContentHandler.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.ContentHandlerFactory</td> <td class="needsmerge"><a href="compare/java.net.ContentHandlerFactory.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.DatagramPacket</td> <td class="needsmerge"><a href="compare/java.net.DatagramPacket.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.DatagramSocket</td> <td class="needsmerge"><a href="compare/java.net.DatagramSocket.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.DatagramSocketImpl</td> <td class="needsmerge"><a href="compare/java.net.DatagramSocketImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.DatagramSocketImplFactory</td> <td class="needsmerge"><a href="compare/java.net.DatagramSocketImplFactory.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.FileNameMap</td> <td class="needsmerge"><a href="compare/java.net.FileNameMap.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.HttpURLConnection</td> <td class="needsmerge"><a href="compare/java.net.HttpURLConnection.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.Inet4Address</td> <td class="needsmerge"><a href="compare/java.net.Inet4Address.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.Inet6Address</td> <td class="needsmerge"><a href="compare/java.net.Inet6Address.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.net.InetAddress</td> <td class="needsmerge"><a href="compare/java.net.InetAddress.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.InetSocketAddress</td> <td class="needsmerge"><a href="compare/java.net.InetSocketAddress.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.net.JarURLConnection</td> <td class="needsmerge"><a href="compare/java.net.JarURLConnection.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.MalformedURLException</td> <td class="needsmerge"><a href="compare/java.net.MalformedURLException.diff">Diff</a></td> </tr>
<tr> <td class="classpath-only">java.net.MimeTypeMapper</td> <td class="classpath-only">Classpath-only</td> </tr>
+<tr> <td class="needsmerge">java.net.MulticastSocket</td> <td class="needsmerge"><a href="compare/java.net.MulticastSocket.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.NetPermission</td> <td class="needsmerge"><a href="compare/java.net.NetPermission.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.NetworkInterface</td> <td class="needsmerge"><a href="compare/java.net.NetworkInterface.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.NoRouteToHostException</td> <td class="needsmerge"><a href="compare/java.net.NoRouteToHostException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.PasswordAuthentication</td> <td class="needsmerge"><a href="compare/java.net.PasswordAuthentication.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.PortUnreachableException</td> <td class="needsmerge"><a href="compare/java.net.PortUnreachableException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.ProtocolException</td> <td class="needsmerge"><a href="compare/java.net.ProtocolException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.ServerSocket</td> <td class="needsmerge"><a href="compare/java.net.ServerSocket.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.Socket</td> <td class="needsmerge"><a href="compare/java.net.Socket.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.SocketAddress</td> <td class="needsmerge"><a href="compare/java.net.SocketAddress.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.SocketException</td> <td class="needsmerge"><a href="compare/java.net.SocketException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.SocketImpl</td> <td class="needsmerge"><a href="compare/java.net.SocketImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.SocketImplFactory</td> <td class="needsmerge"><a href="compare/java.net.SocketImplFactory.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.SocketOptions</td> <td class="needsmerge"><a href="compare/java.net.SocketOptions.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.SocketPermission</td> <td class="needsmerge"><a href="compare/java.net.SocketPermission.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.SocketTimeoutException</td> <td class="needsmerge"><a href="compare/java.net.SocketTimeoutException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.URI</td> <td class="needsmerge"><a href="compare/java.net.URI.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.URISyntaxException</td> <td class="needsmerge"><a href="compare/java.net.URISyntaxException.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.net.URL</td> <td class="needsmerge"><a href="compare/java.net.URL.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.net.URLClassLoader</td> <td class="needsmerge"><a href="compare/java.net.URLClassLoader.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.net.URLConnection</td> <td class="needsmerge"><a href="compare/java.net.URLConnection.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.URLDecoder</td> <td class="needsmerge"><a href="compare/java.net.URLDecoder.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.URLEncoder</td> <td class="needsmerge"><a href="compare/java.net.URLEncoder.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.URLStreamHandler</td> <td class="needsmerge"><a href="compare/java.net.URLStreamHandler.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.URLStreamHandlerFactory</td> <td class="needsmerge"><a href="compare/java.net.URLStreamHandlerFactory.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.UnknownHostException</td> <td class="needsmerge"><a href="compare/java.net.UnknownHostException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.net.UnknownServiceException</td> <td class="needsmerge"><a href="compare/java.net.UnknownServiceException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.Buffer</td> <td class="needsmerge"><a href="compare/java.nio.Buffer.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.ByteBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.ByteBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.CharBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.CharBufferImpl.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.nio.DirectByteBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.DirectByteBufferImpl.diff">Diff</a></td> </tr>
-<tr> <td class="needsmerge">java.nio.MappedByteBuffer</td> <td class="needsmerge"><a href="compare/java.nio.MappedByteBuffer.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.DoubleBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.DoubleBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.DoubleViewBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.DoubleViewBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.FloatBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.FloatBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.FloatViewBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.FloatViewBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.IntBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.IntBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.IntViewBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.IntViewBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.LongBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.LongBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.LongViewBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.LongViewBufferImpl.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.nio.MappedByteBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.MappedByteBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.ShortBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.ShortBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.ShortViewBufferImpl</td> <td class="needsmerge"><a href="compare/java.nio.ShortViewBufferImpl.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.AlreadyConnectedException</td> <td class="needsmerge"><a href="compare/java.nio.channels.AlreadyConnectedException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.AsynchronousCloseException</td> <td class="needsmerge"><a href="compare/java.nio.channels.AsynchronousCloseException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.ByteChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.ByteChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.CancelledKeyException</td> <td class="needsmerge"><a href="compare/java.nio.channels.CancelledKeyException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.Channel</td> <td class="needsmerge"><a href="compare/java.nio.channels.Channel.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.nio.channels.Channels</td> <td class="needsmerge"><a href="compare/java.nio.channels.Channels.diff">Diff</a></td> </tr>
-<tr> <td class="classpath-only">java.nio.channels.FileChannelImpl</td> <td class="classpath-only">Classpath-only</td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.ClosedByInterruptException</td> <td class="needsmerge"><a href="compare/java.nio.channels.ClosedByInterruptException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.ClosedChannelException</td> <td class="needsmerge"><a href="compare/java.nio.channels.ClosedChannelException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.ClosedSelectorException</td> <td class="needsmerge"><a href="compare/java.nio.channels.ClosedSelectorException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.ConnectionPendingException</td> <td class="needsmerge"><a href="compare/java.nio.channels.ConnectionPendingException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.DatagramChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.DatagramChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.FileChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.FileChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.FileLock</td> <td class="needsmerge"><a href="compare/java.nio.channels.FileLock.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.FileLockInterruptionException</td> <td class="needsmerge"><a href="compare/java.nio.channels.FileLockInterruptionException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.GatheringByteChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.GatheringByteChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.IllegalBlockingModeException</td> <td class="needsmerge"><a href="compare/java.nio.channels.IllegalBlockingModeException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.IllegalSelectorException</td> <td class="needsmerge"><a href="compare/java.nio.channels.IllegalSelectorException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.InterruptibleChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.InterruptibleChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.NoConnectionPendingException</td> <td class="needsmerge"><a href="compare/java.nio.channels.NoConnectionPendingException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.NonReadableChannelException</td> <td class="needsmerge"><a href="compare/java.nio.channels.NonReadableChannelException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.NonWritableChannelException</td> <td class="needsmerge"><a href="compare/java.nio.channels.NonWritableChannelException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.NotYetBoundException</td> <td class="needsmerge"><a href="compare/java.nio.channels.NotYetBoundException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.NotYetConnectedException</td> <td class="needsmerge"><a href="compare/java.nio.channels.NotYetConnectedException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.OverlappingFileLockException</td> <td class="needsmerge"><a href="compare/java.nio.channels.OverlappingFileLockException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.Pipe</td> <td class="needsmerge"><a href="compare/java.nio.channels.Pipe.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.ReadableByteChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.ReadableByteChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.ScatteringByteChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.ScatteringByteChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.SelectableChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.SelectableChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.SelectionKey</td> <td class="needsmerge"><a href="compare/java.nio.channels.SelectionKey.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.Selector</td> <td class="needsmerge"><a href="compare/java.nio.channels.Selector.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.ServerSocketChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.ServerSocketChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.SocketChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.SocketChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.UnresolvedAddressException</td> <td class="needsmerge"><a href="compare/java.nio.channels.UnresolvedAddressException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.UnsupportedAddressTypeException</td> <td class="needsmerge"><a href="compare/java.nio.channels.UnsupportedAddressTypeException.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.WritableByteChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.WritableByteChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.spi.AbstractInterruptibleChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.spi.AbstractInterruptibleChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.spi.AbstractSelectableChannel</td> <td class="needsmerge"><a href="compare/java.nio.channels.spi.AbstractSelectableChannel.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.spi.AbstractSelectionKey</td> <td class="needsmerge"><a href="compare/java.nio.channels.spi.AbstractSelectionKey.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.spi.AbstractSelector</td> <td class="needsmerge"><a href="compare/java.nio.channels.spi.AbstractSelector.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.channels.spi.SelectorProvider</td> <td class="needsmerge"><a href="compare/java.nio.channels.spi.SelectorProvider.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.nio.charset.spi.CharsetProvider</td> <td class="needsmerge"><a href="compare/java.nio.charset.spi.CharsetProvider.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.rmi.MarshalledObject</td> <td class="needsmerge"><a href="compare/java.rmi.MarshalledObject.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.security.AccessController</td> <td class="needsmerge"><a href="compare/java.security.AccessController.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.security.BasicPermission</td> <td class="needsmerge"><a href="compare/java.security.BasicPermission.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.security.Security</td> <td class="needsmerge"><a href="compare/java.security.Security.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.security.spec.DSAParameterSpec</td> <td class="needsmerge"><a href="compare/java.security.spec.DSAParameterSpec.diff">Diff</a></td> </tr>
@@ -94,6 +211,7 @@
<tr> <td class="needsmerge">java.text.CollationKey</td> <td class="needsmerge"><a href="compare/java.text.CollationKey.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.text.Collator</td> <td class="needsmerge"><a href="compare/java.text.Collator.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.text.DecimalFormat</td> <td class="needsmerge"><a href="compare/java.text.DecimalFormat.diff">Diff</a></td> </tr>
+<tr> <td class="needsmerge">java.text.FieldPosition</td> <td class="needsmerge"><a href="compare/java.text.FieldPosition.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.text.RuleBasedCollator</td> <td class="needsmerge"><a href="compare/java.text.RuleBasedCollator.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.util.Map</td> <td class="needsmerge"><a href="compare/java.util.Map.diff">Diff</a></td> </tr>
<tr> <td class="needsmerge">java.util.Properties</td> <td class="needsmerge"><a href="compare/java.util.Properties.diff">Diff</a></td> </tr>