2004-04-29 Michael Koch <konqueror@gmx.de>

	* include/java_nio_MappedByteBufferImpl.h:
	New file.
	* include/Makefile.am:
	Generate java_nio_MappedByteBufferImpl.h.
	* native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
	(implTruncate): Fixed typo.
	* native/jni/java-nio/java_nio_MappedByteBufferImpl.c:
	New file.
	* native/jni/java-nio/Makefile.am:
	Compile java_nio_MappedByteBufferImpl.c.

6 files changed, 113 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a74587d1..879d98f06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2004-04-29  Michael Koch  <konqueror@gmx.de>
 
+	* include/java_nio_MappedByteBufferImpl.h:
+	New file.
+	* include/Makefile.am:
+	Generate java_nio_MappedByteBufferImpl.h.
+	* native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
+	(implTruncate): Fixed typo.
+	* native/jni/java-nio/java_nio_MappedByteBufferImpl.c:
+	New file.
+	* native/jni/java-nio/Makefile.am:
+	Compile java_nio_MappedByteBufferImpl.c.
+
+2004-04-29  Michael Koch  <konqueror@gmx.de>
+
 	* javax/print/PrintServiceLookup.java: New file.
 	* javax/print/Makefile.am (EXTRA_DIST):
 	Added PrintServiceLookup.java.
diff --git a/include/Makefile.am b/include/Makefile.am
index cb04470f3..e18f7194f 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -56,6 +56,7 @@ $(top_srcdir)/include/java_lang_reflect_Array.h \
 $(top_srcdir)/include/java_net_InetAddress.h \
 $(top_srcdir)/include/java_net_NetworkInterface.h \
 $(top_srcdir)/include/java_nio_DirectByteBufferImpl.h \
+$(top_srcdir)/include/java_nio_MappedByteBufferImpl.h \
 $(top_srcdir)/include/java_util_TimeZone.h
 
 if CREATE_JNI_HEADERS
@@ -166,6 +167,8 @@ $(top_srcdir)/include/java_net_NetworkInterface.h: $(top_srcdir)/java/net/Networ
 	$(JAVAH) -o $@ java.net.NetworkInterface
 $(top_srcdir)/include/java_nio_DirectByteBufferImpl.h: $(top_srcdir)/java/nio/DirectByteBufferImpl.java
 	$(JAVAH) -o $@ java.nio.DirectByteBufferImpl
+$(top_srcdir)/include/java_nio_MappedByteBufferImpl.h: $(top_srcdir)/java/nio/MappedByteBufferImpl.java
+	$(JAVAH) -o $@ java.nio.MappedByteBufferImpl
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio/channels/FileChannelImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.channels.FileChannelImpl
 $(top_srcdir)/include/java_util_TimeZone.h: $(top_srcdir)/java/util/TimeZone.java
diff --git a/include/java_nio_MappedByteBufferImpl.h b/include/java_nio_MappedByteBufferImpl.h
new file mode 100644
index 000000000..d38a679b3
--- /dev/null
+++ b/include/java_nio_MappedByteBufferImpl.h
@@ -0,0 +1,22 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __java_nio_MappedByteBufferImpl__
+#define __java_nio_MappedByteBufferImpl__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_unmapImpl (JNIEnv *env, jobject);
+extern JNIEXPORT jboolean JNICALL Java_java_nio_MappedByteBufferImpl_isLoadedImpl (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_loadImpl (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_forceImpl (JNIEnv *env, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_nio_MappedByteBufferImpl__ */
diff --git a/native/jni/java-nio/Makefile.am b/native/jni/java-nio/Makefile.am
index 50b1cf92a..9840c10bd 100644
--- a/native/jni/java-nio/Makefile.am
+++ b/native/jni/java-nio/Makefile.am
@@ -4,7 +4,8 @@ libjavanio_la_SOURCES = gnu_java_nio_NIOServerSocket.c \
 			gnu_java_nio_PipeImpl.c \
 			gnu_java_nio_SelectorImpl.c \
 			gnu_java_nio_channels_FileChannelImpl.c \
-			java_nio_DirectByteBufferImpl.c
+			java_nio_DirectByteBufferImpl.c \
+			java_nio_MappedByteBufferImpl.c
 
 libjavanio_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
diff --git a/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c b/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
index 34543475b..e60aafbb6 100644
--- a/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
+++ b/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
@@ -479,7 +479,7 @@ Java_gnu_java_nio_channels_FileChannelImpl_implTruncate (JNIEnv *env, jobject ob
       JCL_ThrowException(env, "java/lang/UnsupportedOperationException",
         "not implemented - can't shorten files on this platform");
       */
-      JCL_ThrowException(env, IOException,
+      JCL_ThrowException(env, IO_EXCEPTION,
                          "Unable to shorten file length");
 #endif /* HAVE_FTRUNCATE */
     }
diff --git a/native/jni/java-nio/java_nio_MappedByteBufferImpl.c b/native/jni/java-nio/java_nio_MappedByteBufferImpl.c
new file mode 100644
index 000000000..0091d9248
--- /dev/null
+++ b/native/jni/java-nio/java_nio_MappedByteBufferImpl.c
@@ -0,0 +1,72 @@
+/* java_nio_MappedByteBufferImpl.c - Native methods for MappedByteBufferImpl
+   Copyright (C) 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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. */
+
+#include <config.h>
+#include <errno.h>
+
+#include <jni.h>
+#include <jcl.h>
+
+#include "java_nio_MappedByteBufferImpl.h"
+
+#define IO_EXCEPTION "java/io/IOException"
+
+JNIEXPORT void JNICALL
+Java_java_nio_MappedByteBufferImpl_unmapImpl (JNIEnv *env, jclass class)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.MappedByteBufferImpl.unmapImpl(): not implemented");
+}
+
+JNIEXPORT jboolean JNICALL
+Java_java_nio_MappedByteBufferImpl_isLoadedImpl (JNIEnv *env, jclass class)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.MappedByteBufferImpl.isLoadedImpl(): not implemented");
+  return 0;
+}
+
+JNIEXPORT void JNICALL
+Java_java_nio_MappedByteBufferImpl_loadImpl (JNIEnv *env, jclass clazz)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.MappedByteBufferImpl.loadImpl(): not implemented");
+}
+
+JNIEXPORT void JNICALL
+Java_java_nio_MappedByteBufferImpl_forceImpl (JNIEnv *env, jclass class)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.MappedByteBufferImpl.forceImpl(): not implemented");
+}
+