X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FResources.java;h=a4459d0e2bbabfa93f966f93513dba9153dd4b5c;hb=13a00f2eb8eb38682788650052f84ede589ec259;hp=ae2a1f49e4bab4a83a9ca7138d836b5993c4bc8b;hpb=70b3b62e598936269664bcfc9b91beca2a8afc9c;p=org.ibex.core.git
diff --git a/src/org/xwt/Resources.java b/src/org/xwt/Resources.java
index ae2a1f4..a4459d0 100644
--- a/src/org/xwt/Resources.java
+++ b/src/org/xwt/Resources.java
@@ -4,7 +4,7 @@ package org.xwt;
import java.io.*;
import java.net.*;
import java.util.*;
-import jazz.*;
+import java.util.zip.*;
import java.lang.*;
import java.applet.*;
import org.mozilla.javascript.*;
@@ -25,12 +25,12 @@ public class Resources {
/** Holds resources added at runtime. Initialized to hold 2000 to work around a NetscapeJVM bug. */
private static Hash bytes = new Hash(2000, 3);
- /** The number of bytes read from the initial-xwar stream; used to display a progress bar on the splash screen */
- public static int bytesDownloaded = 0;
+ /** keeps track of which archive loaded templates into which package */
+ private static Hash usedPackages = new Hash();
/** Returns true iff name is a valid resource name */
private static boolean validResourceName(String name) {
- if (name == null || name.equals("")) return false;
+ if (name == null || name.equals("")) return true;
if (name.endsWith("/box.xwt") || name.endsWith("/svg.xwt")) return false;
if (name.equals("box.xwt") || name.equals("svg.xwt")) return false;
if (!((name.charAt(0) >= 'A' && name.charAt(0) <= 'Z') ||
@@ -52,31 +52,32 @@ public class Resources {
new Static(prefix.replace(File.separatorChar, '.'));
String[] subfiles = dir.list();
for(int i=0; i