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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 363681efcea1a779858711920120851d51e4016f..05f17e47667e54c5c6dc779d7a1038caf58f1f76 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/libjava/java/nio/channels/FileChannel.java b/libjava/java/nio/channels/FileChannel.java
index 3fa0f35843ee213498d6a253141c5272c03c8a7f..708a50c9a3972d4dd2c625cd6e89714cf4406c18 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 889267f302f033570228877d86573f76b12edce6..e0f27e6e697025f39c47708afdfd06a260da8483 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
       {