This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: daily classpath merge update
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Subject: Patch: FYI: daily classpath merge update
- From: Tom Tromey <tromey at redhat dot com>
- Date: 05 Oct 2001 09:57:01 -0600
- Cc: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Reply-To: tromey at redhat dot com
I'm checking this in.
Mark Wielaard has been doing daily merge work with Classpath.
Tom
Index: libgcj-classpath-compare.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/libgcj-classpath-compare.html,v
retrieving revision 1.9
diff -u -r1.9 libgcj-classpath-compare.html
--- libgcj-classpath-compare.html 2001/10/04 23:52:11 1.9
+++ libgcj-classpath-compare.html 2001/10/05 15:40:36
@@ -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-04.
+2001-10-05.
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
@@ -58,7 +58,6 @@
<tr> <td>java.lang.reflect.Constructor</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.lang.reflect.Field</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
<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.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>
@@ -96,12 +95,7 @@
<tr> <td>java.util.prefs.PreferenceChangeListener</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.util.prefs.Preferences</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.util.prefs.PreferencesFactory</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.util.zip.Adler32</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.Adler32.diff">Diff</a></td> </tr>
-<tr> <td>java.util.zip.CRC32</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.CRC32.diff">Diff</a></td> </tr>
-<tr> <td>java.util.zip.CheckedInputStream</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> </tr>
-<tr> <td>java.util.zip.CheckedOutputStream</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> </tr>
<tr> <td>java.util.zip.Checksum</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.Checksum.diff">Diff</a></td> </tr>
-<tr> <td>java.util.zip.DataFormatException</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.DataFormatException.diff">Diff</a></td> </tr>
<tr> <td>java.util.zip.Deflater</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.Deflater.diff">Diff</a></td> </tr>
<tr> <td>java.util.zip.DeflaterConstants</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.util.zip.DeflaterEngine</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
@@ -120,7 +114,6 @@
<tr> <td>java.util.zip.StreamManipulator</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.util.zip.ZipConstants</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.ZipConstants.diff">Diff</a></td> </tr>
<tr> <td>java.util.zip.ZipEntry</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.ZipEntry.diff">Diff</a></td> </tr>
-<tr> <td>java.util.zip.ZipException</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.ZipException.diff">Diff</a></td> </tr>
<tr> <td>java.util.zip.ZipFile</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.ZipFile.diff">Diff</a></td> </tr>
<tr> <td>java.util.zip.ZipInputStream</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.ZipInputStream.diff">Diff</a></td> </tr>
<tr> <td>java.util.zip.ZipOutputStream</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.util.zip.ZipOutputStream.diff">Diff</a></td> </tr>
Index: compare/java.lang.Package.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.Package.diff,v
retrieving revision 1.2
diff -u -r1.2 java.lang.Package.diff
--- compare/java.lang.Package.diff 2001/10/01 20:38:33 1.2
+++ compare/java.lang.Package.diff 2001/10/05 15:40:36
@@ -1,70 +1,22 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/lang/Package.java Mon Oct 1 14:44:13 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/Package.java Fri Oct 5 09:36:25 2001
+++ java/lang/Package.java Wed Apr 25 09:45:12 2001
-@@ -202,22 +202,23 @@
- StringTokenizer versionTokens = new StringTokenizer(version, ".");
- StringTokenizer specTokens = new StringTokenizer(specVersion, ".");
- try
-+ {
-+ while (versionTokens.hasMoreElements())
- {
-- while (versionTokens.hasMoreElements()) {
-- int vers = Integer.parseInt(versionTokens.nextToken());
-- int spec = Integer.parseInt(specTokens.nextToken());
-- if (spec < vers) {
-- return false;
-- } else if (spec > vers) {
-- return true;
-- }
-- // They must be equal, next Token please!
-+ int vers = Integer.parseInt(versionTokens.nextToken());
-+ int spec = Integer.parseInt(specTokens.nextToken());
-+ if (spec < vers)
-+ return false;
-+ else if (spec > vers)
-+ return true;
-+ // They must be equal, next Token please!
-+ }
-+ }
-+ catch (NoSuchElementException e)
-+ {
-+ // this must have been thrown by spec.netToken() so return false
-+ return false;
- }
-- }
-- catch (NoSuchElementException e) {
-- // this must have been thrown by spec.netToken() so return false
-- return false;
-- }
-
- // They must have been exactly the same version.
- // Or the specVersion has more subversions. That is also good.
-@@ -233,10 +234,11 @@
- */
+@@ -235,7 +235,8 @@
public static Package getPackage(String name)
{
-- // get the callers classloader
+ // Get the caller's classloader
- Class c = VMSecurityManager.getClassContext()[1];
-+ // Get the caller's classloader
+ SecurityManager sm = System.getSecurityManager();
+ Class c = sm.getClassContext()[1];
ClassLoader cl = c.getClassLoader();
--
-+
+
if (cl != null)
- return cl.getPackage(name);
- else
-@@ -249,10 +251,11 @@
- */
+@@ -251,7 +252,8 @@
public static Package[] getPackages()
{
-- // get the callers classloader
+ // Get the caller's classloader
- Class c = VMSecurityManager.getClassContext()[1];
-+ // Get the caller's classloader
+ SecurityManager sm = System.getSecurityManager();
+ Class c = sm.getClassContext()[1];
ClassLoader cl = c.getClassLoader();
--
-+
+
if (cl != null)
- return cl.getPackages();
- else
Index: compare/java.util.zip.Checksum.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.Checksum.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.zip.Checksum.diff
--- compare/java.util.zip.Checksum.diff 2001/09/26 17:37:44 1.2
+++ compare/java.util.zip.Checksum.diff 2001/10/05 15:40:36
@@ -1,10 +1,9 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/Checksum.java Wed Sep 26 08:18:48 2001
-+++ java/util/zip/Checksum.java Fri Nov 17 14:42:28 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/Checksum.java Fri Oct 5 09:36:25 2001
++++ java/util/zip/Checksum.java Fri Oct 5 09:36:56 2001
@@ -1,5 +1,5 @@
--/* java.util.zip.Checksum
-- Copyright (C) 2001 Free Software Foundation, Inc.
-+/* Checksum.java - Interface to compute a data checksum
-+ Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ /* Checksum.java - Interface to compute a data checksum
+- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
++ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -12,78 +11,17 @@
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
-@@ -26,37 +26,50 @@
-
- package java.util.zip;
-
-+/*
-+ * Written using on-line Java Platform 1.2 API Specification, as well
-+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
-+ * Status: Believed complete and correct.
-+ */
-+
- /**
-- * This is an interface for calculating checksums.
-+ * Interface to compute a data checksum used by checked input/output streams.
-+ * A data checksum can be updated by one byte or with a byte array. After each
-+ * update the value of the current checksum can be returned by calling
-+ * <code>getValue</code>. The complete checksum object can also be reset
-+ * so it can be used again with new data.
+@@ -43,7 +43,7 @@
+ * @see CheckedOutputStream
*
-- * @author Jochen Hoenicke
-- * @since JDK 1.1
-+ * @see CheckedInputStream
-+ * @see CheckedOutputStream
-+ *
-+ * @author Per Bothner
-+ * @date January 9, 1999.
+ * @author Per Bothner
+- * @date January 9, 1999.
++ * @author Jochen Hoenicke
*/
--public interface Checksum {
--
-+public interface Checksum
-+{
- /**
-- * Updates the checksum with the byte b.
-- * @param b the byte, only the lower 8 bits are used.
-+ * Returns the data checksum computed so far.
- */
-- public void update(int b);
-+ public long getValue ();
-
- /**
-- * Calculates the checksum of the given part of the byte array, updating
-- * its current value.
-- * @param b an array of bytes
-- * @param off the offset into the array.
-- * @param len the length.
-+ * Resets the data checksum as if no update was ever called.
- */
-- public void update(byte[] b, int off, int len);
-+ public void reset ();
-
- /**
-- * Resets the checksum to the initial value.
-+ * Adds one byte to the data checksum.
-+ *
-+ * @param bval the data value to add. The high byte of the int is ignored.
- */
-- public void reset();
-+ public void update (int bval);
-
- /**
-- * Gets the current checksum value.
-+ * Adds the byte array to the data checksum.
-+ *
-+ * @param buf the buffer which contains the data
-+ * @param off the offset in the buffer where the data starts
-+ * @param len the length of the data
- */
-- public long getValue();
-+ public void update (byte[] buf, int off, int len);
- }
--
+ public interface Checksum
+ {