# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1400076543 -7200
# Node ID 3e9bfed0d88e9b46608b0eb82601ae1ee7af52cf
# Parent  08c8821c962d510d5365825b67128f2b1e23cfce
loadBytes does not need the loader argument

diff -r 08c8821c962d -r 3e9bfed0d88e rt/vm/src/main/java/org/apidesign/vm4brwsr/ClassPath.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ClassPath.java	Wed May 14 15:57:52 2014 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ClassPath.java	Wed May 14 16:09:03 2014 +0200
@@ -44,10 +44,7 @@
     private static boolean doingToZip;
     
     
-    @Exported static byte[] loadBytes(Object loader, String name, Object[] arguments, int skip) throws Exception {
-        return ClassPath.loadFromCp(arguments, name, skip);
-    }
-    static byte[] loadFromCp(Object classpath, String res, int skip) 
+    @Exported static byte[] loadBytes(String resource, Object classpath, int skip) 
     throws IOException, ClassNotFoundException {
         for (int i = 0; i < length(classpath); i++) {
             Object c = at(classpath, i);
@@ -71,15 +68,15 @@
                     doingToZip = false;
                 }
             }
-            if (res != null) {
+            if (resource != null) {
                 byte[] checkRes;
                 if (c instanceof Bck2Brwsr.Resources) {
-                    checkRes = readBytes((Bck2Brwsr.Resources)c, res);
+                    checkRes = readBytes((Bck2Brwsr.Resources)c, resource);
                     if (checkRes != null && --skip < 0) {
                         return checkRes;
                     }
                 } else {
-                    checkRes = callFunction(c, res, skip);
+                    checkRes = callFunction(c, resource, skip);
                     if (checkRes != null) {
                         return checkRes;
                     }
diff -r 08c8821c962d -r 3e9bfed0d88e rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Wed May 14 15:57:52 2014 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Wed May 14 16:09:03 2014 +0200
@@ -565,7 +565,7 @@
                 + "        var arrSize = 0;\n"
                 + "      };\n"
                 + "      var ret = vm['org_apidesign_vm4brwsr_ClassPath'](false).\n"
-                + "        loadBytes___3BLjava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2I(loader, name, args, skip);\n"
+                + "        loadBytes___3BLjava_lang_String_2Ljava_lang_Object_2I(name, args, skip);\n"
                 + "      if (ret !== null) return ret;\n"
                 + "      while (knownExtensions < extensions.length) {\n"
                 + "        vm['registerResource'] = registerResource;\n"
diff -r 08c8821c962d -r 3e9bfed0d88e rt/vm/src/main/java/org/apidesign/vm4brwsr/VMLazy.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VMLazy.java	Wed May 14 15:57:52 2014 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VMLazy.java	Wed May 14 16:09:03 2014 +0200
@@ -51,7 +51,7 @@
     private Object load(String name, boolean instance)
     throws IOException, ClassNotFoundException {
         String res = name.replace('.', '/') + ".class";
-        byte[] arr = ClassPath.loadFromCp(args, res, 0);
+        byte[] arr = ClassPath.loadBytes(res, args, 0);
         if (arr == null) {
             throw new ClassNotFoundException(name);
         }