[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: Small IO cleanups

Kaffe CVS cvs-commits at kaffe.org
Mon Oct 11 17:11:53 PDT 2004


PatchSet 5270 
Date: 2004/10/12 00:07:45
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Small IO cleanups

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

        * libraries/javalib/java/io/DataInputStream.java,
        libraries/javalib/java/io/DataOutputStream.java,
        libraries/javalib/java/io/InputStreamReader.java,
        libraries/javalib/java/io/ObjectInputStream.java,
        libraries/javalib/java/io/ObjectOutputStream.java:
        Resynced with GNU Classpath.

        2004-10-11  Michael Koch  <konqueror at gmx.de>

        * java/io/DataInputStream.java
        (readUTF): Reorder modifiers.
        * java/io/DataOutputStream.java
        (writeUTF): Likewise.
        * java/io/ObjectInputStream.java
        (GetField): Likewise.
        * java/io/ObjectOutputStream.java
        (PutField): Likewise.
        (BUFFER_SIZE): Likewise.
        * java/io/InputStreamReader.java:
        Merged file header.

Members: 
	ChangeLog:1.2822->1.2823 
	libraries/javalib/java/io/DataInputStream.java:1.21->1.22 
	libraries/javalib/java/io/DataOutputStream.java:1.9->1.10 
	libraries/javalib/java/io/InputStreamReader.java:1.16->1.17 
	libraries/javalib/java/io/ObjectInputStream.java:1.41->1.42 
	libraries/javalib/java/io/ObjectOutputStream.java:1.24->1.25 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2822 kaffe/ChangeLog:1.2823
--- kaffe/ChangeLog:1.2822	Mon Oct 11 23:46:28 2004
+++ kaffe/ChangeLog	Tue Oct 12 00:07:45 2004
@@ -1,5 +1,28 @@
 2004-10-11  Dalibor Topic <robilad at kaffe.org>
 
+	* libraries/javalib/java/io/DataInputStream.java,
+	libraries/javalib/java/io/DataOutputStream.java,
+	libraries/javalib/java/io/InputStreamReader.java,
+	libraries/javalib/java/io/ObjectInputStream.java,
+	libraries/javalib/java/io/ObjectOutputStream.java:
+	Resynced with GNU Classpath.
+
+	2004-10-11  Michael Koch  <konqueror at gmx.de>
+
+        * java/io/DataInputStream.java
+        (readUTF): Reorder modifiers.
+        * java/io/DataOutputStream.java
+        (writeUTF): Likewise.
+        * java/io/ObjectInputStream.java
+        (GetField): Likewise.
+        * java/io/ObjectOutputStream.java
+        (PutField): Likewise.
+        (BUFFER_SIZE): Likewise.
+        * java/io/InputStreamReader.java:
+        Merged file header.
+
+2004-10-11  Dalibor Topic <robilad at kaffe.org>
+
 	* libraries/javalib/java/nio/ByteBufferHelper.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/io/DataInputStream.java
diff -u kaffe/libraries/javalib/java/io/DataInputStream.java:1.21 kaffe/libraries/javalib/java/io/DataInputStream.java:1.22
--- kaffe/libraries/javalib/java/io/DataInputStream.java:1.21	Mon Oct  4 14:15:27 2004
+++ kaffe/libraries/javalib/java/io/DataInputStream.java	Tue Oct 12 00:07:48 2004
@@ -651,7 +651,7 @@
    *
    * @see DataInput#readUTF
    */
-  public final static String readUTF (DataInput in) throws IOException
+  public static final String readUTF(DataInput in) throws IOException
   {
     final int UTFlen = in.readUnsignedShort ();
     byte[] buf = new byte [UTFlen];
Index: kaffe/libraries/javalib/java/io/DataOutputStream.java
diff -u kaffe/libraries/javalib/java/io/DataOutputStream.java:1.9 kaffe/libraries/javalib/java/io/DataOutputStream.java:1.10
--- kaffe/libraries/javalib/java/io/DataOutputStream.java:1.9	Sun Nov  2 13:29:36 2003
+++ kaffe/libraries/javalib/java/io/DataOutputStream.java	Tue Oct 12 00:07:48 2004
@@ -404,7 +404,7 @@
    *
    * @see DataInput#readUTF
    */
-  public synchronized final void writeUTF (String value) throws IOException
+  public final synchronized void writeUTF(String value) throws IOException
   {
     int len = value.length();
     int sum = 0;
Index: kaffe/libraries/javalib/java/io/InputStreamReader.java
diff -u kaffe/libraries/javalib/java/io/InputStreamReader.java:1.16 kaffe/libraries/javalib/java/io/InputStreamReader.java:1.17
--- kaffe/libraries/javalib/java/io/InputStreamReader.java:1.16	Tue May 18 03:35:07 2004
+++ kaffe/libraries/javalib/java/io/InputStreamReader.java	Tue Oct 12 00:07:48 2004
@@ -1,5 +1,5 @@
 /* InputStreamReader.java -- Reader than transforms bytes to chars
-   Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: kaffe/libraries/javalib/java/io/ObjectInputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.41 kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.42
--- kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.41	Tue Sep 28 18:37:52 2004
+++ kaffe/libraries/javalib/java/io/ObjectInputStream.java	Tue Oct 12 00:07:48 2004
@@ -327,8 +327,11 @@
 		      if(dump) dumpElement("ENDBLOCKDATA? ");
 		      try
 			{
-			  // FIXME: XXX: This try block is to catch EOF which is
-			  // thrown for some objects.  That indicates a bug in the logic.
+			  // FIXME: XXX: This try block is to
+			  // catch EOF which is thrown for some
+			  // objects.  That indicates a bug in
+			  // the logic.
+
 			  if (this.realInputStream.readByte() != TC_ENDBLOCKDATA)
 			    throw new IOException
 			      ("No end of block data seen for class with readObject (ObjectInputStream) method.");
@@ -1102,7 +1105,7 @@
    *
    * XXX: finish up comments
    */
-  public static abstract class GetField
+  public abstract static class GetField
   {
     public abstract ObjectStreamClass getObjectStreamClass();
 
@@ -1847,7 +1850,7 @@
   private Hashtable classLookupTable;
   private GetField prereadFields;
 
-  private static boolean dump = false && Configuration.DEBUG;
+  private static boolean dump;
 
   // The nesting depth for debugging output
   private int depth = 0;
Index: kaffe/libraries/javalib/java/io/ObjectOutputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.24 kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.25
--- kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.24	Mon Oct  4 14:46:23 2004
+++ kaffe/libraries/javalib/java/io/ObjectOutputStream.java	Tue Oct 12 00:07:48 2004
@@ -893,7 +893,7 @@
    *
    * XXX: finish up comments
    */
-  public static abstract class PutField
+  public abstract static class PutField
   {
     public abstract void put (String name, boolean value);
     public abstract void put (String name, byte value);
@@ -1552,7 +1552,7 @@
   }
 
   // this value comes from 1.2 spec, but is used in 1.1 as well
-  private final static int BUFFER_SIZE = 1024;
+  private static final int BUFFER_SIZE = 1024;
 
   private static int defaultProtocolVersion = PROTOCOL_VERSION_2;
 




More information about the kaffe mailing list