diff options
author | Michael Koch <konqueror@gmx.de> | 2004-10-11 09:45:19 +0000 |
---|---|---|
committer | Michael Koch <konqueror@gmx.de> | 2004-10-11 09:45:19 +0000 |
commit | 3c0344b86c10638fa45638c7f25c7ccd7683c4f1 (patch) | |
tree | 28477550af9b87469350290bc2658750454bb85a | |
parent | 1b3cc2f76653ebd71e29df8e3f77f4c85d58b0fa (diff) | |
download | classpath-3c0344b86c10638fa45638c7f25c7ccd7683c4f1.tar.gz |
2004-10-11 Michael Koch <konqueror@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.
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | java/io/DataInputStream.java | 2 | ||||
-rw-r--r-- | java/io/DataOutputStream.java | 2 | ||||
-rw-r--r-- | java/io/InputStreamReader.java | 2 | ||||
-rw-r--r-- | java/io/ObjectInputStream.java | 9 | ||||
-rw-r--r-- | java/io/ObjectOutputStream.java | 4 |
6 files changed, 25 insertions, 8 deletions
@@ -1,3 +1,17 @@ +2004-10-11 Michael Koch <konqueror@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-10 Sven de Marothy <sven@physto.se> * native/jni/java-lang/java_lang_Double.c diff --git a/java/io/DataInputStream.java b/java/io/DataInputStream.java index b74fabe63..d6068828c 100644 --- a/java/io/DataInputStream.java +++ b/java/io/DataInputStream.java @@ -651,7 +651,7 @@ public class DataInputStream extends FilterInputStream implements DataInput * * @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]; diff --git a/java/io/DataOutputStream.java b/java/io/DataOutputStream.java index 9232b7ad7..ab2db95df 100644 --- a/java/io/DataOutputStream.java +++ b/java/io/DataOutputStream.java @@ -404,7 +404,7 @@ public class DataOutputStream extends FilterOutputStream implements DataOutput * * @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; diff --git a/java/io/InputStreamReader.java b/java/io/InputStreamReader.java index 8154dff38..f7fccd20f 100644 --- a/java/io/InputStreamReader.java +++ b/java/io/InputStreamReader.java @@ -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. diff --git a/java/io/ObjectInputStream.java b/java/io/ObjectInputStream.java index 954ecb54f..3b3680522 100644 --- a/java/io/ObjectInputStream.java +++ b/java/io/ObjectInputStream.java @@ -327,8 +327,11 @@ public class ObjectInputStream extends InputStream 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 @@ public class ObjectInputStream extends InputStream * * XXX: finish up comments */ - public static abstract class GetField + public abstract static class GetField { public abstract ObjectStreamClass getObjectStreamClass(); diff --git a/java/io/ObjectOutputStream.java b/java/io/ObjectOutputStream.java index 91c985856..f66cddd62 100644 --- a/java/io/ObjectOutputStream.java +++ b/java/io/ObjectOutputStream.java @@ -893,7 +893,7 @@ public class ObjectOutputStream extends OutputStream * * 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 @@ public class ObjectOutputStream extends OutputStream } // 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; |