diff -r b107ed66f2e7 -r 9359b006782b emul/src/main/java/java/lang/Class.java --- a/emul/src/main/java/java/lang/Class.java Mon Jan 14 10:57:51 2013 +0100 +++ b/emul/src/main/java/java/lang/Class.java Mon Jan 14 11:30:56 2013 +0100 @@ -318,7 +318,7 @@ return (getAccess() & 0x200) != 0; } - @JavaScriptBody(args = "self", body = "return self.access;") + @JavaScriptBody(args = {}, body = "return this.access;") private native int getAccess(); @@ -362,8 +362,8 @@ * @see java.lang.Void#TYPE * @since JDK1.1 */ - @JavaScriptBody(args = "self", body = - "if (self.primitive) return true;" + @JavaScriptBody(args = {}, body = + "if (this.primitive) return true;" + "else return false;" ) public native boolean isPrimitive(); @@ -447,7 +447,7 @@ return jvmName().replace('/', '.'); } - @JavaScriptBody(args = "self", body = "return self.jvmName;") + @JavaScriptBody(args = {}, body = "return this.jvmName;") private native String jvmName(); @@ -481,7 +481,7 @@ * * @return the superclass of the class represented by this object. */ - @JavaScriptBody(args = "self", body = "return self.superclass;") + @JavaScriptBody(args = {}, body = "return this.superclass;") public native Class getSuperclass(); /** @@ -1078,10 +1078,10 @@ throw new ClassCastException(this.toString()); } - @JavaScriptBody(args = { "self", "ac" }, + @JavaScriptBody(args = { "ac" }, body = - "if (self.anno) {" - + " return self.anno['L' + ac.jvmName + ';'];" + "if (this.anno) {" + + " return this.anno['L' + ac.jvmName + ';'];" + "} else return null;" ) private Object getAnnotationData(Class annotationClass) { @@ -1100,8 +1100,8 @@ * @throws NullPointerException {@inheritDoc} * @since 1.5 */ - @JavaScriptBody(args = { "self", "ac" }, - body = "if (self.anno && self.anno['L' + ac.jvmName + ';']) { return true; }" + @JavaScriptBody(args = { "ac" }, + body = "if (this.anno && this.anno['L' + ac.jvmName + ';']) { return true; }" + "else return false;" ) public boolean isAnnotationPresent( @@ -1112,7 +1112,7 @@ return getAnnotation(annotationClass) != null; } - @JavaScriptBody(args = "self", body = "return self.anno;") + @JavaScriptBody(args = {}, body = "return this.anno;") private Object getAnnotationData() { throw new UnsupportedOperationException(); }