2003-10-13 Michael Koch <konqueror@gmx.de>

	* java/nio/Buffer.java
	(hasRemaining): Made implementation more clear.
	* java/nio/MappedByteBuffer.java
	(loaded): New member variable.
	(force): Added comment.
	(isLoaded): Return value of loaded.
	(load): Set loaded to true, added comment.

From-SVN: r72418

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5c5f1f67073e9e392aa0f3635b59f9874dbb05e0..f9ce22e5ab1dc18eda420a5aa5219cdfa3f0e9f0 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-13  Michael Koch  <konqueror@gmx.de>
+
+       * java/nio/Buffer.java
+       (hasRemaining): Made implementation more clear.
+       * java/nio/MappedByteBuffer.java
+       (loaded): New member variable.
+       (force): Added comment.
+       (isLoaded): Return value of loaded.
+       (load): Set loaded to true, added comment.
+
 2003-10-12  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/nio/PipeImpl.java

diff --git a/libjava/java/nio/Buffer.java b/libjava/java/nio/Buffer.java
index 9221d755be90fc918ce6c4ffd46216870376c7b6..444d3d1c3ae0a8a35b1f98a1b9883d349cbe4996 100644 (file)
--- a/libjava/java/nio/Buffer.java
+++ b/libjava/java/nio/Buffer.java
@@ -1,5 +1,5 @@
 /* Buffer.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -102,7 +102,7 @@ public abstract class Buffer
    */
   public final boolean hasRemaining ()
   {
-    return limit > pos;
+    return remaining() > 0;
   }
 
   /**

diff --git a/libjava/java/nio/MappedByteBuffer.java b/libjava/java/nio/MappedByteBuffer.java
index 87500e76656415306974a36004beab5d3d486abd..8f4b872cd11a1fe100fb76ef863859e261c2c635 100644 (file)
--- a/libjava/java/nio/MappedByteBuffer.java
+++ b/libjava/java/nio/MappedByteBuffer.java
@@ -44,6 +44,8 @@ package java.nio;
  */
 public abstract class MappedByteBuffer extends ByteBuffer
 {
+  private boolean loaded = false;
+  
   MappedByteBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
@@ -51,16 +53,19 @@ public abstract class MappedByteBuffer extends ByteBuffer
   
   public final MappedByteBuffer force ()
   {
+    // FIXME: Flush to disk here.
     return this;
   }
     
   public final boolean isLoaded ()
   {
-    return true;
+    return loaded;
   }
     
   public final MappedByteBuffer load ()
   {
+    // FIXME: Try to load all pages into memory.
+    loaded = true;
     return this;
   }
 }