1.1 --- a/boot/src/main/java/org/apidesign/html/boot/impl/JsClassLoader.java Thu Jul 11 17:58:45 2013 +0200
1.2 +++ b/boot/src/main/java/org/apidesign/html/boot/impl/JsClassLoader.java Thu Jul 11 20:30:39 2013 +0200
1.3 @@ -27,9 +27,7 @@
1.4 import java.net.URL;
1.5 import java.util.ArrayList;
1.6 import java.util.Enumeration;
1.7 -import java.util.HashMap;
1.8 import java.util.List;
1.9 -import java.util.Map;
1.10 import org.objectweb.asm.AnnotationVisitor;
1.11 import org.objectweb.asm.ClassReader;
1.12 import org.objectweb.asm.ClassVisitor;
1.13 @@ -95,11 +93,11 @@
1.14 is.close();
1.15 is = null;
1.16 ClassReader cr = new ClassReader(arr);
1.17 - FindInClass tst = new FindInClass(null, new HashMap<String,String>());
1.18 + FindInClass tst = new FindInClass(null);
1.19 cr.accept(tst, 0);
1.20 if (tst.found > 0) {
1.21 ClassWriter w = new ClassWriterEx(cr, ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
1.22 - FindInClass fic = new FindInClass(w, tst.methods);
1.23 + FindInClass fic = new FindInClass(w);
1.24 cr.accept(fic, 0);
1.25 arr = w.toByteArray();
1.26 }
1.27 @@ -132,11 +130,9 @@
1.28 private final class FindInClass extends ClassVisitor {
1.29 private String name;
1.30 private int found;
1.31 - private final Map<String,String> methods;
1.32
1.33 - public FindInClass(ClassVisitor cv, Map<String,String> methods) {
1.34 + public FindInClass(ClassVisitor cv) {
1.35 super(Opcodes.ASM4, cv);
1.36 - this.methods = methods;
1.37 }
1.38
1.39 @Override
1.40 @@ -157,7 +153,6 @@
1.41 @Override
1.42 public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
1.43 int end = desc.indexOf(')');
1.44 - methods.put(name + desc.substring(0, end + 1), desc);
1.45
1.46 return new FindInMethod(access, name, desc,
1.47 super.visitMethod(access & (~Opcodes.ACC_NATIVE), name, desc, signature, exceptions)
1.48 @@ -421,7 +416,7 @@
1.49 public void visitEnd() {
1.50 if (body != null) {
1.51 if (javacall) {
1.52 - body = FnUtils.callback(body, JsClassLoader.this, FindInClass.this.name, FindInClass.this.methods);
1.53 + body = FnUtils.callback(body);
1.54 args.add("vm");
1.55 }
1.56 generateJSBody(args, body);