# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1399092417 -7200
# Node ID 4d3780a69843741df418f30388ab3cbe4a90ebec
# Parent  8261c59be1511fb6b4b5290f33d5e1703e3e1cb2
Can load multiple resources of the same name from extensions

diff -r 8261c59be151 -r 4d3780a69843 rt/emul/mini/src/main/java/java/lang/ClassLoader.java
--- a/rt/emul/mini/src/main/java/java/lang/ClassLoader.java	Fri May 02 09:06:57 2014 +0200
+++ b/rt/emul/mini/src/main/java/java/lang/ClassLoader.java	Sat May 03 06:46:57 2014 +0200
@@ -588,6 +588,9 @@
      * @since  1.2
      */
     public Enumeration<URL> getResources(String name) throws IOException {
+        if (this == SYSTEM) {
+            return findResources(name);
+        }
         Enumeration[] tmp = new Enumeration[2];
         if (parent != null) {
             tmp[0] = parent.getResources(name);
diff -r 8261c59be151 -r 4d3780a69843 rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Fri May 02 09:06:57 2014 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Sat May 03 06:46:57 2014 +0200
@@ -541,9 +541,14 @@
                 + "        reload__Ljava_lang_Object_2Ljava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2_3B(loader, name, args, byteCode);\n"
                 + "    };\n"
                 + "    vm.loadBytes = function(name, skip) {\n"
-                + "      if (resources[name]) return resources[name][0];\n"
+                + "      skip = typeof skip == 'number' ? skip : 0;\n"
+                + "      var arr = resources[name];\n"
+                + "      if (arr) {\n"
+                + "        if (skip < arr.length) return arr[skip];\n"
+                + "        skip -= arr.length;\n"
+                + "      };\n"
                 + "      return vm.org_apidesign_vm4brwsr_VMLazy(false).\n"
-                + "        loadBytes___3BLjava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2I(loader, name, args, typeof skip == 'number' ? skip : 0);\n"
+                + "        loadBytes___3BLjava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2I(loader, name, args, skip);\n"
                 + "    }\n"
                 + "    vm.java_lang_reflect_Array(false);\n"
                 + "    vm.org_apidesign_vm4brwsr_VMLazy(false).\n"
diff -r 8261c59be151 -r 4d3780a69843 rt/vm/src/test/java/org/apidesign/vm4brwsr/ResourcesWithExtensionsTest.java
--- a/rt/vm/src/test/java/org/apidesign/vm4brwsr/ResourcesWithExtensionsTest.java	Fri May 02 09:06:57 2014 +0200
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ResourcesWithExtensionsTest.java	Sat May 03 06:46:57 2014 +0200
@@ -36,7 +36,7 @@
             exp
         );
     }
-    /*
+
     @Test public void checkHelloWorld() throws Exception {
         String exp = "Hello World!";
         
@@ -45,7 +45,6 @@
             exp
         );
     }
-    */
 
     private static TestVM code;