2006-01-10 Andrew John Hughes <gnu_andrew@member.fsf.org>

	Merge of HEAD --> generics branch for the period
	2005/11/27 to 2006/01/09.

7 files changed, 224 insertions, 70 deletions

diff --git a/include/.cvsignore b/include/.cvsignore
index c16eccb69..773d8af88 100644
--- a/include/.cvsignore
+++ b/include/.cvsignore
@@ -6,3 +6,4 @@ stamp-h.in
 config.h.in
 jni_md.h
 stamp-h1
+config-int.h
diff --git a/include/Makefile.am b/include/Makefile.am
index 3be305045..f829ba4ea 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,10 +1,11 @@
 include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h
 
-DISTCLEANFILES = jni_md.h
+DISTCLEANFILES = jni_md.h config-int.h
 
 ARG_JNI_JAVAH = -jni
 ARG_CLASSPATH_JAVAH = -bootclasspath
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) ../lib:$(USER_CLASSLIB)
+CLASSDIR = lib
 
 SOUND_H_FILES = \
 $(top_srcdir)/include/gnu_javax_sound_midi_alsa_AlsaPortDevice.h \
@@ -142,25 +143,25 @@ if CREATE_JNI_HEADERS
 
 all-local: $(H_FILES)
 
-$(top_srcdir)/include/gnu_xml_libxmlj_dom_%.h: $(top_builddir)/lib/gnu/xml/libxmlj/dom/%.class
+$(top_srcdir)/include/gnu_xml_libxmlj_dom_%.h: $(top_builddir)/$(CLASSDIR)/gnu/xml/libxmlj/dom/%.class
 	$(JAVAH) -o $@ gnu.xml.libxmlj.dom.$*
 
-$(top_srcdir)/include/gnu_xml_libxmlj_sax_%.h: $(top_builddir)/lib/gnu/xml/libxmlj/sax/%.class
+$(top_srcdir)/include/gnu_xml_libxmlj_sax_%.h: $(top_builddir)/$(CLASSDIR)/gnu/xml/libxmlj/sax/%.class
 	$(JAVAH) -o $@ gnu.xml.libxmlj.sax.$*
 
-$(top_srcdir)/include/gnu_xml_libxmlj_transform_%.h: $(top_builddir)/lib/gnu/xml/libxmlj/transform/%.class
+$(top_srcdir)/include/gnu_xml_libxmlj_transform_%.h: $(top_builddir)/$(CLASSDIR)/gnu/xml/libxmlj/transform/%.class
 	$(JAVAH) -o $@ gnu.xml.libxmlj.transform.$*
 
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_%.h: $(top_builddir)/lib/gnu/java/awt/peer/gtk/%.class
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_%.h: $(top_builddir)/$(CLASSDIR)/gnu/java/awt/peer/gtk/%.class
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.$*
 
-$(top_srcdir)/include/gnu_java_awt_peer_qt_%.h: $(top_builddir)/lib/gnu/java/awt/peer/qt/%.class
+$(top_srcdir)/include/gnu_java_awt_peer_qt_%.h: $(top_builddir)/$(CLASSDIR)/gnu/java/awt/peer/qt/%.class
 	$(JAVAH) -o $@ gnu.java.awt.peer.qt.$*
 
-$(top_srcdir)/include/gnu_javax_sound_midi_alsa_%.h: $(top_builddir)/lib/gnu/javax/sound/midi/alsa/%.class
+$(top_srcdir)/include/gnu_javax_sound_midi_alsa_%.h: $(top_builddir)/$(CLASSDIR)/gnu/javax/sound/midi/alsa/%.class
 	$(JAVAH) -o $@ gnu.javax.sound.midi.alsa.$*
 
-$(top_srcdir)/include/gnu_javax_sound_midi_dssi_%.h: $(top_builddir)/lib/gnu/javax/sound/midi/dssi/%.class
+$(top_srcdir)/include/gnu_javax_sound_midi_dssi_%.h: $(top_builddir)/$(CLASSDIR)/gnu/javax/sound/midi/dssi/%.class
 	$(JAVAH) -o $@ gnu.javax.sound.midi.dssi.$*
 
 $(top_srcdir)/include/gnu_java_net_PlainDatagramSocketImpl.h: $(top_srcdir)/gnu/java/net/PlainDatagramSocketImpl.java
diff --git a/include/gnu_java_awt_peer_gtk_GdkGraphics.h b/include/gnu_java_awt_peer_gtk_GdkGraphics.h
index 427f0916d..8a87738f2 100644
--- a/include/gnu_java_awt_peer_gtk_GdkGraphics.h
+++ b/include/gnu_java_awt_peer_gtk_GdkGraphics.h
@@ -15,11 +15,11 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_ja
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initStateUnlocked (JNIEnv *env, jobject, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__II (JNIEnv *env, jobject, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initFromImage (JNIEnv *env, jobject, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyState (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_nativeCopyState (JNIEnv *env, jobject, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_connectSignals (JNIEnv *env, jobject, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect (JNIEnv *env, jobject, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_dispose (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_nativeDispose (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawLine (JNIEnv *env, jobject, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawArc (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillArc (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
diff --git a/include/gnu_java_net_PlainDatagramSocketImpl.h b/include/gnu_java_net_PlainDatagramSocketImpl.h
deleted file mode 100644
index 9cb20b7dc..000000000
--- a/include/gnu_java_net_PlainDatagramSocketImpl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_net_PlainDatagramSocketImpl__
-#define __gnu_java_net_PlainDatagramSocketImpl__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_bind (JNIEnv *env, jobject, jint, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_create (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_sendto (JNIEnv *env, jobject, jobject, jint, jbyteArray, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_receive0 (JNIEnv *env, jobject, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_setOption (JNIEnv *env, jobject, jint, jobject);
-JNIEXPORT jobject JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_getOption (JNIEnv *env, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_close (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_join (JNIEnv *env, jobject, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainDatagramSocketImpl_leave (JNIEnv *env, jobject, jobject);
-#undef gnu_java_net_PlainDatagramSocketImpl_IP_TTL
-#define gnu_java_net_PlainDatagramSocketImpl_IP_TTL 7777L
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gnu_java_net_PlainDatagramSocketImpl__ */
diff --git a/include/gnu_java_net_PlainSocketImpl.h b/include/gnu_java_net_PlainSocketImpl.h
deleted file mode 100644
index 1de21d610..000000000
--- a/include/gnu_java_net_PlainSocketImpl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_net_PlainSocketImpl__
-#define __gnu_java_net_PlainSocketImpl__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_setOption (JNIEnv *env, jobject, jint, jobject);
-JNIEXPORT jobject JNICALL Java_gnu_java_net_PlainSocketImpl_getOption (JNIEnv *env, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_shutdownInput (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_shutdownOutput (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_create (JNIEnv *env, jobject, jboolean);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_connect (JNIEnv *env, jobject, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_bind (JNIEnv *env, jobject, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_listen (JNIEnv *env, jobject, jint);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_accept (JNIEnv *env, jobject, jobject);
-JNIEXPORT jint JNICALL Java_gnu_java_net_PlainSocketImpl_available (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_close (JNIEnv *env, jobject);
-JNIEXPORT jint JNICALL Java_gnu_java_net_PlainSocketImpl_read (JNIEnv *env, jobject, jbyteArray, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_write (JNIEnv *env, jobject, jbyteArray, jint, jint);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gnu_java_net_PlainSocketImpl__ */
diff --git a/include/gnu_java_net_VMPlainDatagramSocketImpl.h b/include/gnu_java_net_VMPlainDatagramSocketImpl.h
new file mode 100644
index 000000000..616c75300
--- /dev/null
+++ b/include/gnu_java_net_VMPlainDatagramSocketImpl.h
@@ -0,0 +1,95 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class gnu_java_net_VMPlainDatagramSocketImpl */
+
+#ifndef _Included_gnu_java_net_VMPlainDatagramSocketImpl
+#define _Included_gnu_java_net_VMPlainDatagramSocketImpl
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef gnu_java_net_VMPlainDatagramSocketImpl_IP_TTL
+#define gnu_java_net_VMPlainDatagramSocketImpl_IP_TTL 7777L
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    bind
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;ILjava/net/InetAddress;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_bind
+  (JNIEnv *, jclass, jobject, jint, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    create
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_create
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    connect
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;Ljava/net/InetAddress;I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_connect
+  (JNIEnv *, jclass, jobject, jobject, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    nativeSendTo
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;Ljava/net/InetAddress;I[BII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_nativeSendTo
+  (JNIEnv *, jclass, jobject, jobject, jint, jbyteArray, jint, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    nativeReceive
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;[BII[B[I[I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_nativeReceive
+  (JNIEnv *, jclass, jobject, jbyteArray, jint, jint, jbyteArray, jintArray, jintArray);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    setOption
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;ILjava/lang/Object;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_setOption
+  (JNIEnv *, jclass, jobject, jint, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    getOption
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;I)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_getOption
+  (JNIEnv *, jclass, jobject, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    close
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_close
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    join
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;Ljava/net/InetAddress;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_join
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainDatagramSocketImpl
+ * Method:    leave
+ * Signature: (Lgnu/java/net/PlainDatagramSocketImpl;Ljava/net/InetAddress;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainDatagramSocketImpl_leave
+  (JNIEnv *, jclass, jobject, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/include/gnu_java_net_VMPlainSocketImpl.h b/include/gnu_java_net_VMPlainSocketImpl.h
new file mode 100644
index 000000000..1e22aefbd
--- /dev/null
+++ b/include/gnu_java_net_VMPlainSocketImpl.h
@@ -0,0 +1,117 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class gnu_java_net_VMPlainSocketImpl */
+
+#ifndef _Included_gnu_java_net_VMPlainSocketImpl
+#define _Included_gnu_java_net_VMPlainSocketImpl
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    setOption
+ * Signature: (Lgnu/java/net/PlainSocketImpl;ILjava/lang/Object;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setOption
+  (JNIEnv *, jclass, jobject, jint, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    getOption
+ * Signature: (Lgnu/java/net/PlainSocketImpl;I)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_gnu_java_net_VMPlainSocketImpl_getOption
+  (JNIEnv *, jclass, jobject, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    create
+ * Signature: (Lgnu/java/net/PlainSocketImpl;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_create
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    connect
+ * Signature: (Lgnu/java/net/PlainSocketImpl;Ljava/net/InetAddress;I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_connect
+  (JNIEnv *, jclass, jobject, jobject, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    bind
+ * Signature: (Lgnu/java/net/PlainSocketImpl;Ljava/net/InetAddress;I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind
+  (JNIEnv *, jclass, jobject, jobject, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    listen
+ * Signature: (Lgnu/java/net/PlainSocketImpl;I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_listen
+  (JNIEnv *, jclass, jobject, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    accept
+ * Signature: (Lgnu/java/net/PlainSocketImpl;Ljava/net/SocketImpl;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_accept
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    available
+ * Signature: (Lgnu/java/net/PlainSocketImpl;)I
+ */
+JNIEXPORT jint JNICALL Java_gnu_java_net_VMPlainSocketImpl_available
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    close
+ * Signature: (Lgnu/java/net/PlainSocketImpl;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_close
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    read
+ * Signature: (Lgnu/java/net/PlainSocketImpl;[BII)I
+ */
+JNIEXPORT jint JNICALL Java_gnu_java_net_VMPlainSocketImpl_read
+  (JNIEnv *, jclass, jobject, jbyteArray, jint, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    write
+ * Signature: (Lgnu/java/net/PlainSocketImpl;[BII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_write
+  (JNIEnv *, jclass, jobject, jbyteArray, jint, jint);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    shutdownInput
+ * Signature: (Lgnu/java/net/PlainSocketImpl;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownInput
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    shutdownOutput
+ * Signature: (Lgnu/java/net/PlainSocketImpl;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput
+  (JNIEnv *, jclass, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif