1.1 --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java Thu Apr 25 16:17:48 2013 +0200
1.2 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java Fri Apr 26 18:48:34 2013 +0200
1.3 @@ -28,12 +28,9 @@
1.4 abstract class ByteCodeToJavaScript {
1.5 private ClassData jc;
1.6 final Appendable out;
1.7 - final ObfuscationDelegate obfuscationDelegate;
1.8
1.9 - protected ByteCodeToJavaScript(
1.10 - Appendable out, ObfuscationDelegate obfuscationDelegate) {
1.11 + protected ByteCodeToJavaScript(Appendable out) {
1.12 this.out = out;
1.13 - this.obfuscationDelegate = obfuscationDelegate;
1.14 }
1.15
1.16 /* Collects additional required resources.
1.17 @@ -62,7 +59,9 @@
1.18 return classOperation;
1.19 }
1.20
1.21 - abstract String getExportsObject();
1.22 + protected void declaredClass(ClassData classData, String mangledName)
1.23 + throws IOException {
1.24 + }
1.25
1.26 /** Prints out a debug message.
1.27 *
1.28 @@ -145,7 +144,7 @@
1.29 .append("; };");
1.30 }
1.31
1.32 - obfuscationDelegate.exportField(out, "c", "_" + v.getName(), v);
1.33 +// obfuscationDelegate.exportField(out, "c", "_" + v.getName(), v);
1.34 }
1.35 for (MethodData m : jc.getMethods()) {
1.36 byte[] onlyArr = m.findAnnotationData(true);
1.37 @@ -175,7 +174,7 @@
1.38 mn = generateInstanceMethod(destObject, m);
1.39 }
1.40 }
1.41 - obfuscationDelegate.exportMethod(out, destObject, mn, m);
1.42 +// obfuscationDelegate.exportMethod(out, destObject, mn, m);
1.43 byte[] runAnno = m.findAnnotationData(false);
1.44 if (runAnno != null) {
1.45 out.append("\n ").append(destObject).append(".").append(mn).append(".anno = {");
1.46 @@ -188,11 +187,11 @@
1.47 out.append("\n c.constructor = CLS;");
1.48 String instOfName = "$instOf_" + className;
1.49 out.append("\n c.").append(instOfName).append(" = true;");
1.50 - obfuscationDelegate.exportJSProperty(out, "c", instOfName);
1.51 +// obfuscationDelegate.exportJSProperty(out, "c", instOfName);
1.52 for (String superInterface : jc.getSuperInterfaces()) {
1.53 instOfName = "$instOf_" + superInterface.replace('/', '_');
1.54 out.append("\n c.").append(instOfName).append(" = true;");
1.55 - obfuscationDelegate.exportJSProperty(out, "c", instOfName);
1.56 +// obfuscationDelegate.exportJSProperty(out, "c", instOfName);
1.57 }
1.58 out.append("\n CLS.$class = 'temp';");
1.59 out.append("\n CLS.$class = ");
1.60 @@ -239,7 +238,7 @@
1.61 out.append("\n return arguments[0] ? new CLS() : CLS.prototype;");
1.62 out.append("\n};");
1.63
1.64 - obfuscationDelegate.exportClass(out, getExportsObject(), className, jc);
1.65 + declaredClass(jc, className);
1.66
1.67 // StringBuilder sb = new StringBuilder();
1.68 // for (String init : toInitilize.toArray()) {