[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small package-private access changes in java.io

[Kaffe CVS]

PatchSet 5423 
Date: 2004/11/09 21:45:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small package-private access changes in java.io

2004-11-09  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/io/ObjectOutputStream.java,
        libraries/javalib/java/io/eleteFileHelper.java:
        Resynced with GNU Classpath.

        2004-11-06  Tom Tromey  <tromey at redhat.com>

        * java/io/ObjectOutputStream.java (currentObjectStreamClass): Now
        package-private.
        (setBlockDataMode): Likewise.
        * java/io/DeleteFileHelper.java (DeleteFileHelper): Now
        package-private.

Members: 
	ChangeLog:1.2972->1.2973 
	libraries/javalib/java/io/DeleteFileHelper.java:1.3->1.4 
	libraries/javalib/java/io/ObjectOutputStream.java:1.26->1.27 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2972 kaffe/ChangeLog:1.2973
--- kaffe/ChangeLog:1.2972	Mon Nov  8 10:47:11 2004
+++ kaffe/ChangeLog	Tue Nov  9 21:45:20 2004
@@ -1,3 +1,17 @@
+2004-11-09  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/java/io/ObjectOutputStream.java,
+	libraries/javalib/java/io/eleteFileHelper.java:
+        Resynced with GNU Classpath.
+
+	2004-11-06  Tom Tromey  <tromey at redhat.com>
+
+        * java/io/ObjectOutputStream.java (currentObjectStreamClass): Now
+        package-private.
+        (setBlockDataMode): Likewise.
+        * java/io/DeleteFileHelper.java (DeleteFileHelper): Now
+        package-private.
+
 2004-11-08  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/gnu/java/nio/charset/ISO_8859_1.java,
Index: kaffe/libraries/javalib/java/io/DeleteFileHelper.java
diff -u kaffe/libraries/javalib/java/io/DeleteFileHelper.java:1.3 kaffe/libraries/javalib/java/io/DeleteFileHelper.java:1.4
--- kaffe/libraries/javalib/java/io/DeleteFileHelper.java:1.3	Sun Sep 12 15:11:02 2004
+++ kaffe/libraries/javalib/java/io/DeleteFileHelper.java	Tue Nov  9 21:45:25 2004
@@ -97,7 +97,8 @@
       }
   }
 
-  private DeleteFileHelper()
+  // Package-private to avoid a trampoline constructor.
+  DeleteFileHelper()
   {
   }
   
Index: kaffe/libraries/javalib/java/io/ObjectOutputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.26 kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.27
--- kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.26	Wed Nov  3 17:45:16 2004
+++ kaffe/libraries/javalib/java/io/ObjectOutputStream.java	Tue Nov  9 21:45:25 2004
@@ -1239,7 +1239,8 @@
 
 
   // Toggles writing primitive data to block-data buffer.
-  private boolean setBlockDataMode(boolean on) throws IOException
+  // Package-private to avoid a trampoline constructor.
+  boolean setBlockDataMode(boolean on) throws IOException
   {
     if (on == writeDataAsBlocks)
       return on;
@@ -1563,7 +1564,8 @@
   private byte[] blockData;
   private int blockDataCount;
   private Object currentObject;
-  private ObjectStreamClass currentObjectStreamClass;
+  // Package-private to avoid a trampoline.
+  ObjectStreamClass currentObjectStreamClass;
   private PutField currentPutField;
   private boolean fieldsAlreadyWritten;
   private boolean replacementEnabled;