*** empty log message ***

js/tamarin/extensions/JavaGlue.cpp

@@ -29,6 +29,10 @@
  * 
  ***** END LICENSE BLOCK ***** */
 
+#include "avmplus.h"
+#include "avmshell.h"
+#include "JavaGlue.h"
+
 #ifdef AVMPLUS_WITH_JNI
 
 // @todo 
@@ -36,9 +40,6 @@
 //  support for arrays 
 //  128 is a very nice number but its not the best way to pick how much room is needed for signatures etc.
 // 
-#include "avmplus.h"
-#include "avmshell.h"
-#include "JavaGlue.h"
 
 #ifdef WIN32
 #include <tchar.h>
@@ -1684,5 +1685,18 @@ namespace avmplus
 		return JNI_OK;
 	}
 }	
+#else /* !AVMPLUS_WITH_JNI */
+namespace avmplus {
+	BEGIN_NATIVE_MAP(JObjectClass)
+		NATIVE_METHOD(avmplus_JObject_toString,				JObjectClass::NYI)
+		NATIVE_METHOD(avmplus_JObject_methodSignature,		JObjectClass::NYI)
+		NATIVE_METHOD(avmplus_JObject_fieldSignature,		JObjectClass::NYI)
+		NATIVE_METHOD(avmplus_JObject_constructorSignature,	JObjectClass::NYI)
+		NATIVE_METHOD(avmplus_JObject_create,				JObjectClass::NYI)
+		NATIVE_METHOD(avmplus_JObject_createArray,			JObjectClass::NYI)
+		NATIVE_METHOD(avmplus_JObject_toArray,				JObjectClass::NYI)
+	END_NATIVE_MAP()
 
+	void JObjectClass::NYI() { }
+}
 #endif /* AVMPLUS_WITH_JNI */

js/tamarin/extensions/JavaGlue.h

@@ -282,6 +282,26 @@ namespace avmplus
 	};
 }
 
+#else /* !AVMPLUS_WITH_JNI */
+namespace avmplus
+{
+	class JObject;
+	class JClass;
+
+	class JObjectClass: public ClassClosure
+	{
+	public:
+		JObjectClass(VTable *cvtable) : ClassClosure(cvtable) { }
+		void NYI();
+		DECLARE_NATIVE_MAP(JObjectClass);
+	};
+
+	class JObject : public ScriptObject
+	{
+	public:
+		JObject(VTable *vtable, ScriptObject *proto) : ScriptObject(vtable, proto) { }
+	};
+}
 #endif /* AVMPLUS_WITH_JNI */
 
 #endif /* _JAVA_GLUE_H_ */

js/tamarin/shell/avmshell.cpp

@@ -94,9 +94,7 @@ namespace avmshell
 		NATIVE_CLASS(abcclass_avmplus_File,            FileClass,          ScriptObject)
 		NATIVE_CLASS(abcclass_avmplus_Domain,          DomainClass,        DomainObject)
 		NATIVE_CLASS(abcclass_avmplus_StringBuilder,   StringBuilderClass, StringBuilderObject)		
-#ifdef AVMPLUS_WITH_JNI
+		NATIVE_CLASS(abcclass_avmplus_JObject,          JObjectClass,		JObject)
-		NATIVE_CLASS(abcclass_avmplus_JObject,         JObjectClass,		JObject)
-#endif /* AVMPLUS_WITH_JNI */
 		NATIVE_CLASS(abcclass_flash_utils_ByteArray,    ByteArrayClass,     ByteArrayObject)		
 		NATIVE_CLASS(abcclass_flash_utils_ShortArray,   ShortArrayClass,    ShortArrayObject)		
 		NATIVE_CLASS(abcclass_flash_utils_UShortArray,  UShortArrayClass,   UShortArrayObject)