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

rendering skins and getting hrefs no longer requires an object

Browse source 
that implements  IPathElement.
This commit is contained in:
hns 2001-09-09 18:06:52 +00:00
parent 83d696e98b
commit 18f20ac807
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/helma/scripting/fesi/HopExtension.java
View file

@ -12,10 +12,7 @@ import FESI.Exceptions.*;
import FESI.Extensions.*; import FESI.Extensions.*;
import FESI.Data.*; import FESI.Data.*;
import java.io.*; import java.io.*;
import java.util.Hashtable; import java.util.*;
import java.util.Enumeration;
import java.util.TimeZone;
import java.util.Date;
import java.text.*; import java.text.*;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
@ -574,9 +571,15 @@ public class HopExtension {
try { try {
Skin skin = null; Skin skin = null;
ESObject thisObject = global ? null : thisObj; ESObject thisObject = global ? null : thisObj;
ESObject paramObject = null; HashMap params = null;
if (arguments.length > 1 && arguments[1] instanceof ESObject) if (arguments.length > 1 && arguments[1] instanceof ESObject) {
paramObject = (ESObject) arguments[1]; ESObject paramObject = (ESObject) arguments[1];
params = new HashMap ();
for (Enumeration en=paramObject.getProperties(); en.hasMoreElements(); ) {
String propname = (String) en.nextElement();
params.put (propname, paramObject.getProperty (propname, propname.hashCode()).toJavaObject());
}
}
// first, see if the first argument already is a skin object. If not, it's the name of the skin to be called // first, see if the first argument already is a skin object. If not, it's the name of the skin to be called
if (arguments[0] instanceof ESWrapper) { if (arguments[0] instanceof ESWrapper) {
@ -590,7 +593,7 @@ public class HopExtension {
if (asString) if (asString)
reval.res.pushStringBuffer (); reval.res.pushStringBuffer ();
if (skin != null) if (skin != null)
skin.render (reval, thisObject, paramObject); skin.render (reval, thisObject.toJavaObject (), params);
else else
reval.res.write ("[Skin not found: "+arguments[0]+"]"); reval.res.write ("[Skin not found: "+arguments[0]+"]");
if (asString) if (asString)
@ -937,7 +940,7 @@ public class HopExtension {
super (fp, evaluator, name, 1); super (fp, evaluator, name, 1);
} }
public ESValue callFunction (ESObject thisObject, ESValue[] arguments) throws EcmaScriptException { public ESValue callFunction (ESObject thisObject, ESValue[] arguments) throws EcmaScriptException {
IPathElement elem = (IPathElement) thisObject.toJavaObject (); Object elem = thisObject.toJavaObject ();
String tmpname = arguments.length == 0 ? "" : arguments[0].toString (); String tmpname = arguments.length == 0 ? "" : arguments[0].toString ();
String basicHref =app.getNodeHref (elem, tmpname); String basicHref =app.getNodeHref (elem, tmpname);
String hrefSkin = app.getProperty ("hrefSkin", null); String hrefSkin = app.getProperty ("hrefSkin", null);
@ -946,28 +949,27 @@ public class HopExtension {
if (hrefSkin != null) { if (hrefSkin != null) {
// we need to post-process the href with a skin for this application // we need to post-process the href with a skin for this application
// first, look in the object href was called on. // first, look in the object href was called on.
IPathElement skinElem = elem; Object skinElem = elem;
Skin skin = null; Skin skin = null;
while (skin == null && skinElem != null) { while (skin == null && skinElem != null) {
Prototype proto = app.getPrototype (skinElem); Prototype proto = app.getPrototype (skinElem);
if (proto != null) if (proto != null)
skin = proto.getSkin (hrefSkin); skin = proto.getSkin (hrefSkin);
if (skin == null) if (skin == null)
skinElem = skinElem.getParentElement (); skinElem = app.getParentElement (skinElem);
} }
if (skin != null) { if (skin != null) {
ESObject eso = reval.getElementWrapper (skinElem); return renderSkin (skin, basicHref, skinElem);
return renderSkin (skin, basicHref, eso);
} }
} }
return new ESString (basicHref); return new ESString (basicHref);
} }
private ESString renderSkin (Skin skin, String path, ESObject obj) throws EcmaScriptException { private ESString renderSkin (Skin skin, String path, Object skinElem) throws EcmaScriptException {
reval.res.pushStringBuffer (); reval.res.pushStringBuffer ();
ESObject param = new ObjectPrototype (null, reval.evaluator); HashMap param = new HashMap ();
param.putProperty ("path", new ESString (path), "path".hashCode ()); param.put ("path", path);
skin.render (reval, obj, param); skin.render (reval, skinElem, param);
return new ESString (reval.res.popStringBuffer ().trim ()); return new ESString (reval.res.popStringBuffer ().trim ());
} }
} }