From 1adef668644e5af231d1694f9d4878a21e83ac36 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 13 Oct 2003 04:45:03 +0000 Subject: [PATCH] 2003-10-13 Michael Koch * 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 --- libjava/ChangeLog | 10 ++++++++++ libjava/java/nio/Buffer.java | 4 ++-- libjava/java/nio/MappedByteBuffer.java | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5c5f1f67073..f9ce22e5ab1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2003-10-13 Michael Koch + + * 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 * gnu/java/nio/PipeImpl.java diff --git a/libjava/java/nio/Buffer.java b/libjava/java/nio/Buffer.java index 9221d755be9..444d3d1c3ae 100644 --- 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 87500e76656..8f4b872cd11 100644 --- 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; } } -- 2.30.2