-// FIXME
+// FIXEME
// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
package org.xwt;
if ("".equals(key)) {
try {
Template t = Template.getTemplate(addExtension(".xwt"));
- return t == null ? null : t.getStatic();
+ return t == null ? null : t.getStatic(null); /** FIXME VERY BAD! */
} catch (Exception e) {
- Log.log(this, e);
+ Log.info(this, e);
return null;
}
}
public InputStream getInputStream(String path) throws IOException {
CachedInputStream cis = (CachedInputStream)cachedInputStreams.get(path);
if (cis == null) {
- java.io.File f = null;
if (disk) {
- f = new java.io.File(System.getProperty("user.home") +
- java.io.File.separatorChar + ".xwt" +
- java.io.File.separatorChar + "caches" +
- java.io.File.separatorChar +
- new String(Base64.encode(key.getBytes())));
- Log.log(this, "caching resource in " + f);
- new java.io.File(f.getParent()).mkdirs();
+ java.io.File f = LocalStorage.Cache.getCacheFileForKey(key);
if (f.exists()) return new FileInputStream(f);
+ cis = new CachedInputStream(parent.getInputStream(path), f);
+ } else {
+ cis = new CachedInputStream(parent.getInputStream(path));
}
- cis = new CachedInputStream(parent.getInputStream(path), f);
cachedInputStreams.put(path, cis);
}
return cis.getInputStream();