# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1354619187 -3600
# Node ID 42c2ceb1e160bcf17495432d3b8b5ed948607394
# Parent  001389026dbfcdab9a5c27cafe535be062459c63
ClassTest needs to be adjusted to new naming scheme

diff -r 001389026dbf -r 42c2ceb1e160 emul/src/main/resources/org/apidesign/vm4brwsr/emul/java_lang_String.js
--- a/emul/src/main/resources/org/apidesign/vm4brwsr/emul/java_lang_String.js	Tue Dec 04 11:21:10 2012 +0100
+++ b/emul/src/main/resources/org/apidesign/vm4brwsr/emul/java_lang_String.js	Tue Dec 04 12:06:27 2012 +0100
@@ -1,2 +1,2 @@
 // initialize methods on String constants
-java_lang_Object(false);
+java_lang_String(false);
diff -r 001389026dbf -r 42c2ceb1e160 vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Tue Dec 04 11:21:10 2012 +0100
+++ b/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Tue Dec 04 12:06:27 2012 +0100
@@ -1158,7 +1158,7 @@
                 if (cnt++ > 0) {
                     out.append(",\n");
                 }
-                out.append(attr).append(attrType).append(" : ").append(value);
+                out.append(attr).append("__").append(attrType).append(" : ").append(value);
             }
         };
         ap.parse(data, cd);
diff -r 001389026dbf -r 42c2ceb1e160 vm/src/main/java/org/apidesign/vm4brwsr/GenJS.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/GenJS.java	Tue Dec 04 11:21:10 2012 +0100
+++ b/vm/src/main/java/org/apidesign/vm4brwsr/GenJS.java	Tue Dec 04 12:06:27 2012 +0100
@@ -91,19 +91,20 @@
                         );
                     }
                 }
-                for (String resource : js.scripts.toArray()) {
-                    while (resource.startsWith("/")) {
-                        resource = resource.substring(1);
-                    }
-                    InputStream emul = l.getResourceAsStream(resource);
-                    if (emul == null) {
-                        throw new IOException("Can't find " + resource);
-                    }
-                    readResource(emul, out);
-                }
-                js.scripts = new StringArray();
             }
 
+            for (String resource : js.scripts.toArray()) {
+                while (resource.startsWith("/")) {
+                    resource = resource.substring(1);
+                }
+                InputStream emul = l.getResourceAsStream(resource);
+                if (emul == null) {
+                    throw new IOException("Can't find " + resource);
+                }
+                readResource(emul, out);
+            }
+            js.scripts = new StringArray();
+            
             StringArray toInit = StringArray.asList(js.references.toArray());
             toInit.reverse();
 
diff -r 001389026dbf -r 42c2ceb1e160 vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java	Tue Dec 04 11:21:10 2012 +0100
+++ b/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java	Tue Dec 04 12:06:27 2012 +0100
@@ -33,7 +33,7 @@
     }
 
     @Test public void jsSuperClassEqualsGetSuperclass() throws Exception {
-        assertExec("Classes are equal", Classes.class, "equalsClassesOfExceptionsZ", Double.valueOf(1.0));
+        assertExec("Classes are equal", Classes.class, "equalsClassesOfExceptions__Z", Double.valueOf(1.0));
     }
 
     @Test public void classesAreDifferent() {
@@ -41,47 +41,47 @@
     }
 
     @Test public void jsClassesAreDifferent() throws Exception {
-        assertExec("Classes are not equal", Classes.class, "differenceInClassesZ", Double.valueOf(1.0));
+        assertExec("Classes are not equal", Classes.class, "differenceInClasses__Z", Double.valueOf(1.0));
     }
 
     @Test public void javaInstanceName() throws Exception {
         assertEquals(Classes.classForInstance(), "java.io.IOException");
     }
     @Test public void jsInstanceName() throws Exception {
-        assertExec("I/O name", Classes.class, "classForInstanceLjava_lang_String", "java.io.IOException");
+        assertExec("I/O name", Classes.class, "classForInstance__Ljava_lang_String_2", "java.io.IOException");
     }
     @Test public void javaName() throws Exception {
         assertEquals(Classes.name(), "java.io.IOException");
     }
     @Test public void jsName() throws Exception {
-        assertExec("I/O name", Classes.class, "nameLjava_lang_String", "java.io.IOException");
+        assertExec("I/O name", Classes.class, "name__Ljava_lang_String_2", "java.io.IOException");
     }
     @Test public void javaSimpleName() throws Exception {
         assertEquals(Classes.simpleName(), "IOException");
     }
     @Test public void jsGetsSimpleName() throws Exception {
-        assertExec("I/O simple name", Classes.class, "simpleNameLjava_lang_String", "IOException");
+        assertExec("I/O simple name", Classes.class, "simpleName__Ljava_lang_String_2", "IOException");
     }
     @Test public void javaCanonicalName() {
         assertEquals(Classes.canonicalName(), "java.io.IOException");
     }
     @Test public void jsCanonicalName() throws Exception {
-        assertExec("I/O simple name", Classes.class, "canonicalNameLjava_lang_String", "java.io.IOException");
+        assertExec("I/O simple name", Classes.class, "canonicalName__Ljava_lang_String_2", "java.io.IOException");
     }
     @Test public void javaNewInstance() throws Exception {
         assertTrue(Classes.newInstance());
     }
     @Test public void jsNewInstance() throws Exception {
-        assertExec("Check new instance", Classes.class, "newInstanceZ", Double.valueOf(1));
+        assertExec("Check new instance", Classes.class, "newInstance__Z", Double.valueOf(1));
     }
     @Test public void jsAnnotation() throws Exception {
-        assertExec("Check class annotation", Classes.class, "getMarkerI", Double.valueOf(10));
+        assertExec("Check class annotation", Classes.class, "getMarker__I", Double.valueOf(10));
     }
     @Test public void jsStringAnnotation() throws Exception {
-        assertExec("Check class annotation", Classes.class, "getNamerLjava_lang_StringZ", "my text", true);
+        assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", true);
     }
     @Test public void jsStringAnnotationFromArray() throws Exception {
-        assertExec("Check class annotation", Classes.class, "getNamerLjava_lang_StringZ", "my text", false);
+        assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", false);
     }
     
     private static CharSequence codeSeq;