diff -r a6bacea2518f -r b1fe994d4267 rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java Thu Apr 25 16:17:48 2013 +0200 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java Fri Apr 26 18:48:34 2013 +0200 @@ -28,12 +28,9 @@ abstract class ByteCodeToJavaScript { private ClassData jc; final Appendable out; - final ObfuscationDelegate obfuscationDelegate; - protected ByteCodeToJavaScript( - Appendable out, ObfuscationDelegate obfuscationDelegate) { + protected ByteCodeToJavaScript(Appendable out) { this.out = out; - this.obfuscationDelegate = obfuscationDelegate; } /* Collects additional required resources. @@ -62,7 +59,9 @@ return classOperation; } - abstract String getExportsObject(); + protected void declaredClass(ClassData classData, String mangledName) + throws IOException { + } /** Prints out a debug message. * @@ -145,7 +144,7 @@ .append("; };"); } - obfuscationDelegate.exportField(out, "c", "_" + v.getName(), v); +// obfuscationDelegate.exportField(out, "c", "_" + v.getName(), v); } for (MethodData m : jc.getMethods()) { byte[] onlyArr = m.findAnnotationData(true); @@ -175,7 +174,7 @@ mn = generateInstanceMethod(destObject, m); } } - obfuscationDelegate.exportMethod(out, destObject, mn, m); +// obfuscationDelegate.exportMethod(out, destObject, mn, m); byte[] runAnno = m.findAnnotationData(false); if (runAnno != null) { out.append("\n ").append(destObject).append(".").append(mn).append(".anno = {"); @@ -188,11 +187,11 @@ out.append("\n c.constructor = CLS;"); String instOfName = "$instOf_" + className; out.append("\n c.").append(instOfName).append(" = true;"); - obfuscationDelegate.exportJSProperty(out, "c", instOfName); +// obfuscationDelegate.exportJSProperty(out, "c", instOfName); for (String superInterface : jc.getSuperInterfaces()) { instOfName = "$instOf_" + superInterface.replace('/', '_'); out.append("\n c.").append(instOfName).append(" = true;"); - obfuscationDelegate.exportJSProperty(out, "c", instOfName); +// obfuscationDelegate.exportJSProperty(out, "c", instOfName); } out.append("\n CLS.$class = 'temp';"); out.append("\n CLS.$class = "); @@ -239,7 +238,7 @@ out.append("\n return arguments[0] ? new CLS() : CLS.prototype;"); out.append("\n};"); - obfuscationDelegate.exportClass(out, getExportsObject(), className, jc); + declaredClass(jc, className); // StringBuilder sb = new StringBuilder(); // for (String init : toInitilize.toArray()) {