Patch: FYI: Classpath recompare
Tom Tromey
tromey@redhat.com
Tue Jan 22 14:58:00 GMT 2002
I'm checking this in.
Classpath/libgcj comparison.
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.29
diff -u -r1.29 libgcj-classpath-compare.html
--- libgcj-classpath-compare.html 2002/01/17 17:41:53 1.29
+++ libgcj-classpath-compare.html 2002/01/22 22:56:38
@@ -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
-2002-01-17.
+2002-01-22.
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
@@ -19,41 +19,36 @@
<table border=1 width="100%">
<tr><th>Class</th> <th>libgcj</th> <th>Classpath</th> <th>Merge Status</th> </tr>
-<tr> <td>java.awt.ActiveEvent</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Adjustable</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Button</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.CheckboxMenuItem</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Choice</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Color</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Cursor</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Dialog</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.FileDialog</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Font</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.FontMetrics</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.GridBagConstraints</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Image</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.ImageMediaEntry</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Insets</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.List</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.MediaEntry</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.MediaTracker</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Menu</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.MenuBar</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.MenuComponent</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.MenuContainer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.MenuItem</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.MenuShortcut</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.PaintContext</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.Panel</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
+<tr> <td>java.awt.Adjustable</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Adjustable.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.CheckboxMenuItem</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.CheckboxMenuItem.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.Choice</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Choice.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.Color</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Color.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.Cursor</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Cursor.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.Dialog</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Dialog.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.FileDialog</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.FileDialog.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.Font</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Font.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.FontMetrics</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.FontMetrics.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.GridBagConstraints</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
+<tr> <td>java.awt.Image</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Image.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.ImageMediaEntry</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.ImageMediaEntry.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.Insets</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Insets.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.List</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.List.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.MediaEntry</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.MediaEntry.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.MediaTracker</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.MediaTracker.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.Menu</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Menu.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.MenuBar</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.MenuBar.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.MenuContainer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.MenuContainer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.MenuShortcut</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.MenuShortcut.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.Panel</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.Panel.diff">Diff</a></td> </tr>
<tr> <td>java.awt.Polygon</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.PopupMenu</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
+<tr> <td>java.awt.PopupMenu</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.PopupMenu.diff">Diff</a></td> </tr>
<tr> <td>java.awt.PrintGraphics</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.PrintJob</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.ScrollPane</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.ScrollPaneAdjustable</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.Scrollbar</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.Shape</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.SystemColor</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
+<tr> <td>java.awt.SystemColor</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.SystemColor.diff">Diff</a></td> </tr>
<tr> <td>java.awt.TextArea</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.TextComponent</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.TextField</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
@@ -119,32 +114,32 @@
<tr> <td>java.awt.image.PixelGrabber</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.image.RGBImageFilter</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.image.ReplicateScaleFilter</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.ButtonPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.CanvasPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.CheckboxMenuItemPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.CheckboxPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.ChoicePeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.ComponentPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.ContainerPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.DialogPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.FileDialogPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.FontPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.FramePeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.LabelPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.LightweightPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.ListPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.MenuBarPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.MenuComponentPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.MenuItemPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.MenuPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.PanelPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.PopupMenuPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.ScrollPanePeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.ScrollbarPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.TextAreaPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.TextComponentPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.TextFieldPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
-<tr> <td>java.awt.peer.WindowPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
+<tr> <td>java.awt.peer.ButtonPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.ButtonPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.CanvasPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.CanvasPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.CheckboxMenuItemPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.CheckboxMenuItemPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.CheckboxPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.CheckboxPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.ChoicePeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.ChoicePeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.ComponentPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.ComponentPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.ContainerPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.ContainerPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.DialogPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.DialogPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.FileDialogPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.FileDialogPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.FontPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.FontPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.FramePeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.FramePeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.LabelPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.LabelPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.LightweightPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.LightweightPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.ListPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.ListPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.MenuBarPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.MenuBarPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.MenuComponentPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.MenuComponentPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.MenuItemPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.MenuItemPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.MenuPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.MenuPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.PanelPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.PanelPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.PopupMenuPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.PopupMenuPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.ScrollPanePeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.ScrollPanePeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.ScrollbarPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.ScrollbarPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.TextAreaPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.TextAreaPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.TextComponentPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.TextComponentPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.TextFieldPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.TextFieldPeer.diff">Diff</a></td> </tr>
+<tr> <td>java.awt.peer.WindowPeer</td> <td>Yes</td> <td>Yes</td> <td bgcolor="#aaaaee"><a href="compare/java.awt.peer.WindowPeer.diff">Diff</a></td> </tr>
<tr> <td>java.awt.print.Book</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.print.PageFormat</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
<tr> <td>java.awt.print.Pageable</td> <td bgcolor="#eeeeaa">No</td> <td>Yes</td> <td bgcolor="#eeeeaa">No</td> </tr>
Index: compare/java.io.ObjectInputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.io.ObjectInputStream.diff,v
retrieving revision 1.4
diff -u -r1.4 java.io.ObjectInputStream.diff
--- compare/java.io.ObjectInputStream.diff 2002/01/12 18:39:12 1.4
+++ compare/java.io.ObjectInputStream.diff 2002/01/22 22:56:39
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectInputStream.java Fri Dec 21 12:48:18 2001
-+++ java/io/ObjectInputStream.java Fri Dec 21 15:56:48 2001
-@@ -27,6 +27,8 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectInputStream.java Tue Jan 22 15:49:55 2002
++++ java/io/ObjectInputStream.java Tue Jan 22 16:01:33 2002
+@@ -38,6 +38,8 @@
package java.io;
@@ -9,7 +9,7 @@
import java.lang.reflect.Array;
import java.lang.reflect.Modifier;
import java.util.Arrays;
-@@ -39,7 +41,7 @@
+@@ -50,7 +52,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
@@ -18,7 +18,7 @@
public class ObjectInputStream extends InputStream
implements ObjectInput, ObjectStreamConstants
-@@ -61,6 +63,21 @@
+@@ -72,6 +74,21 @@
public ObjectInputStream (InputStream in)
throws IOException, StreamCorruptedException
{
@@ -40,7 +40,7 @@
this.resolveEnabled = false;
this.isDeserializing = false;
this.blockDataPosition = 0;
-@@ -182,8 +199,8 @@
+@@ -193,8 +210,8 @@
(class_name));
}
@@ -51,7 +51,7 @@
setBlockDataMode (false);
if (this.realInputStream.readByte () != TC_ENDBLOCKDATA)
-@@ -470,28 +487,16 @@
+@@ -481,28 +498,16 @@
protected Class resolveClass (ObjectStreamClass osc)
throws ClassNotFoundException, IOException
{
@@ -84,7 +84,7 @@
/**
Allows subclasses to resolve objects that are read from the
stream with other objects to be returned in their place. This
-@@ -563,21 +568,23 @@
+@@ -574,21 +579,23 @@
{
if (this.blockDataPosition >= this.blockDataBytes)
readNextBlock ();
@@ -111,7 +111,7 @@
return length;
}
else
-@@ -945,7 +952,7 @@
+@@ -956,7 +963,7 @@
de serialization mechanism provided by
<code>ObjectInputStream</code>. To make this method be used for
writing objects, subclasses must invoke the 0-argument
@@ -120,7 +120,7 @@
@see ObjectInputStream ()
*/
-@@ -1291,7 +1298,7 @@
+@@ -1302,7 +1309,7 @@
// returns a new instance of REAL_CLASS that has been constructed
@@ -129,7 +129,7 @@
private Object newObject (Class real_class, Class constructor_class)
{
try
-@@ -1329,34 +1336,182 @@
+@@ -1340,34 +1347,182 @@
// this native method is used to get access to the protected method
// of the same name in SecurityManger
@@ -332,7 +332,7 @@
private static final int BUFFER_SIZE = 1024;
private static final Class[] readObjectParams = { ObjectInputStream.class };
-@@ -1378,42 +1533,18 @@
+@@ -1389,42 +1544,18 @@
private boolean fieldsAlreadyRead;
private Vector validators;
Index: compare/java.io.ObjectOutputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.io.ObjectOutputStream.diff,v
retrieving revision 1.3
diff -u -r1.3 java.io.ObjectOutputStream.diff
--- compare/java.io.ObjectOutputStream.diff 2002/01/12 18:39:12 1.3
+++ compare/java.io.ObjectOutputStream.diff 2002/01/22 22:56:40
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectOutputStream.java Fri Dec 21 12:48:27 2001
-+++ java/io/ObjectOutputStream.java Fri Dec 21 15:56:48 2001
-@@ -35,7 +35,6 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectOutputStream.java Tue Jan 22 15:49:55 2002
++++ java/io/ObjectOutputStream.java Tue Jan 22 16:01:33 2002
+@@ -46,7 +46,6 @@
import gnu.java.io.ObjectIdentityWrapper;
import gnu.java.lang.reflect.TypeSignature;
@@ -8,7 +8,7 @@
/**
An <code>ObjectOutputStream</code> can be used to write objects
-@@ -637,7 +636,7 @@
+@@ -648,7 +647,7 @@
/**
@see java.io.DataOutputStream#write (byte[])
*/
@@ -17,7 +17,7 @@
{
write (b, 0, b.length);
}
-@@ -646,7 +645,7 @@
+@@ -657,7 +656,7 @@
/**
@see java.io.DataOutputStream#write (byte[],int,int)
*/
@@ -26,7 +26,7 @@
{
if (writeDataAsBlocks)
{
-@@ -1177,18 +1176,179 @@
+@@ -1188,18 +1187,179 @@
}
@@ -217,7 +217,7 @@
// this value comes from 1.2 spec, but is used in 1.1 as well
private final static int BUFFER_SIZE = 1024;
-@@ -1211,13 +1371,4 @@
+@@ -1222,13 +1382,4 @@
private Hashtable OIDLookupTable;
private int protocolVersion;
private boolean useSubclassMethod;
Index: compare/java.io.ObjectStreamClass.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.io.ObjectStreamClass.diff,v
retrieving revision 1.2
diff -u -r1.2 java.io.ObjectStreamClass.diff
--- compare/java.io.ObjectStreamClass.diff 2001/09/26 17:37:43 1.2
+++ compare/java.io.ObjectStreamClass.diff 2002/01/22 22:56:40
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectStreamClass.java Wed Sep 26 08:18:40 2001
-+++ java/io/ObjectStreamClass.java Thu Apr 26 19:17:10 2001
-@@ -36,13 +36,15 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/io/ObjectStreamClass.java Tue Jan 22 15:49:55 2002
++++ java/io/ObjectStreamClass.java Tue Jan 22 16:01:33 2002
+@@ -47,13 +47,15 @@
import java.security.DigestOutputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -17,7 +17,7 @@
public class ObjectStreamClass implements Serializable
{
-@@ -244,13 +246,27 @@
+@@ -255,13 +257,27 @@
this.fields = fields;
}
@@ -49,7 +49,7 @@
void setSuperclass (ObjectStreamClass osc)
{
superClass = osc;
-@@ -306,7 +322,7 @@
+@@ -317,7 +333,7 @@
name = cl.getName ();
setFlags (cl);
setFields (cl);
@@ -58,7 +58,7 @@
superClass = lookup (cl.getSuperclass ());
}
-@@ -394,33 +410,46 @@
+@@ -405,33 +421,46 @@
calculateOffsets ();
}
@@ -118,7 +118,7 @@
data_out.writeUTF (cl.getName ());
int modifiers = cl.getModifiers ();
-@@ -519,7 +548,7 @@
+@@ -530,7 +559,7 @@
for (int i=0; i < len; i++)
result += (long)(sha[i] & 0xFF) << (8 * i);
@@ -127,7 +127,7 @@
}
catch (NoSuchAlgorithmException e)
{
-@@ -532,31 +561,6 @@
+@@ -543,31 +572,6 @@
}
}
@@ -159,7 +159,7 @@
// Returns the value of CLAZZ's private static final field named
// `serialPersistentFields'.
private ObjectStreamField[] getSerialPersistentFields (Class clazz)
-@@ -624,18 +628,10 @@
+@@ -635,18 +639,10 @@
// these are accessed by ObjectIn/OutputStream
int primFieldSize = -1; // -1 if not yet calculated
int objectFieldCount;
Index: compare/java.lang.Double.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.Double.diff,v
retrieving revision 1.8
diff -u -r1.8 java.lang.Double.diff
--- compare/java.lang.Double.diff 2002/01/16 04:27:04 1.8
+++ compare/java.lang.Double.diff 2002/01/22 22:56:40
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/lang/Double.java Tue Jan 15 21:34:47 2002
-+++ java/lang/Double.java Tue Jan 15 21:11:59 2002
-@@ -44,8 +44,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/Double.java Tue Jan 22 15:49:57 2002
++++ java/lang/Double.java Tue Jan 22 16:01:34 2002
+@@ -55,8 +55,7 @@
*
* @author Paul Fisher
* @author Andrew Haley <aph@cygnus.com>
@@ -10,7 +10,7 @@
*/
public final class Double extends Number implements Comparable
{
-@@ -166,10 +165,10 @@
+@@ -177,10 +176,10 @@
double d = ((Double) obj).value;
@@ -25,7 +25,7 @@
}
/**
-@@ -238,8 +237,6 @@
+@@ -249,8 +248,6 @@
*/
public static Double valueOf (String s) throws NumberFormatException
{
Index: compare/java.lang.Float.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.Float.diff,v
retrieving revision 1.4
diff -u -r1.4 java.lang.Float.diff
--- compare/java.lang.Float.diff 2002/01/16 04:27:04 1.4
+++ compare/java.lang.Float.diff 2002/01/22 22:56:40
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/lang/Float.java Tue Jan 15 12:16:02 2002
-+++ java/lang/Float.java Tue Jan 15 21:11:14 2002
-@@ -44,8 +44,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/Float.java Tue Jan 22 15:49:57 2002
++++ java/lang/Float.java Tue Jan 22 16:01:34 2002
+@@ -55,8 +55,7 @@
*
* @author Paul Fisher
* @author Andrew Haley <aph@cygnus.com>
@@ -10,7 +10,7 @@
*/
public final class Float extends Number implements Comparable
{
-@@ -235,10 +234,10 @@
+@@ -246,10 +245,10 @@
float f = ((Float) obj).value;
Index: compare/java.lang.Package.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.Package.diff,v
retrieving revision 1.5
diff -u -r1.5 java.lang.Package.diff
--- compare/java.lang.Package.diff 2001/11/07 01:23:48 1.5
+++ compare/java.lang.Package.diff 2002/01/22 22:56:40
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/lang/Package.java Sun Oct 7 14:45:48 2001
-+++ java/lang/Package.java Fri Nov 2 21:44:51 2001
-@@ -39,7 +39,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/Package.java Tue Jan 22 15:49:57 2002
++++ java/lang/Package.java Tue Jan 22 16:01:35 2002
+@@ -50,7 +50,7 @@
* <a href="http://java.sun.com/products/jdk/1.3/docs/guide/versioning/spec/VersioningSpecification.html">Product Versioning Specification</a>.
* It also allows packages to be sealed with respect to the originating URL.
* <p>
@@ -9,7 +9,7 @@
* compares a desired version of a specification with the version of the
* specification as implemented by a package. A package is considered
* compatible with another version if the version of the specification is
-@@ -235,7 +235,8 @@
+@@ -246,7 +246,8 @@
public static Package getPackage(String name)
{
// Get the caller's classloader
@@ -19,7 +19,7 @@
ClassLoader cl = c.getClassLoader();
if (cl != null)
-@@ -251,7 +252,8 @@
+@@ -262,7 +263,8 @@
public static Package[] getPackages()
{
// Get the caller's classloader
Index: compare/java.lang.StringBuffer.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.StringBuffer.diff,v
retrieving revision 1.3
diff -u -r1.3 java.lang.StringBuffer.diff
--- compare/java.lang.StringBuffer.diff 2001/10/03 13:56:19 1.3
+++ compare/java.lang.StringBuffer.diff 2002/01/22 22:56:40
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/lang/StringBuffer.java Mon Oct 1 14:44:13 2001
-+++ java/lang/StringBuffer.java Tue Oct 2 17:30:13 2001
-@@ -100,10 +100,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/StringBuffer.java Tue Jan 22 15:49:57 2002
++++ java/lang/StringBuffer.java Tue Jan 22 16:01:35 2002
+@@ -111,10 +111,7 @@
* @return this <code>StringBuffer</code>.
* @see java.lang.String#valueOf(int)
*/
Index: compare/java.lang.System.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.System.diff,v
retrieving revision 1.3
diff -u -r1.3 java.lang.System.diff
--- compare/java.lang.System.diff 2002/01/12 18:39:12 1.3
+++ compare/java.lang.System.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/lang/System.java Tue Jan 8 17:08:15 2002
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/System.java Tue Jan 22 15:49:57 2002
+++ java/lang/System.java Sat Sep 1 22:56:27 2001
-@@ -1,436 +1,252 @@
+@@ -1,447 +1,252 @@
-/* java.lang.System
- Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+// System.java - System-specific info.
@@ -23,11 +23,22 @@
-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. */
+-Linking this library statically or dynamically with other modules is
+-making a combined work based on this library. Thus, the terms and
+-conditions of the GNU General Public License cover the whole
+-combination.
+-
+-As a special exception, the copyright holders of this library give you
+-permission to link this library with independent modules to produce an
+-executable, regardless of the license terms of these independent
+-modules, and to copy and distribute the resulting executable under
+-terms of your choice, provided that you also meet, for each linked
+-independent module, the terms and conditions of the license of that
+-module. An independent module is a module which is not derived from
+-or based on this library. If you modify this library, you may extend
+-this exception to your version of the library, but you are not
+-obligated to do so. If you do not wish to do so, delete this
+-exception statement from your version. */
+ This file is part of libgcj.
+This software is copyrighted work licensed under the terms of the
Index: compare/java.lang.ref.Reference.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.ref.Reference.diff,v
retrieving revision 1.1
diff -u -r1.1 java.lang.ref.Reference.diff
--- compare/java.lang.ref.Reference.diff 2001/10/03 13:56:19 1.1
+++ compare/java.lang.ref.Reference.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /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 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/ref/Reference.java Tue Jan 22 15:49:58 2002
++++ java/lang/ref/Reference.java Tue Jan 22 16:01:35 2002
+@@ -75,8 +75,21 @@
/**
* The underlying object. This field is handled in a special way by
* the garbage collection.
@@ -23,7 +23,7 @@
/**
* The queue this reference is registered on. This is null, if this
-@@ -97,7 +110,7 @@
+@@ -108,7 +121,7 @@
*/
Reference(Object ref)
{
@@ -32,7 +32,7 @@
}
/**
-@@ -112,11 +125,16 @@
+@@ -123,11 +136,16 @@
{
if (q == null)
throw new NullPointerException();
@@ -50,7 +50,7 @@
* 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 @@
+@@ -149,6 +167,7 @@
public void clear()
{
referent = null;
Index: compare/java.lang.reflect.InvocationTargetException.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.lang.reflect.InvocationTargetException.diff,v
retrieving revision 1.1
diff -u -r1.1 java.lang.reflect.InvocationTargetException.diff
--- compare/java.lang.reflect.InvocationTargetException.diff 2001/11/07 01:23:48 1.1
+++ compare/java.lang.reflect.InvocationTargetException.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/lang/reflect/InvocationTargetException.java Sun Oct 21 10:39:27 2001
-+++ java/lang/reflect/InvocationTargetException.java Sat Sep 1 23:15:53 2001
-@@ -30,62 +30,45 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/lang/reflect/InvocationTargetException.java Tue Jan 22 15:49:58 2002
++++ java/lang/reflect/InvocationTargetException.java Tue Jan 22 16:01:35 2002
+@@ -41,62 +41,45 @@
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -83,7 +83,7 @@
/**
* Create an <code>InvocationTargetException</code> using another
-@@ -95,34 +78,51 @@
+@@ -106,34 +89,51 @@
* @param err an extra reason for the exception-throwing
*/
public InvocationTargetException(Throwable targetException, String err)
Index: compare/java.text.Collator.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.text.Collator.diff,v
retrieving revision 1.1
diff -u -r1.1 java.text.Collator.diff
--- compare/java.text.Collator.diff 2001/09/14 00:18:57 1.1
+++ compare/java.text.Collator.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/text/Collator.java Tue Sep 4 12:01:31 2001
-+++ java/text/Collator.java Tue Sep 4 12:01:59 2001
-@@ -369,12 +369,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/text/Collator.java Tue Jan 22 15:50:04 2002
++++ java/text/Collator.java Tue Jan 22 16:01:37 2002
+@@ -380,12 +380,7 @@
}
// Decompose a single character and append results to the buffer.
Index: compare/java.util.AbstractMap.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.AbstractMap.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.AbstractMap.diff
--- compare/java.util.AbstractMap.diff 2001/12/16 00:16:06 1.2
+++ compare/java.util.AbstractMap.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/AbstractMap.java Fri Oct 26 16:06:56 2001
-+++ java/util/AbstractMap.java Sat Dec 15 09:15:59 2001
-@@ -41,6 +41,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/AbstractMap.java Tue Jan 22 15:50:05 2002
++++ java/util/AbstractMap.java Tue Jan 22 16:01:39 2002
+@@ -52,6 +52,7 @@
* efficient implementation.
*
* @author Original author unknown
Index: compare/java.util.AbstractSequentialList.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.AbstractSequentialList.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.AbstractSequentialList.diff
--- compare/java.util.AbstractSequentialList.diff 2001/12/16 00:16:06 1.2
+++ compare/java.util.AbstractSequentialList.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/AbstractSequentialList.java Fri Oct 19 18:43:44 2001
-+++ java/util/AbstractSequentialList.java Sat Dec 15 09:15:59 2001
-@@ -49,6 +49,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/AbstractSequentialList.java Tue Jan 22 15:50:05 2002
++++ java/util/AbstractSequentialList.java Tue Jan 22 16:01:39 2002
+@@ -60,6 +60,7 @@
* Unfortunately, there is no way to enforce this in Java.
*
* @author Original author unknown
Index: compare/java.util.AbstractSet.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.AbstractSet.diff,v
retrieving revision 1.3
diff -u -r1.3 java.util.AbstractSet.diff
--- compare/java.util.AbstractSet.diff 2001/12/16 00:16:06 1.3
+++ compare/java.util.AbstractSet.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/AbstractSet.java Sun Nov 25 12:30:06 2001
-+++ java/util/AbstractSet.java Sat Dec 15 09:15:59 2001
-@@ -115,7 +115,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/AbstractSet.java Tue Jan 22 15:50:06 2002
++++ java/util/AbstractSet.java Tue Jan 22 16:01:39 2002
+@@ -126,7 +126,7 @@
Iterator i;
if (oldsize < count)
{
Index: compare/java.util.ArrayList.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.ArrayList.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.ArrayList.diff
--- compare/java.util.ArrayList.diff 2001/12/16 00:16:06 1.2
+++ compare/java.util.ArrayList.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/ArrayList.java Fri Oct 26 16:06:57 2001
-+++ java/util/ArrayList.java Sat Dec 15 09:15:59 2001
-@@ -60,6 +60,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/ArrayList.java Tue Jan 22 15:50:06 2002
++++ java/util/ArrayList.java Tue Jan 22 16:01:39 2002
+@@ -71,6 +71,7 @@
* non-deterministic behavior.
*
* @author Jon A. Zeppieri
@@ -8,7 +8,7 @@
* @author Eric Blake <ebb9@email.byu.edu>
* @see Collection
* @see List
-@@ -452,7 +453,7 @@
+@@ -463,7 +464,7 @@
// use of a negative index will cause an ArrayIndexOutOfBoundsException,
// a subclass of the required exception, with no effort on our part.
if (index > size)
@@ -17,7 +17,7 @@
+ size);
}
-@@ -468,7 +469,7 @@
+@@ -479,7 +480,7 @@
// use of a negative index will cause an ArrayIndexOutOfBoundsException,
// a subclass of the required exception, with no effort on our part.
if (index >= size)
Index: compare/java.util.Arrays.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.Arrays.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.Arrays.diff
--- compare/java.util.Arrays.diff 2001/12/16 00:16:06 1.2
+++ compare/java.util.Arrays.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/Arrays.java Fri Oct 26 16:06:57 2001
-+++ java/util/Arrays.java Sat Dec 15 09:16:00 2001
-@@ -46,6 +46,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/Arrays.java Tue Jan 22 15:50:06 2002
++++ java/util/Arrays.java Tue Jan 22 16:01:39 2002
+@@ -57,6 +57,7 @@
* sets that cause other quicksorts to degrade to quadratic performance.
*
* @author Original author unknown
@@ -8,7 +8,7 @@
* @author Eric Blake <ebb9@email.byu.edu>
* @see Comparable
* @see Comparator
-@@ -2334,8 +2335,6 @@
+@@ -2345,8 +2346,6 @@
}
}
Index: compare/java.util.Collections.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.Collections.diff,v
retrieving revision 1.6
diff -u -r1.6 java.util.Collections.diff
--- compare/java.util.Collections.diff 2001/12/16 00:16:06 1.6
+++ compare/java.util.Collections.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/Collections.java Fri Nov 2 09:28:56 2001
-+++ java/util/Collections.java Sat Dec 15 09:16:02 2001
-@@ -49,6 +49,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/Collections.java Tue Jan 22 15:50:07 2002
++++ java/util/Collections.java Tue Jan 22 16:01:39 2002
+@@ -60,6 +60,7 @@
* modify the set.
*
* @author Original author unknown
@@ -8,7 +8,7 @@
* @author Eric Blake <ebb9@email.byu.edu>
* @see Collection
* @see Set
-@@ -96,6 +97,24 @@
+@@ -107,6 +108,24 @@
*/
public static final Set EMPTY_SET = new EmptySet();
@@ -33,7 +33,7 @@
/**
* The implementation of {@link #EMPTY_SET}. This class name is required
* for compatibility with Sun's JDK serializability.
-@@ -128,94 +147,9 @@
+@@ -139,94 +158,9 @@
/**
* Returns an iterator that does not iterate.
*/
@@ -129,7 +129,7 @@
}
} // class EmptySet
-@@ -262,106 +196,15 @@
+@@ -273,106 +207,15 @@
{
throw new IndexOutOfBoundsException();
}
@@ -242,7 +242,7 @@
} // class EmptyList
/**
-@@ -399,64 +242,6 @@
+@@ -410,64 +253,6 @@
return EMPTY_SET;
}
@@ -307,7 +307,7 @@
/**
* Size is always 0.
*/
-@@ -473,17 +258,8 @@
+@@ -484,17 +269,8 @@
{
return EMPTY_SET;
}
@@ -325,7 +325,7 @@
/**
* Compare two objects with or without a Comparator. If c is null, uses the
* natural ordering. Slightly slower than doing it inline if the JVM isn't
-@@ -1713,7 +1489,6 @@
+@@ -1724,7 +1500,6 @@
l.set(i, l.set(j, l.get(i)));
}
@@ -333,7 +333,7 @@
/**
* Returns a synchronized (thread-safe) collection wrapper backed by the
* given collection. Notice that element access through the iterators
-@@ -2896,7 +2671,6 @@
+@@ -2907,7 +2682,6 @@
}
} // class SynchronizedSortedSet
Index: compare/java.util.LinkedHashSet.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.LinkedHashSet.diff,v
retrieving revision 1.1
diff -u -r1.1 java.util.LinkedHashSet.diff
--- compare/java.util.LinkedHashSet.diff 2001/12/16 00:16:06 1.1
+++ compare/java.util.LinkedHashSet.diff 2002/01/22 22:56:41
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/LinkedHashSet.java Thu Oct 25 01:34:19 2001
-+++ java/util/LinkedHashSet.java Sat Dec 15 00:47:02 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/LinkedHashSet.java Tue Jan 22 15:50:07 2002
++++ java/util/LinkedHashSet.java Tue Jan 22 16:01:41 2002
@@ -1,5 +1,5 @@
/* LinkedHashSet.java -- a set backed by a LinkedHashMap, for linked
- list traversal
Index: compare/java.util.List.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.List.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.List.diff
--- compare/java.util.List.diff 2001/12/16 00:16:06 1.2
+++ compare/java.util.List.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/List.java Mon Oct 15 10:45:18 2001
-+++ java/util/List.java Sat Dec 15 09:16:04 2001
-@@ -190,7 +190,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/List.java Tue Jan 22 15:50:07 2002
++++ java/util/List.java Tue Jan 22 16:01:41 2002
+@@ -201,7 +201,7 @@
* @see Object#equals(Object)
* @see #hashCode()
*/
Index: compare/java.util.TimeZone.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.TimeZone.diff,v
retrieving revision 1.4
diff -u -r1.4 java.util.TimeZone.diff
--- compare/java.util.TimeZone.diff 2001/10/16 16:38:15 1.4
+++ compare/java.util.TimeZone.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/TimeZone.java Wed Sep 26 08:18:48 2001
-+++ java/util/TimeZone.java Tue Oct 16 09:16:19 2001
-@@ -27,7 +27,6 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/TimeZone.java Tue Jan 22 15:50:07 2002
++++ java/util/TimeZone.java Tue Jan 22 16:01:44 2002
+@@ -38,7 +38,6 @@
package java.util;
import java.text.DateFormatSymbols;
@@ -8,7 +8,7 @@
/**
* This class represents a time zone offset and handles daylight savings.
-@@ -743,16 +742,9 @@
+@@ -754,16 +753,9 @@
/* Look up default timezone */
static
{
@@ -27,7 +27,7 @@
if (tzid == null)
tzid = "GMT";
-@@ -760,19 +752,6 @@
+@@ -771,19 +763,6 @@
defaultZone = getTimeZone(tzid);
}
@@ -47,7 +47,7 @@
/**
* Gets the time zone offset, for current date, modified in case of
* daylight savings. This is the offset to add to UTC to get the local
-@@ -959,6 +938,7 @@
+@@ -970,6 +949,7 @@
* @return The time zone for the identifier or GMT, if no such time
* zone exists.
*/
Index: compare/java.util.TreeMap.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.TreeMap.diff,v
retrieving revision 1.3
diff -u -r1.3 java.util.TreeMap.diff
--- compare/java.util.TreeMap.diff 2001/12/16 00:16:06 1.3
+++ compare/java.util.TreeMap.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/TreeMap.java Sun Nov 25 12:30:06 2001
-+++ java/util/TreeMap.java Sat Dec 15 09:16:04 2001
-@@ -1759,5 +1759,5 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/TreeMap.java Tue Jan 22 15:50:07 2002
++++ java/util/TreeMap.java Tue Jan 22 16:01:44 2002
+@@ -1770,5 +1770,5 @@
};
return this.keys;
}
Index: compare/java.util.TreeSet.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.TreeSet.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.TreeSet.diff
--- compare/java.util.TreeSet.diff 2001/12/16 00:16:06 1.2
+++ compare/java.util.TreeSet.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/TreeSet.java Fri Oct 26 16:06:59 2001
-+++ java/util/TreeSet.java Sat Dec 15 09:16:05 2001
-@@ -55,6 +55,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/TreeSet.java Tue Jan 22 15:50:07 2002
++++ java/util/TreeSet.java Tue Jan 22 16:01:44 2002
+@@ -66,6 +66,7 @@
* non-deterministic behavior.
*
* @author Jon Zeppieri
Index: compare/java.util.Vector.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.Vector.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.Vector.diff
--- compare/java.util.Vector.diff 2001/12/16 00:16:06 1.2
+++ compare/java.util.Vector.diff 2002/01/22 22:56:41
@@ -1,6 +1,6 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/Vector.java Fri Nov 2 09:28:56 2001
-+++ java/util/Vector.java Sat Dec 15 09:16:05 2001
-@@ -58,6 +58,7 @@
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/Vector.java Tue Jan 22 15:50:07 2002
++++ java/util/Vector.java Tue Jan 22 16:01:44 2002
+@@ -69,6 +69,7 @@
* directly specify this subclass.
*
* @author Scott G. Miller
Index: compare/java.util.zip.Deflater.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.Deflater.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.zip.Deflater.diff
--- compare/java.util.zip.Deflater.diff 2001/09/26 17:37:44 1.2
+++ compare/java.util.zip.Deflater.diff 2002/01/22 22:56:42
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/Deflater.java Wed Sep 26 08:18:48 2001
-+++ java/util/zip/Deflater.java Thu Dec 21 11:29:18 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/Deflater.java Tue Jan 22 15:50:10 2002
++++ java/util/zip/Deflater.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.Deflater
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -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
-@@ -26,487 +26,120 @@
+@@ -37,487 +37,120 @@
package java.util.zip;
Index: compare/java.util.zip.DeflaterOutputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.DeflaterOutputStream.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.zip.DeflaterOutputStream.diff
--- compare/java.util.zip.DeflaterOutputStream.diff 2001/09/26 17:37:44 1.2
+++ compare/java.util.zip.DeflaterOutputStream.diff 2002/01/22 22:56:42
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/DeflaterOutputStream.java Wed Sep 26 08:18:48 2001
-+++ java/util/zip/DeflaterOutputStream.java Mon Apr 2 10:28:54 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/DeflaterOutputStream.java Tue Jan 22 15:50:10 2002
++++ java/util/zip/DeflaterOutputStream.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.DeflaterOutputStream
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -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
-@@ -30,158 +30,104 @@
+@@ -41,158 +41,104 @@
import java.io.OutputStream;
import java.io.IOException;
Index: compare/java.util.zip.GZIPInputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.GZIPInputStream.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.zip.GZIPInputStream.diff
--- compare/java.util.zip.GZIPInputStream.diff 2001/09/26 17:37:44 1.2
+++ compare/java.util.zip.GZIPInputStream.diff 2002/01/22 22:56:42
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/GZIPInputStream.java Wed Sep 26 08:18:48 2001
-+++ java/util/zip/GZIPInputStream.java Fri Nov 17 14:42:28 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/GZIPInputStream.java Tue Jan 22 15:50:10 2002
++++ java/util/zip/GZIPInputStream.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.GZIPInputStream
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -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
-@@ -28,274 +28,143 @@
+@@ -39,274 +39,143 @@
import java.io.InputStream;
import java.io.IOException;
Index: compare/java.util.zip.GZIPOutputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.GZIPOutputStream.diff,v
retrieving revision 1.3
diff -u -r1.3 java.util.zip.GZIPOutputStream.diff
--- compare/java.util.zip.GZIPOutputStream.diff 2001/11/07 01:23:49 1.3
+++ compare/java.util.zip.GZIPOutputStream.diff 2002/01/22 22:56:42
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/GZIPOutputStream.java Wed Sep 26 08:18:48 2001
-+++ java/util/zip/GZIPOutputStream.java Mon Oct 29 14:48:01 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/GZIPOutputStream.java Tue Jan 22 15:50:10 2002
++++ java/util/zip/GZIPOutputStream.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.GZIPOutputStream
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -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
-@@ -26,116 +26,90 @@
+@@ -37,116 +37,90 @@
package java.util.zip;
Index: compare/java.util.zip.Inflater.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.Inflater.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.zip.Inflater.diff
--- compare/java.util.zip.Inflater.diff 2001/09/26 17:37:44 1.2
+++ compare/java.util.zip.Inflater.diff 2002/01/22 22:56:42
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/Inflater.java Wed Sep 26 08:18:48 2001
-+++ java/util/zip/Inflater.java Fri Nov 17 14:42:28 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/Inflater.java Tue Jan 22 15:50:10 2002
++++ java/util/zip/Inflater.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.Inflater
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -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
-@@ -26,669 +26,89 @@
+@@ -37,669 +37,89 @@
package java.util.zip;
Index: compare/java.util.zip.InflaterInputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.InflaterInputStream.diff,v
retrieving revision 1.2
diff -u -r1.2 java.util.zip.InflaterInputStream.diff
--- compare/java.util.zip.InflaterInputStream.diff 2001/09/26 17:37:44 1.2
+++ compare/java.util.zip.InflaterInputStream.diff 2002/01/22 22:56:43
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/InflaterInputStream.java Wed Sep 26 08:18:48 2001
-+++ java/util/zip/InflaterInputStream.java Wed Nov 29 03:37:40 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/InflaterInputStream.java Tue Jan 22 15:50:11 2002
++++ java/util/zip/InflaterInputStream.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.InflaterInputStream
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -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
-@@ -31,186 +31,123 @@
+@@ -42,186 +42,123 @@
import java.io.IOException;
/**
Index: compare/java.util.zip.ZipConstants.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.ZipConstants.diff,v
retrieving revision 1.3
diff -u -r1.3 java.util.zip.ZipConstants.diff
--- compare/java.util.zip.ZipConstants.diff 2001/10/19 21:06:09 1.3
+++ compare/java.util.zip.ZipConstants.diff 2002/01/22 22:56:43
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipConstants.java Thu Oct 18 12:05:41 2001
-+++ java/util/zip/ZipConstants.java Fri Nov 17 14:42:28 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipConstants.java Tue Jan 22 15:50:11 2002
++++ java/util/zip/ZipConstants.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.ZipConstants
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -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
-@@ -26,61 +26,19 @@
+@@ -37,61 +37,19 @@
package java.util.zip;
Index: compare/java.util.zip.ZipEntry.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.ZipEntry.diff,v
retrieving revision 1.3
diff -u -r1.3 java.util.zip.ZipEntry.diff
--- compare/java.util.zip.ZipEntry.diff 2001/10/19 21:06:09 1.3
+++ compare/java.util.zip.ZipEntry.diff 2002/01/22 22:56:43
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipEntry.java Thu Oct 18 12:05:41 2001
-+++ java/util/zip/ZipEntry.java Fri Nov 17 14:42:28 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipEntry.java Tue Jan 22 15:50:11 2002
++++ java/util/zip/ZipEntry.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.ZipEntry
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@
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,357 +25,201 @@
- executable file might be covered by the GNU General Public License. */
+@@ -36,357 +36,201 @@
+ exception statement from your version. */
package java.util.zip;
-import java.util.Calendar;
Index: compare/java.util.zip.ZipFile.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.ZipFile.diff,v
retrieving revision 1.4
diff -u -r1.4 java.util.zip.ZipFile.diff
--- compare/java.util.zip.ZipFile.diff 2001/10/19 21:06:09 1.4
+++ compare/java.util.zip.ZipFile.diff 2002/01/22 22:56:43
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipFile.java Thu Oct 18 12:05:41 2001
-+++ java/util/zip/ZipFile.java Fri Nov 17 14:42:28 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipFile.java Tue Jan 22 15:50:11 2002
++++ java/util/zip/ZipFile.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.ZipFile
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@
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,422 +25,233 @@
- executable file might be covered by the GNU General Public License. */
+@@ -36,422 +36,233 @@
+ exception statement from your version. */
package java.util.zip;
-import java.io.File;
@@ -185,7 +185,34 @@
- entries = new ZipEntry[count];
- raf.seek(centralOffset);
- for (int i = 0; i < count; i++)
-- {
++
++ file = new RandomAccessFile(f, "r");
++ name = f.getName();
++ readDirectory ();
++ }
++
++ void readDirectory () throws IOException
++ {
++ long size = file.length ();
++ if (size < ZipConstants.END_CENTRAL_DIR_SIZE)
++ throw new ZipException ("zipfile too short");
++ // We do not handle a "zipfile comment", which the appnote says can
++ // be at the end of a .zip file. We could handle this by seeking
++ // to the beginning and reading forwards.
++ file.seek(size - ZipConstants.END_CENTRAL_DIR_SIZE);
++ if (file.read() != 'P'
++ || file.read() != 'K'
++ || file.read() != '\005'
++ || file.read() != '\006')
++ throw new ZipException("not a valid zipfile");
++ file.skipBytes(6);
++ numEntries = readu2();
++ int dir_size = read4 (); // Read "size of the central directory".
++ file.seek(size - (dir_size + ZipConstants.END_CENTRAL_DIR_SIZE));
++
++ ZipEntry last = null;
++ for (int i = 0; i < numEntries; i++)
+ {
- if (readLeInt() != CENSIG)
- throw new ZipException("Wrong Central Directory signature");
- if (raf.skipBytes(CENHOW - CENVEM) != CENHOW - CENVEM)
@@ -214,34 +241,6 @@
- entry.setCompressedSize(csize & 0xffffffffL);
- entry.setDOSTime(dostime);
- if (extraLen > 0)
-+
-+ file = new RandomAccessFile(f, "r");
-+ name = f.getName();
-+ readDirectory ();
-+ }
-+
-+ void readDirectory () throws IOException
-+ {
-+ long size = file.length ();
-+ if (size < ZipConstants.END_CENTRAL_DIR_SIZE)
-+ throw new ZipException ("zipfile too short");
-+ // We do not handle a "zipfile comment", which the appnote says can
-+ // be at the end of a .zip file. We could handle this by seeking
-+ // to the beginning and reading forwards.
-+ file.seek(size - ZipConstants.END_CENTRAL_DIR_SIZE);
-+ if (file.read() != 'P'
-+ || file.read() != 'K'
-+ || file.read() != '\005'
-+ || file.read() != '\006')
-+ throw new ZipException("not a valid zipfile");
-+ file.skipBytes(6);
-+ numEntries = readu2();
-+ int dir_size = read4 (); // Read "size of the central directory".
-+ file.seek(size - (dir_size + ZipConstants.END_CENTRAL_DIR_SIZE));
-+
-+ ZipEntry last = null;
-+ for (int i = 0; i < numEntries; i++)
-+ {
+ file.skipBytes(10);
+ int method = readu2();
+ int modtime = readu2();
Index: compare/java.util.zip.ZipInputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.ZipInputStream.diff,v
retrieving revision 1.3
diff -u -r1.3 java.util.zip.ZipInputStream.diff
--- compare/java.util.zip.ZipInputStream.diff 2001/10/19 21:06:09 1.3
+++ compare/java.util.zip.ZipInputStream.diff 2002/01/22 22:56:44
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipInputStream.java Thu Oct 18 12:05:41 2001
-+++ java/util/zip/ZipInputStream.java Fri Nov 17 14:42:28 2000
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipInputStream.java Tue Jan 22 15:50:11 2002
++++ java/util/zip/ZipInputStream.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.ZipInputStream
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@
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,327 +25,259 @@
- executable file might be covered by the GNU General Public License. */
+@@ -36,327 +36,259 @@
+ exception statement from your version. */
package java.util.zip;
-import java.io.EOFException;
Index: compare/java.util.zip.ZipOutputStream.diff
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/java/compare/java.util.zip.ZipOutputStream.diff,v
retrieving revision 1.3
diff -u -r1.3 java.util.zip.ZipOutputStream.diff
--- compare/java.util.zip.ZipOutputStream.diff 2001/10/19 21:06:09 1.3
+++ compare/java.util.zip.ZipOutputStream.diff 2002/01/22 22:56:44
@@ -1,5 +1,5 @@
---- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipOutputStream.java Thu Oct 18 12:05:41 2001
-+++ java/util/zip/ZipOutputStream.java Mon Apr 2 10:28:54 2001
+--- /home/tromey/gnu/egcs/classpath/classpath/java/util/zip/ZipOutputStream.java Tue Jan 22 15:50:11 2002
++++ java/util/zip/ZipOutputStream.java Tue Jan 22 16:01:46 2002
@@ -1,5 +1,5 @@
-/* java.util.zip.ZipOutputStream
- Copyright (C) 2001 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@
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,369 +25,285 @@
- executable file might be covered by the GNU General Public License. */
+@@ -36,369 +36,286 @@
+ exception statement from your version. */
package java.util.zip;
-import java.io.OutputStream;
@@ -585,6 +585,7 @@
+ def.reset();
+ def.setLevel(compr);
+ sum.reset();
++ uncompressed_size = 0;
+ }
+
+ public void setLevel (int level)
More information about the Java-patches
mailing list