diff -r d382dacfd73f -r e1953d8b8338 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/AnnotationImpl.java --- a/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/AnnotationImpl.java Tue Feb 26 16:54:16 2013 +0100 +++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/AnnotationImpl.java Sat Mar 19 10:31:13 2016 +0100 @@ -38,11 +38,20 @@ } @JavaScriptBody(args = { "a", "n", "arr", "values" }, body = "" - + "function f(val, prop, clazz) {\n" + + "function r(anno, val, prop, m) {\n" + + " var v = val[prop];\n" + + " if (typeof v === 'undefined') {\n" + + " var cls = anno.fld_org_apidesign_bck2brwsr_emul_reflect_AnnotationImpl_type.cnstr;\n" + + " try { throw 'x'; } catch (errr) {};\n" + + " v = cls.prototype[m]();\n" + + " }\n" + + " return v;\n" + + "}\n" + + "function f(val, prop, clazz, m) {\n" + " return function() {\n" - + " if (clazz == null) return val[prop];\n" + + " if (clazz == null) return r(this, val, prop, m);\n" + " if (clazz.isArray__Z()) {\n" - + " var valarr = val[prop];\n" + + " var valarr = r(this, val, prop, m);\n" + " var cmp = clazz.getComponentType__Ljava_lang_Class_2();\n" + " var retarr = vm.java_lang_reflect_Array(false).newInstance__Ljava_lang_Object_2Ljava_lang_Class_2I(cmp, valarr.length);\n" + " for (var i = 0; i < valarr.length; i++) {\n" @@ -50,14 +59,14 @@ + " }\n" + " return retarr;\n" + " }\n" - + " return CLS.prototype.c__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_Object_2(clazz, val[prop]);\n" + + " return CLS.prototype.c__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_Object_2(clazz, r(this, val, prop, m));\n" + " };\n" + "}\n" + "for (var i = 0; i < arr.length; i += 3) {\n" + " var m = arr[i];\n" + " var p = arr[i + 1];\n" + " var c = arr[i + 2];\n" - + " a[m] = f(values, p, c);\n" + + " a[m] = f(values, p, c, m);\n" + "}\n" + "a['$instOf_' + n] = true;\n" + "return a;"