diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-05-13 10:25:00 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-05-13 10:25:00 +0000 |
| commit | c6f824e248c6552e593590be4107633e1cf266c7 (patch) | |
| tree | e68d3d5d12ef21a52873cf5bf3040dda7428356c | |
| parent | e48d8b88869563f85f2c83108257615f1cc73c76 (diff) | |
| download | gcc-c6f824e248c6552e593590be4107633e1cf266c7.zip gcc-c6f824e248c6552e593590be4107633e1cf266c7.tar.gz gcc-c6f824e248c6552e593590be4107633e1cf266c7.tar.bz2 | |
2003-05-13 Michael Koch <konqueror@gmx.de>
* java/nio/channels/FileChannel.java
(MapMode.m): Made it package-private to match JDK 1.4.
* java/nio/charset/Charset.java
(decode): Made it final to match JDK 1.4.
From-SVN: r66756
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/nio/channels/FileChannel.java | 2 | ||||
| -rw-r--r-- | libjava/java/nio/charset/Charset.java | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 363681e..05f17e4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 2003-05-13 Michael Koch <konqueror@gmx.de> + * java/nio/channels/FileChannel.java + (MapMode.m): Made it package-private to match JDK 1.4. + * java/nio/charset/Charset.java + (decode): Made it final to match JDK 1.4. + +2003-05-13 Michael Koch <konqueror@gmx.de> + * java/io/FileDescriptor.java (SYNC): New constant. (DSYNC): Likewise. diff --git a/libjava/java/nio/channels/FileChannel.java b/libjava/java/nio/channels/FileChannel.java index 3fa0f35..708a50c 100644 --- a/libjava/java/nio/channels/FileChannel.java +++ b/libjava/java/nio/channels/FileChannel.java @@ -51,7 +51,7 @@ public abstract class FileChannel extends AbstractInterruptibleChannel { public static class MapMode { - public int m; + int m; public static MapMode READ_ONLY = new MapMode(0); public static MapMode READ_WRITE = new MapMode(1); diff --git a/libjava/java/nio/charset/Charset.java b/libjava/java/nio/charset/Charset.java index 889267f..e0f27e6 100644 --- a/libjava/java/nio/charset/Charset.java +++ b/libjava/java/nio/charset/Charset.java @@ -235,7 +235,7 @@ public abstract class Charset implements Comparable return encode (CharBuffer.wrap (str)); } - public CharBuffer decode (ByteBuffer bb) + public final CharBuffer decode (ByteBuffer bb) { try { |