X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FResources.java;h=615ef97ab8394e5c99048f8638f6ec85c0377f70;hb=93224727752b3da9a70bacd473c5f961efb3a297;hp=c0240ca7d5e8c3ca710bbd9ceddc9e371416228a;hpb=e58686eae8a823ed64ed0ec92c2274c41d90ec93;p=org.ibex.core.git

diff --git a/src/org/xwt/Resources.java b/src/org/xwt/Resources.java
index c0240ca..615ef97 100644
--- a/src/org/xwt/Resources.java
+++ b/src/org/xwt/Resources.java
@@ -6,7 +6,6 @@ import java.net.*;
 import java.util.*;
 import java.util.zip.*;
 import java.lang.*;
-import java.applet.*;
 import org.xwt.js.*;
 import org.xwt.util.*;
 
@@ -48,7 +47,9 @@ public class Resources {
     /** Load a directory as if it were an archive */
     public static synchronized void loadDirectory(File dir) throws IOException { loadDirectory(dir, ""); }
     private static synchronized void loadDirectory(File dir, String prefix) throws IOException {
-        new Static(prefix.replace(File.separatorChar, '.'));
+        String n = prefix.replace(File.separatorChar, '.');
+        if (n.endsWith(".")) n = n.substring(0, n.length() - 1);
+        new Static(n);
         String[] subfiles = dir.list();
         for(int i=0; i<subfiles.length; i++) {
             if (subfiles[i].equals("CVS") || !validResourceName(subfiles[i])) continue;
@@ -68,7 +69,7 @@ public class Resources {
 
     /** Load an archive from an inputstream. */
     public static synchronized void loadArchive(InputStream is) throws IOException { loadArchive(is, 0, null); }
-    public static synchronized void loadArchive(InputStream is, final int length, final JS.Function callback) throws IOException {
+    public static synchronized void loadArchive(InputStream is, final int length, final JS.Callable callback) throws IOException {
 
         // random placeholder
         Object thisArchive = new Object();
@@ -84,12 +85,12 @@ public class Resources {
                     int ret = super.read(b, off, len);
                     if (clear && callback != null) {
                         clear = false;
-                        ThreadMessage.newthread(new JS.Function() {
-                                public Object _call(JS.Array args_) throws JS.Exn {
+                        ThreadMessage.newthread(new JS.Callable() {
+                                public Object call(JS.Array args_) throws JS.Exn {
                                     try {
-					JS.Array args = new JS.Array();
-					args.addElement(new Double(bytesDownloaded));
-					args.addElement(new Double(length));
+                                        JS.Array args = new JS.Array();
+                                        args.addElement(new Double(bytesDownloaded));
+                                        args.addElement(new Double(length));
                                         callback.call(args);
                                     } finally {
                                         clear = true;
@@ -116,8 +117,8 @@ public class Resources {
                 // placeholder so resolveResource() works properly
                 bytes.put(name.replace('/', '.'), new byte[] { });
                 name = name.substring(0, name.length() - 4);
-		Static.createStatic(name.replace('/', '.'), false);
-		Template.buildTemplate(zis, name.replace('/', '.'), t);
+                Static.createStatic(name.replace('/', '.'), false);
+                Template.buildTemplate(zis, name.replace('/', '.'), t);
 
             } else {
                 bytes.put(name.replace('/', '.'), isToByteArray(zis));