Removed the old Java stub class generator and replaced it with the ik…

…vmstub core.
mono · Feb 21, 2013 · 4bf1c0d · 4bf1c0d
1 parent a1ba4a2
commit 4bf1c0d
Show file tree

Hide file tree

Showing 15 changed files with 579 additions and 2,090 deletions.
diff --git a/classpath/gnu/java/net/protocol/ikvmres/Handler.java b/classpath/gnu/java/net/protocol/ikvmres/Handler.java
@@ -119,7 +119,7 @@ static InputStream readResourceFromAssembly(String assembly, int port, String re
             try
             {
                 Class c = Class.forName(resource.substring(1, resource.length() - 6).replace('/', '.'), false, loader);
-                return new ByteArrayInputStream(ikvm.internal.stubgen.StubGenerator.generateStub(c));
+                return new ByteArrayInputStream(GenerateStub(c));
             }
             catch(ClassNotFoundException _)
             {
@@ -152,7 +152,7 @@ public static InputStream readResourceFromAssembly(Assembly asm, String resource
                 Class c = LoadClassFromAssembly(asm, resource.substring(1, resource.length() - 6).replace('/', '.'));
                 if(c != null)
                 {
-                    return new ByteArrayInputStream(ikvm.internal.stubgen.StubGenerator.generateStub(c));
+                    return new ByteArrayInputStream(GenerateStub(c));
                 }
             }
             throw (FileNotFoundException)new FileNotFoundException().initCause(x);
@@ -163,6 +163,7 @@ public static InputStream readResourceFromAssembly(Assembly asm, String resource
         }
     }
 
+    private static native byte[] GenerateStub(Class c);
     private static native cli.System.IO.Stream ReadResourceFromAssemblyImpl(Assembly asm, String resource);
     private static native Class LoadClassFromAssembly(Assembly asm, String className);
     private static native Assembly LoadAssembly(String name)