2005-04-16 Michael Koch <konqueror@gmx.de>

	* include/java_lang_Double.h,
	include/java_lang_Object.h,
	native/jni/java-lang/java_lang_Double.c,
	native/jni/java-lang/java_lang_Object.c: Removed.
	* include/java_lang_VMDouble.h: Regenerated.
	* java/lang/Double.java
	(static): Removed.
	(toString): Call native method from VMDouble.
	(parseDouble): Make non-native and call native method from VMDouble.
	(toString): Removed.
	* java/lang/Float.java
	(toString): Call native method from VMDouble.
	* java/lang/Object.java
	(getClass): Refactored to call the native in java.lang.VMObject.
	* include/Makefile.am: Don't generate java_lang_Double.h and
	java_lang_Object.h.
	* native/jni/java-lang/Makefile.am: Removed java_lang_Double.c and
	java_lang_Object.c.
	* native/jni/java-lang/java_lang_VMDouble.c
	(initIDs): New method.
	(toString): Likewise.
	(parseDouble): Likewise.
	* vm/reference/java/lang/VMDouble.java
	(initIDs): Likewise.
	(toString): Likewise.
	(parseDouble): Likewise.
	* vm/reference/java/lang/VMObject.java
	(getClass): Likewise.

4 files changed, 3 insertions, 58 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 7064538f7..1ce0e1a47 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -75,9 +75,7 @@ $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h \
 $(top_srcdir)/include/java_io_ObjectInputStream.h \
 $(top_srcdir)/include/java_io_VMFile.h \
 $(top_srcdir)/include/java_io_VMObjectStreamClass.h \
-$(top_srcdir)/include/java_lang_Double.h \
 $(top_srcdir)/include/java_lang_Math.h \
-$(top_srcdir)/include/java_lang_Object.h \
 $(top_srcdir)/include/java_lang_VMDouble.h \
 $(top_srcdir)/include/java_lang_VMFloat.h \
 $(top_srcdir)/include/java_lang_VMProcess.h \
@@ -119,12 +117,8 @@ $(top_srcdir)/include/java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFil
 	$(JAVAH) -o $@ java.io.VMFile
 $(top_srcdir)/include/java_io_VMObjectStreamClass.h: $(top_srcdir)/vm/reference/java/io/VMObjectStreamClass.java
 	$(JAVAH) -o $@ java.io.VMObjectStreamClass
-$(top_srcdir)/include/java_lang_Double.h: $(top_srcdir)/java/lang/Double.java
-	$(JAVAH) -o $@ java.lang.Double
 $(top_srcdir)/include/java_lang_Math.h: $(top_srcdir)/java/lang/Math.java
 	$(JAVAH) -o $@ java.lang.Math
-$(top_srcdir)/include/java_lang_Object.h: $(top_srcdir)/java/lang/Object.java
-	$(JAVAH) -o $@ java.lang.Object
 $(top_srcdir)/include/java_lang_VMDouble.h: $(top_srcdir)/vm/reference/java/lang/VMDouble.java
 	$(JAVAH) -o $@ java.lang.VMDouble
 $(top_srcdir)/include/java_lang_VMFloat.h: $(top_srcdir)/vm/reference/java/lang/VMFloat.java
diff --git a/include/java_lang_Double.h b/include/java_lang_Double.h
deleted file mode 100644
index 65e83358c..000000000
--- a/include/java_lang_Double.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_Double__
-#define __java_lang_Double__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jdouble JNICALL Java_java_lang_Double_parseDouble (JNIEnv *env, jclass, jstring);
-JNIEXPORT jstring JNICALL Java_java_lang_Double_toString (JNIEnv *env, jclass, jdouble, jboolean);
-JNIEXPORT void JNICALL Java_java_lang_Double_initIDs (JNIEnv *env, jclass);
-#undef java_lang_Double_serialVersionUID
-#define java_lang_Double_serialVersionUID -9172774392245257468LL
-#undef java_lang_Double_MAX_VALUE
-#define java_lang_Double_MAX_VALUE 0x1.fffffffffffffp+1023
-#undef java_lang_Double_MIN_VALUE
-#define java_lang_Double_MIN_VALUE 0x0.0000000000001p-1022
-#undef java_lang_Double_NEGATIVE_INFINITY
-#define java_lang_Double_NEGATIVE_INFINITY
-#undef java_lang_Double_POSITIVE_INFINITY
-#define java_lang_Double_POSITIVE_INFINITY
-#undef java_lang_Double_NaN
-#define java_lang_Double_NaN
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_Double__ */
diff --git a/include/java_lang_Object.h b/include/java_lang_Object.h
deleted file mode 100644
index fd914b64c..000000000
--- a/include/java_lang_Object.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_lang_Object__
-#define __java_lang_Object__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jclass JNICALL Java_java_lang_Object_getClass (JNIEnv *env, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_lang_Object__ */
diff --git a/include/java_lang_VMDouble.h b/include/java_lang_VMDouble.h
index ef2b969d1..8f04dcae5 100644
--- a/include/java_lang_VMDouble.h
+++ b/include/java_lang_VMDouble.h
@@ -13,6 +13,9 @@ extern "C"
 JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToLongBits (JNIEnv *env, jclass, jdouble);
 JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToRawLongBits (JNIEnv *env, jclass, jdouble);
 JNIEXPORT jdouble JNICALL Java_java_lang_VMDouble_longBitsToDouble (JNIEnv *env, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_java_lang_VMDouble_toString (JNIEnv *env, jclass, jdouble, jboolean);
+JNIEXPORT void JNICALL Java_java_lang_VMDouble_initIDs (JNIEnv *env, jclass);
+JNIEXPORT jdouble JNICALL Java_java_lang_VMDouble_parseDouble (JNIEnv *env, jclass, jstring);
 
 #ifdef __cplusplus
 }