antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

No more skin caching in the skin manager. Skins are from now

Browse source 
on cached only on the response object.
This commit is contained in:
hns 2002-06-07 18:34:49 +00:00
parent d1a36dc7e0
commit 33653fffbd
1 changed files with 4 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/helma/framework/core/SkinManager.java
View file

@ -4,7 +4,6 @@
package helma.framework.core; package helma.framework.core;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap;
import java.util.Iterator; import java.util.Iterator;
import helma.objectmodel.INode; import helma.objectmodel.INode;
import java.io.*; import java.io.*;
@ -15,30 +14,17 @@ import java.io.*;
*/ */
public class SkinManager { public final class SkinManager {
Application app; Application app;
Map skincache;
public SkinManager (Application app) { public SkinManager (Application app) {
this.app = app; this.app = app;
skincache = new WeakHashMap ();
} }
public Skin getSkin (Object object, String skinname, Object[] skinpath) { public Skin getSkin (Object object, String skinname, Object[] skinpath) {
Prototype proto = app.getPrototype (object); Prototype proto = app.getPrototype (object);
String key = new StringBuffer(proto.getName()).append ("/").append (skinname) Skin skin = getSkin (proto, skinname, "skin", skinpath);
.append ("#").append (skinpath.hashCode()).toString ();
// System.err.print ("SKINKEY: "+key);
Skin skin = (Skin) skincache.get (key);
if (skin != null) {
// System.err.println (" ... cached");
return skin;
}
// System.err.println (" ... uncached");
skin = getSkin (proto, skinname, "skin", skinpath);
if (skin != null)
skincache.put (key, skin);
return skin; return skin;
} }
@ -84,12 +70,7 @@ public class SkinManager {
if (n != null) { if (n != null) {
String skin = n.getString (extension, false); String skin = n.getString (extension, false);
if (skin != null) { if (skin != null) {
Skin s = (Skin) app.skincache.get (skin); return new Skin (skin, app);
if (s == null) {
s = new Skin (skin, app);
app.skincache.put (skin, s);
}
return s;
} }
} }
} }
@ -100,8 +81,7 @@ public class SkinManager {
f = new File (f, skinname+"."+extension); f = new File (f, skinname+"."+extension);
if (f.exists() && f.canRead()) { if (f.exists() && f.canRead()) {
SkinFile sf = new SkinFile (f, skinname, app); SkinFile sf = new SkinFile (f, skinname, app);
Skin s = sf.getSkin (); return sf.getSkin ();
return s;
} }
} }
// Inheritance is taken care of in the above getSkin method. // Inheritance is taken care of in the above getSkin method.
@ -109,33 +89,4 @@ public class SkinManager {
return null; return null;
} }
/**
* Utility class to use for caching skins in a Hashtable.
* The key consists out of two strings: prototype name and skin name.
*/
final class SkinKey {
final String first, second, third;
public SkinKey (String first, String second, String third) {
this.first = first;
this.second = second;
this.third = third;
}
public boolean equals (Object other) {
try {
SkinKey key = (SkinKey) other;
return first.equals (key.first) && second.equals (key.second) && third.equals (key.third);
} catch (Exception x) {
return false;
}
}
public int hashCode () {
return first.hashCode () + second.hashCode () + third.hashCode ();
}
}
} }