X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjavaobjects.hpp;h=0b4aa46e98c4d482eb8b4eaacc10069391d7da93;hb=79c1f3f6d7847231db61bcdff0ca81872fa80556;hp=4ecd9dd497e8f95ad24822050c3786081a928aa6;hpb=5e9917d2f37a0a98d8d8b7c7782f0e6566a195b2;p=cacao.git

diff --git a/src/vm/javaobjects.hpp b/src/vm/javaobjects.hpp
index 4ecd9dd49..0b4aa46e9 100644
--- a/src/vm/javaobjects.hpp
+++ b/src/vm/javaobjects.hpp
@@ -166,7 +166,6 @@ protected:
 public:
 	java_lang_Object() : _handle(NULL) {}
 	java_lang_Object(java_handle_t* h) : _handle(h) {}
-	java_lang_Object(jobject h) : _handle((java_handle_t*) h) {}
 	virtual ~java_lang_Object() {}
 
 	// Getters.
@@ -562,7 +561,6 @@ public:
 
 	// Setters.
 	inline void set_pd(java_handle_t* value);
-	inline void set_pd(jobject value);
 };
 
 inline void java_lang_Class::set_pd(java_handle_t* value)
@@ -570,11 +568,6 @@ inline void java_lang_Class::set_pd(java_handle_t* value)
 	set(_handle, offset_pd, value);
 }
 
-inline void java_lang_Class::set_pd(jobject value)
-{
-	set_pd((java_handle_t*) value);
-}
-
 
 /**
  * GNU Classpath java/lang/StackTraceElement
@@ -637,7 +630,6 @@ private:
 
 public:
 	java_lang_String(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_String(jstring h);
 	java_lang_String(java_handle_t* h, java_handle_chararray_t* value, int32_t count, int32_t offset = 0);
 
 	// Getters.
@@ -651,11 +643,6 @@ public:
 	inline void set_offset(int32_t value);
 };
 
-inline java_lang_String::java_lang_String(jstring h) : java_lang_Object(h)
-{
-	java_lang_String((java_handle_t*) h);
-}
-
 inline java_lang_String::java_lang_String(java_handle_t* h, java_handle_chararray_t* value, int32_t count, int32_t offset) : java_lang_Object(h)
 {
 	set_value(value);
@@ -814,7 +801,6 @@ private:
 
 public:
 	java_lang_VMThread(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_VMThread(jobject h);
 	java_lang_VMThread(java_handle_t* h, java_handle_t* thread, threadobject* vmdata);
 
 	// Getters.
@@ -827,11 +813,6 @@ public:
 };
 
 
-inline java_lang_VMThread::java_lang_VMThread(jobject h) : java_lang_Object(h)
-{
-	java_lang_VMThread((java_handle_t*) h);
-}
-
 inline java_lang_VMThread::java_lang_VMThread(java_handle_t* h, java_handle_t* thread, threadobject* vmdata) : java_lang_Object(h)
 {
 	set_thread(thread);
@@ -923,16 +904,11 @@ private:
 
 public:
 	java_lang_VMThrowable(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_VMThrowable(jobject h);
 
 	inline java_handle_bytearray_t* get_vmdata() const;
 	inline void                     set_vmdata(java_handle_bytearray_t* value);
 };
 
-inline java_lang_VMThrowable::java_lang_VMThrowable(jobject h) : java_lang_Object(h)
-{
-	java_lang_VMThrowable((java_handle_t*) h);
-}
 
 inline java_handle_bytearray_t* java_lang_VMThrowable::get_vmdata() const
 {
@@ -971,7 +947,6 @@ private:
 
 public:
 	java_lang_reflect_VMConstructor(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_VMConstructor(jobject h);
 	java_lang_reflect_VMConstructor(methodinfo* m);
 
 	// Getters.
@@ -995,11 +970,6 @@ public:
 };
 
 
-inline java_lang_reflect_VMConstructor::java_lang_reflect_VMConstructor(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_VMConstructor((java_handle_t*) h);
-}
-
 inline java_lang_reflect_VMConstructor::java_lang_reflect_VMConstructor(methodinfo* m)
 {
 	_handle = builtin_new(class_java_lang_reflect_VMConstructor);
@@ -1107,7 +1077,6 @@ private:
 
 public:
 	java_lang_reflect_Constructor(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_Constructor(jobject h);
 	java_lang_reflect_Constructor(methodinfo* m);
 
 	java_handle_t* new_instance(java_handle_objectarray_t* args);
@@ -1125,11 +1094,6 @@ public:
 };
 
 
-inline java_lang_reflect_Constructor::java_lang_reflect_Constructor(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_Constructor((java_handle_t*) h);
-}
-
 inline java_lang_reflect_Constructor::java_lang_reflect_Constructor(methodinfo* m)
 {
 	java_lang_reflect_VMConstructor jlrvmc(m);
@@ -1203,7 +1167,6 @@ private:
 
 public:
 	java_lang_reflect_VMField(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_VMField(jobject h);
 	java_lang_reflect_VMField(fieldinfo* f);
 
 	// Getters.
@@ -1226,11 +1189,6 @@ public:
 };
 
 
-inline java_lang_reflect_VMField::java_lang_reflect_VMField(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_VMField((java_handle_t*) h);
-}
-
 inline java_lang_reflect_VMField::java_lang_reflect_VMField(fieldinfo* f)
 {
 	_handle = builtin_new(class_java_lang_reflect_VMField);
@@ -1334,7 +1292,6 @@ private:
 
 public:
 	java_lang_reflect_Field(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_Field(jobject h);
 	java_lang_reflect_Field(fieldinfo* f);
 
 	// Getters.
@@ -1349,11 +1306,6 @@ public:
 };
 
 
-inline java_lang_reflect_Field::java_lang_reflect_Field(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_Field((java_handle_t*) h);
-}
-
 inline java_lang_reflect_Field::java_lang_reflect_Field(fieldinfo* f)
 {
 	java_lang_reflect_VMField jlrvmf(f);
@@ -1426,7 +1378,6 @@ private:
 
 public:
 	java_lang_reflect_VMMethod(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_VMMethod(jobject h);
 	java_lang_reflect_VMMethod(methodinfo* m);
 
 	// Getters.
@@ -1452,10 +1403,6 @@ public:
 	inline methodinfo* get_method() const;
 };
 
-inline java_lang_reflect_VMMethod::java_lang_reflect_VMMethod(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_VMMethod((java_handle_t*) h);
-}
 
 inline java_lang_reflect_VMMethod::java_lang_reflect_VMMethod(methodinfo* m)
 {
@@ -1582,7 +1529,6 @@ private:
 
 public:
 	java_lang_reflect_Method(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_Method(jobject h);
 	java_lang_reflect_Method(methodinfo* m);
 
 	java_handle_t* invoke(java_handle_t* o, java_handle_objectarray_t* args);
@@ -1600,11 +1546,6 @@ public:
 };
 
 
-inline java_lang_reflect_Method::java_lang_reflect_Method(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_Method((java_handle_t*) h);
-}
-
 inline java_lang_reflect_Method::java_lang_reflect_Method(methodinfo* m)
 {
 	java_lang_reflect_VMMethod jlrvmm(m);
@@ -1719,16 +1660,11 @@ private:
 
 public:
 	java_nio_DirectByteBufferImpl(java_handle_t* h) : java_lang_Object(h) {}
-	java_nio_DirectByteBufferImpl(jobject h);
 
 	// Getters.
 	inline java_handle_t* get_address() const;
 };
 
-inline java_nio_DirectByteBufferImpl::java_nio_DirectByteBufferImpl(jobject h) : java_lang_Object(h)
-{
-	java_nio_DirectByteBufferImpl((java_handle_t*) h);
-}
 
 inline java_handle_t* java_nio_DirectByteBufferImpl::get_address() const
 {
@@ -1892,7 +1828,6 @@ private:
 
 public:
 	java_lang_String(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_String(jstring h);
 	java_lang_String(java_handle_t* h, java_handle_chararray_t* value, int32_t count, int32_t offset = 0);
 
 	// Getters.
@@ -1906,11 +1841,6 @@ public:
 	inline void set_count (int32_t value);
 };
 
-inline java_lang_String::java_lang_String(jstring h) : java_lang_Object(h)
-{
-	java_lang_String((java_handle_t*) h);
-}
-
 inline java_lang_String::java_lang_String(java_handle_t* h, java_handle_chararray_t* value, int32_t count, int32_t offset) : java_lang_Object(h)
 {
 	set_value(value);
@@ -2078,8 +2008,7 @@ private:
 
 public:
 	java_lang_Throwable(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_Throwable(jobject h);
-	java_lang_Throwable(jobject h, java_handle_bytearray_t* backtrace);
+	java_lang_Throwable(java_handle_t* h, java_handle_bytearray_t* backtrace);
 
 	// Getters.
 	inline java_handle_bytearray_t* get_backtrace    () const;
@@ -2091,14 +2020,8 @@ public:
 };
 
 
-inline java_lang_Throwable::java_lang_Throwable(jobject h) : java_lang_Object(h)
-{
-	java_lang_Throwable((java_handle_t*) h);
-}
-
-inline java_lang_Throwable::java_lang_Throwable(jobject h, java_handle_bytearray_t* backtrace) : java_lang_Object(h)
+inline java_lang_Throwable::java_lang_Throwable(java_handle_t* h, java_handle_bytearray_t* backtrace) : java_lang_Object(h)
 {
-	java_lang_Throwable((java_handle_t*) h);
 	set_backtrace(backtrace);
 }
 
@@ -2167,7 +2090,6 @@ private:
 
 public:
 	java_lang_reflect_Constructor(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_Constructor(jobject h);
 	java_lang_reflect_Constructor(methodinfo* m);
 
 	java_handle_t* new_instance(java_handle_objectarray_t* args);
@@ -2193,11 +2115,6 @@ public:
 };
 
 
-inline java_lang_reflect_Constructor::java_lang_reflect_Constructor(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_Constructor((java_handle_t*) h);
-}
-
 inline java_lang_reflect_Constructor::java_lang_reflect_Constructor(methodinfo* m)
 {
 	_handle = builtin_new(class_java_lang_reflect_Constructor);
@@ -2337,7 +2254,6 @@ private:
 
 public:
 	java_lang_reflect_Field(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_Field(jobject h);
 	java_lang_reflect_Field(fieldinfo* f);
 
 	// Getters.
@@ -2360,11 +2276,6 @@ public:
 };
 
 
-inline java_lang_reflect_Field::java_lang_reflect_Field(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_Field((java_handle_t*) h);
-}
-
 inline java_lang_reflect_Field::java_lang_reflect_Field(fieldinfo* f)
 {
 	_handle = builtin_new(class_java_lang_reflect_Field);
@@ -2499,7 +2410,6 @@ private:
 
 public:
 	java_lang_reflect_Method(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_reflect_Method(jobject h);
 	java_lang_reflect_Method(methodinfo* m);
 
 	java_handle_t* invoke(java_handle_t* o, java_handle_objectarray_t* args);
@@ -2519,11 +2429,6 @@ public:
 };
 
 
-inline java_lang_reflect_Method::java_lang_reflect_Method(jobject h) : java_lang_Object(h)
-{
-	java_lang_reflect_Method((java_handle_t*) h);
-}
-
 inline java_lang_reflect_Method::java_lang_reflect_Method(methodinfo* m)
 {
 	_handle = builtin_new(class_java_lang_reflect_Method);
@@ -2609,7 +2514,6 @@ private:
 
 public:
 	java_nio_Buffer(java_handle_t* h) : java_lang_Object(h) {}
-	java_nio_Buffer(jobject h) : java_lang_Object(h) {}
 
 	// Getters.
 	inline void* get_address() const;
@@ -2646,7 +2550,6 @@ private:
 
 public:
 	com_sun_cldchi_jvm_FileDescriptor(java_handle_t* h) : java_lang_Object(h) {}
-	com_sun_cldchi_jvm_FileDescriptor(jobject h);
 	com_sun_cldchi_jvm_FileDescriptor(java_handle_t* h, int64_t pointer, int32_t position, int32_t length);
 	com_sun_cldchi_jvm_FileDescriptor(java_handle_t* h, com_sun_cldchi_jvm_FileDescriptor& fd);
 
@@ -2662,11 +2565,6 @@ public:
 };
 
 
-inline com_sun_cldchi_jvm_FileDescriptor::com_sun_cldchi_jvm_FileDescriptor(jobject h) : java_lang_Object(h)
-{
-	com_sun_cldchi_jvm_FileDescriptor((java_handle_t*) h);
-}
-
 inline com_sun_cldchi_jvm_FileDescriptor::com_sun_cldchi_jvm_FileDescriptor(java_handle_t* h, int64_t pointer, int32_t position, int32_t length) : java_lang_Object(h)
 {
 	set_pointer(pointer);
@@ -2732,7 +2630,6 @@ private:
 
 public:
 	java_lang_String(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_String(jstring h);
 	java_lang_String(java_handle_t* h, java_handle_chararray_t* value, int32_t count, int32_t offset = 0);
 
 	// Getters.
@@ -2746,10 +2643,6 @@ public:
 	inline void set_count (int32_t value);
 };
 
-inline java_lang_String::java_lang_String(jstring h) : java_lang_Object(h)
-{
-	java_lang_String((java_handle_t*) h);
-}
 
 inline java_lang_String::java_lang_String(java_handle_t* h, java_handle_chararray_t* value, int32_t count, int32_t offset) : java_lang_Object(h)
 {
@@ -2815,7 +2708,6 @@ private:
 
 public:
 	java_lang_Thread(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_Thread(jobject h);
 // 	java_lang_Thread(threadobject* t);
 
 	// Getters.
@@ -2828,11 +2720,6 @@ public:
 };
 
 
-inline java_lang_Thread::java_lang_Thread(jobject h) : java_lang_Object(h)
-{
-	java_lang_Thread((java_handle_t*) h);
-}
-
 // inline java_lang_Thread::java_lang_Thread(threadobject* t) : java_lang_Object(h)
 // {
 // 	java_lang_Thread(thread_get_object(t));
@@ -2879,7 +2766,6 @@ private:
 
 public:
 	java_lang_Throwable(java_handle_t* h) : java_lang_Object(h) {}
-	java_lang_Throwable(jobject h);
 
 	// Getters.
 	inline java_handle_t*           get_detailMessage() const;
@@ -2890,12 +2776,6 @@ public:
 };
 
 
-inline java_lang_Throwable::java_lang_Throwable(jobject h) : java_lang_Object(h)
-{
-	java_lang_Throwable((java_handle_t*) h);
-}
-
-
 inline java_handle_t* java_lang_Throwable::get_detailMessage() const
 {
 	return get<java_handle_t*>(_handle, offset_detailMessage);