import java.util.zip.*;
import java.lang.*;
import java.applet.*;
-import org.mozilla.javascript.*;
+import org.xwt.js.*;
import org.xwt.util.*;
/**
char c = name.charAt(i);
if (!((c >= 'A' && c <= 'Z') ||
(c >= 'a' && c <= 'z') ||
- c == '_' ||
- (c >= '0' && c <= '9') ||
- (c == '.' && i == name.length() - 4))) return false;
+ c == '_' || c == '.' ||
+ (c >= '0' && c <= '9'))) return false;
}
return true;
}
/** 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;
if (name.endsWith(".xwt")) {
String name2 = name.substring(0, name.length() - 4);
Static.createStatic(name2.replace(File.separatorChar, '.'), false);
- usedPackages.put(JSObject.nodeNameToPackageName(name2.replace('/', '.')), new Object());
}
bytes.put(name.replace(File.separatorChar, '.'), file);
}
/** 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 Function callback) throws IOException {
+ public static synchronized void loadArchive(InputStream is, final int length, final JS.Function callback) throws IOException {
// random placeholder
Object thisArchive = new Object();
}
public int read(byte[] b, int off, int len) throws IOException {
int ret = super.read(b, off, len);
- if (ret != -1) bytesDownloaded += ret;
if (clear && callback != null) {
clear = false;
- ThreadMessage.newthread(new JSObject.JSFunction() {
- public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+ ThreadMessage.newthread(new JS.Function() {
+ public Object _call(JS.Array args_) throws JS.Exn {
try {
- callback.call(cx, null, null, new Object[] { new Double(bytesDownloaded), 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;
}
}
});
}
+ bytesDownloaded += ret;
return ret;
}
});
+ Template.TemplateHelper t = new Template.TemplateHelper();
+
for(ZipEntry ze = zis.getNextEntry(); ze != null; ze = zis.getNextEntry()) {
String name = ze.getName();
if (!validResourceName(name.substring(name.lastIndexOf('/') + 1))) {
// placeholder so resolveResource() works properly
bytes.put(name.replace('/', '.'), new byte[] { });
name = name.substring(0, name.length() - 4);
-
- String packageName = JSObject.nodeNameToPackageName(name.replace('/', '.'));
- Object user = usedPackages.get(packageName);
- if (user != null && user != thisArchive) {
- if (Log.on) Log.log(Resources.class, "templates have already been loaded into " + packageName + "; refusing to load " + name);
- } else {
- usedPackages.put(packageName, thisArchive);
- Static.createStatic(name.replace('/', '.'), false);
- Template.buildTemplate(zis, name.replace('/', '.'));
- }
+ Static.createStatic(name.replace('/', '.'), false);
+ Template.buildTemplate(zis, name.replace('/', '.'), t);
} else {
bytes.put(name.replace('/', '.'), isToByteArray(zis));