This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: Updated Classpath comparison page again
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Subject: Patch: FYI: Updated Classpath comparison page again
- From: Tom Tromey <tromey at redhat dot com>
- Date: 03 Oct 2001 08:08:42 -0600
- Cc: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Reply-To: tromey at redhat dot com
Once again I'm updating the Classpath/libgcj comparison page.
Mark Wielaard has done a fair amount of merging this week.
Tom
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.7
diff -u -r1.7 libgcj-classpath-compare.html
--- libgcj-classpath-compare.html 2001/10/01 20:38:32 1.7
+++ libgcj-classpath-compare.html 2001/10/03 13:54:23
@@ -9,7 +9,7 @@
cvs Classpath. It was generated using the <a
href="scripts/gen-classpath-compare"><code>gen-classpath-compare</code></a>
script on
-2001-10-01.
+2001-10-03.
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
@@ -36,14 +36,12 @@
<tr> <td>java.io.RandomAccessFile</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.io.SequenceInputStream</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.io.StringBufferInputStream</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.lang.CharSequence</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.Character</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.Class</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.ClassLoader</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.Double</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.EcosProcess</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.Float</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.lang.InheritableThreadLocal</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.Math</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.Object</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.Package</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.lang.Package.diff">Diff</a></td> </tr>
@@ -56,6 +54,7 @@
<tr> <td>java.lang.Throwable</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.VMClassLoader</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.VMSecurityManager</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
+<tr> <td>java.lang.ref.Reference</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.lang.ref.Reference.diff">Diff</a></td> </tr>
<tr> <td>java.lang.reflect.AccessibleObject</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.reflect.Array</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.reflect.Constructor</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
@@ -63,7 +62,6 @@
<tr> <td>java.lang.reflect.Method</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.reflect.Modifier</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.math.BigInteger</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.net.Authenticator</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.DatagramSocket</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.DatagramSocketImpl</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.HttpURLConnection</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
@@ -71,7 +69,6 @@
<tr> <td>java.net.JarURLConnection</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.MimeTypeMapper</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.MulticastSocket</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.net.MulticastSocket.diff">Diff</a></td> </tr>
-<tr> <td>java.net.PasswordAuthentication</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.PlainDatagramSocketImpl</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.PlainSocketImpl</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.net.ServerSocket</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
Index: compare/java.lang.StringBuffer.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.StringBuffer.diff,v
retrieving revision 1.2
diff -u -r1.2 java.lang.StringBuffer.diff
--- compare/java.lang.StringBuffer.diff 2001/10/01 20:38:33 1.2
+++ compare/java.lang.StringBuffer.diff 2001/10/03 13:54:23
@@ -1,60 +1,6 @@
--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/StringBuffer.java Mon Oct 1 14:44:13 2001
-+++ java/lang/StringBuffer.java Wed May 23 18:34:04 2001
-@@ -1,32 +1,21 @@
--/* StringBuffer.java -- Growable strings
-- Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-+// StringBuffer.java - Growable strings.
-
--This file is part of GNU Classpath.
-+/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
-
--GNU Classpath is free software; you can redistribute it and/or modify
--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
--General Public License for more details.
--
--You should have received a copy of the GNU General Public License
--along with GNU Classpath; see the file COPYING. If not, write to the
--Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--02111-1307 USA.
--
--As a special exception, if you link this library with other files to
--produce an executable, this library does not by itself cause the
--resulting executable to be covered by the GNU General Public License.
--This exception does not however invalidate any other reasons why the
--executable file might be covered by the GNU General Public License. */
-+ This file is part of libgcj.
-+
-+This software is copyrighted work licensed under the terms of the
-+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-+details. */
-
- package java.lang;
- import java.io.Serializable;
-
-+/**
-+ * @author Tom Tromey <tromey@cygnus.com>
-+ * @date October 23, 1998.
-+ */
-+
- /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
- * Updated using online JDK 1.2 docs.
- * Believed complete and correct to JDK 1.2.
-@@ -68,7 +57,7 @@
- * @author Tom Tromey
- * @see java.lang.String
- */
--public final class StringBuffer implements Serializable, CharSequence
-+public final class StringBuffer implements Serializable
- {
- /** Append the <code>String</code> value of the argument to this <code>StringBuffer</code>.
- * Uses <code>String.valueOf()</code> to convert to
-@@ -100,10 +89,7 @@
++++ java/lang/StringBuffer.java Tue Oct 2 17:30:13 2001
+@@ -100,10 +100,7 @@
* @return this <code>StringBuffer</code>.
* @see java.lang.String#valueOf(int)
*/
@@ -66,41 +12,3 @@
/** Append the <code>String</code> value of the argument to this <code>StringBuffer</code>.
* Uses <code>String.valueOf()</code> to convert to
-@@ -212,7 +198,7 @@
- * @param index the index of the character to get, starting at 0.
- * @return the character at the specified index.
- * @exception IndexOutOfBoundsException if the desired character index
-- * is negative or greater then length() - 1.
-+ * is not between 0 and length() - 1 (inclusive).
- */
- public synchronized char charAt (int index)
- {
-@@ -666,28 +652,6 @@
- // enable sharing here.
- return new String (value, beginIndex, endIndex - beginIndex);
- }
--
-- /**
-- * Creates a substring of this StringBuffer, starting at a specified index
-- * and ending at one character before a specified index.
-- * <p>
-- * To implement <code>CharSequence</code>.
-- * Calls <code>substring(beginIndex, endIndex)</code>.
-- *
-- * @param beginIndex index to start substring (base 0)
-- * @param endIndex index after the last character to be
-- * copied into the substring
-- *
-- * @return new String which is a substring of this StringBuffer
-- *
-- * @exception StringIndexOutOfBoundsException
-- * if (beginIndex < 0 || endIndex > this.length() || beginIndex > endIndex)
-- */
-- public CharSequence subSequence (int beginIndex, int endIndex)
-- {
-- return substring(beginIndex, endIndex);
-- }
--
-
- /** Convert this <code>StringBuffer</code> to a <code>String</code>.
- * @return the characters in this StringBuffer
Index: compare/java.lang.ref.Reference.diff
===================================================================
RCS file: java.lang.ref.Reference.diff
diff -N java.lang.ref.Reference.diff
--- /dev/null Tue May 5 13:32:27 1998
+++ compare/java.lang.ref.Reference.diff Wed Oct 3 06:54:23 2001
@@ -0,0 +1,60 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/ref/Reference.java Wed Mar 22 12:26:12 2000
++++ java/lang/ref/Reference.java Mon Oct 1 15:47:59 2001
+@@ -64,8 +64,21 @@
+ /**
+ * The underlying object. This field is handled in a special way by
+ * the garbage collection.
++ * GCJ LOCAL:
++ * This is a RawData because it must be disguised from the GC.
++ * END GCJ LOCAL
+ */
+- Object referent;
++ gnu.gcj.RawData referent;
++
++ /**
++ * This is like REFERENT but is not scanned by the GC. We keep a
++ * copy around so that we can see when clear() has been called.
++ * GCJ LOCAL:
++ * This field doesn't exist in Classpath; we use it to detect
++ * clearing.
++ * END GCJ LOCAL
++ */
++ gnu.gcj.RawData copy;
+
+ /**
+ * The queue this reference is registered on. This is null, if this
+@@ -97,7 +110,7 @@
+ */
+ Reference(Object ref)
+ {
+- referent = ref;
++ create (ref);
+ }
+
+ /**
+@@ -112,11 +125,16 @@
+ {
+ if (q == null)
+ throw new NullPointerException();
+- referent = ref;
+ queue = q;
++ create (ref);
+ }
+
+ /**
++ * Notifies the VM that a new Reference has been created.
++ */
++ private native void create (Object o);
++
++ /**
+ * Returns the object, this reference refers to.
+ * @return the object, this reference refers to, or null if the
+ * reference was cleared.
+@@ -138,6 +156,7 @@
+ public void clear()
+ {
+ referent = null;
++ copy = null;
+ }
+
+ /**
Index: compare/java.util.zip.ZipFile.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.ZipFile.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.zip.ZipFile.diff
--- compare/java.util.zip.ZipFile.diff 2001/09/26 17:37:44 1.2
+++ compare/java.util.zip.ZipFile.diff 2001/10/03 13:54:24
@@ -1,4 +1,4 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipFile.java Wed Sep 26 08:18:48 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipFile.java Wed Oct 3 08:00:37 2001
+++ java/util/zip/ZipFile.java Fri Nov 17 14:42:28 2000
@@ -1,5 +1,5 @@
-/* java.util.zip.ZipFile
@@ -17,7 +17,7 @@
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
-@@ -25,415 +25,233 @@
+@@ -25,419 +25,233 @@
executable file might be covered by the GNU General Public License. */
package java.util.zip;
@@ -580,7 +580,11 @@
- public int read(byte[] b, int off, int len) throws IOException
- {
- if (len > end - filepos)
-- len = (int) (end - filepos);
+- {
+- len = (int) (end - filepos);
+- if (len == 0)
+- return -1;
+- }
- synchronized (raf)
- {
- raf.seek(filepos);