* FYI: Merge java.nio.MappedByteBuffer
@ 2007-01-15 12:47 Gary Benson
0 siblings, 0 replies; only message in thread
From: Gary Benson @ 2007-01-15 12:47 UTC (permalink / raw)
To: java-patches
[-- Attachment #1: Type: text/plain, Size: 94 bytes --]
Hi all,
This commit replaces GCJ's java.nio.MappedByteBuffer with Classpath's.
Cheers,
Gary
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 4182 bytes --]
Index: ChangeLog
===================================================================
--- ChangeLog (revision 120791)
+++ ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2007-01-15 Gary Benson <gbenson@redhat.com>
+
+ * java/nio/MappedByteBuffer.java: Removed.
+ * sources.am, Makefile.in: Rebuilt.
+
2007-01-15 Gary Benson <gbenson@redhat.com>
* java/net/URLClassLoader.java: Removed.
Index: java/nio/MappedByteBuffer.java
===================================================================
--- java/nio/MappedByteBuffer.java (revision 120790)
+++ java/nio/MappedByteBuffer.java (working copy)
@@ -1,89 +0,0 @@
-/* MappedByteBuffer.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package java.nio;
-
-/**
- * @author Michael Koch (konqueror@gmx.de)
- * @since 1.4
- */
-public abstract class MappedByteBuffer extends ByteBuffer
-{
- MappedByteBuffer (int capacity, int limit, int position, int mark)
- {
- super (capacity, limit, position, mark);
- }
-
- void forceImpl()
- {
- }
-
- public final MappedByteBuffer force ()
- {
- forceImpl();
- return this;
- }
-
- boolean isLoadedImpl()
- {
- load();
- return true;
- }
-
- public final boolean isLoaded ()
- {
- return isLoadedImpl();
- }
-
- void loadImpl()
- {
- }
-
- public final MappedByteBuffer load ()
- {
- loadImpl();
- return this;
- }
-
- void unmapImpl ()
- {
- forceImpl();
- }
-
- public void finalize () { unmapImpl(); }
-}
Index: sources.am
===================================================================
--- sources.am (revision 120791)
+++ sources.am (working copy)
@@ -4893,7 +4893,7 @@
classpath/java/nio/LongBuffer.java \
classpath/java/nio/LongBufferImpl.java \
classpath/java/nio/LongViewBufferImpl.java \
-java/nio/MappedByteBuffer.java \
+classpath/java/nio/MappedByteBuffer.java \
java/nio/MappedByteBufferImpl.java \
classpath/java/nio/ReadOnlyBufferException.java \
classpath/java/nio/ShortBuffer.java \
Index: Makefile.in
===================================================================
--- Makefile.in (revision 120791)
+++ Makefile.in (working copy)
@@ -4441,7 +4441,7 @@
classpath/java/nio/LongBuffer.java \
classpath/java/nio/LongBufferImpl.java \
classpath/java/nio/LongViewBufferImpl.java \
-java/nio/MappedByteBuffer.java \
+classpath/java/nio/MappedByteBuffer.java \
java/nio/MappedByteBufferImpl.java \
classpath/java/nio/ReadOnlyBufferException.java \
classpath/java/nio/ShortBuffer.java \
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-01-15 12:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-01-15 12:47 FYI: Merge java.nio.MappedByteBuffer Gary Benson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).