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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66756 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 363681e..05f17e4 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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
       {