From: Michael Koch <konqueror@gmx.de>
Date: Tue, 13 May 2003 10:25:00 +0000 (+0000)
Subject: 2003-05-13  Michael Koch  <konqueror@gmx.de>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c6f824e248c6552e593590be4107633e1cf266c7;p=gcc.git

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 363681efcea..05f17e47667 100644
--- 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 3fa0f35843e..708a50c9a39 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 889267f302f..e0f27e6e697 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
       {