From 941bbe61efa8829a833dca96579bfbbe630d2760 Mon Sep 17 00:00:00 2001
From: gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 15 Jan 2007 12:45:35 +0000
Subject: [PATCH] 2007-01-15 Gary Benson <gbenson@redhat.com>
* java/nio/MappedByteBuffer.java: Removed.
* sources.am, Makefile.in: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120793 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 5 +
libjava/Makefile.in | 2 +-
.../lib/java/nio/MappedByteBuffer.class | Bin 1069 -> 1121 bytes
libjava/java/nio/MappedByteBuffer.java | 89 ------------------
libjava/sources.am | 2 +-
5 files changed, 7 insertions(+), 91 deletions(-)
delete mode 100644 libjava/java/nio/MappedByteBuffer.java
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ad6c1fba4ef3..6dc622b42345 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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.
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index e03542934f2b..78013d501002 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -4441,7 +4441,7 @@ classpath/java/nio/InvalidMarkException.java \
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 \
diff --git a/libjava/classpath/lib/java/nio/MappedByteBuffer.class b/libjava/classpath/lib/java/nio/MappedByteBuffer.class
index ff12d90a2b947fbb92780591243ee81ab99ebca6..05f6493a0cdf6bde5f7ec4a386a8fdf41e28b5e3 100644
GIT binary patch
delta 137
zcmZ3>@sNY-)W2Q(7#J7~8FV*t)i7!^GH|(8B&QaXWaj4;vomNgG6-iSmL=-vB<7{-
zhh!AxmnSCWq;fGZGH7k?W{hF7U|~>Y5Mf|qPy-sm0u)wfU<a~{fh<NK&8oGHL31OJ
b!NkA?B)Nbz14A@WVa#Mf7EyL>u#64>-*Oo0
delta 101
zcmaFJv6h4D)W2Q(7#J7~8MHQX)iAPhF)%WyZ{Ell!{o-upvoWu<gx>$^?@`akY?4|
j#-O$l$Y5gN0+MWC!3YL!Ae#rG07&x!d5jDiU{#s`h-VAn
diff --git a/libjava/java/nio/MappedByteBuffer.java b/libjava/java/nio/MappedByteBuffer.java
deleted file mode 100644
index 9b6df1715727..000000000000
--- a/libjava/java/nio/MappedByteBuffer.java
+++ /dev/null
@@ -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(); }
-}
diff --git a/libjava/sources.am b/libjava/sources.am
index 418bd8d7c52a..e1fcbf315d9a 100644
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -4893,7 +4893,7 @@ classpath/java/nio/InvalidMarkException.java \
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 \
--
GitLab