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

Internally replace '.' with '_' in action names.

Browse source 
Implement proxy method for Application.getSkin() that takes care of per-request caching.
This commit is contained in:
hns 2003-06-25 15:13:46 +00:00
parent 146d9d9285
commit b98f8b6751
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/helma/scripting/rhino/RhinoEngine.java
View file

@ -262,7 +262,7 @@ public final class RhinoEngine implements ScriptingEngine {
} }
} }
Object f = ScriptableObject.getProperty(eso, functionName); Object f = ScriptableObject.getProperty(eso, functionName.replace('.', '_'));
if ((f == ScriptableObject.NOT_FOUND) || !(f instanceof Function)) { if ((f == ScriptableObject.NOT_FOUND) || !(f instanceof Function)) {
return null; return null;
@ -343,7 +343,7 @@ public final class RhinoEngine implements ScriptingEngine {
*/ */
public boolean hasFunction(Object obj, String fname) { public boolean hasFunction(Object obj, String fname) {
// System.err.println ("HAS_FUNC: "+fname); // System.err.println ("HAS_FUNC: "+fname);
return core.hasFunction(app.getPrototypeName(obj), fname); return core.hasFunction(app.getPrototypeName(obj), fname.replace('.', '_'));
} }
/** /**
@ -444,4 +444,26 @@ public final class RhinoEngine implements ScriptingEngine {
public RhinoCore getCore() { public RhinoCore getCore() {
return core; return core;
} }
/**
* Get a skin for the given prototype and skin name. This method considers the
* skinpath set in the current response object and does per-response skin
* caching.
*/
public Skin getSkin(String protoName, String skinName) {
SkinKey key = new SkinKey(protoName, skinName);
Skin skin = reval.res.getCachedSkin(key);
if (skin == null) {
// retrieve res.skinpath, an array of objects that tell us where to look for skins
// (strings for directory names and INodes for internal, db-stored skinsets)
Object[] skinpath = reval.res.getSkinpath();
core.unwrapSkinpath(skinpath);
skin = app.getSkin(protoName, skinName, skinpath);
reval.res.cacheSkin(key, skin);
}
return skin;
}
} }