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

Rewrote global object wrapping to be look more consistent

Browse source
This commit is contained in:
hns 2002-05-31 13:50:44 +00:00
parent ceb80decb0
commit a26d52ae02
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/helma/scripting/fesi/FesiEvaluator.java
View file

@ -228,14 +228,9 @@ public final class FesiEvaluator {
// that expose properties and functions in a special way instead of just going // that expose properties and functions in a special way instead of just going
// with the standard java object wrappers. // with the standard java object wrappers.
if (v instanceof Map) {
if (v instanceof RequestTrans)
sv = new ESBeanWrapper (new RequestBean ((RequestTrans) v), this);
else if (v instanceof ResponseTrans)
sv = new ESBeanWrapper (new ResponseBean ((ResponseTrans) v), this);
else if (v instanceof Map)
sv = new ESMapWrapper (this, (Map) v); sv = new ESMapWrapper (this, (Map) v);
else if ("path".equals (k)) { } else if ("path".equals (k)) {
ArrayPrototype parr = new ArrayPrototype (evaluator.getArrayPrototype(), evaluator); ArrayPrototype parr = new ArrayPrototype (evaluator.getArrayPrototype(), evaluator);
List path = (List) v; List path = (List) v;
// register path elements with their prototype // register path elements with their prototype
@ -248,13 +243,19 @@ public final class FesiEvaluator {
parr.putHiddenProperty (protoname, wrappedElement); parr.putHiddenProperty (protoname, wrappedElement);
} }
sv = parr; sv = parr;
} else if ("req".equals (k)) {
sv = new ESBeanWrapper (new RequestBean ((RequestTrans) v), this);
} else if ("res".equals (k)) {
sv = new ESBeanWrapper (new ResponseBean ((ResponseTrans) v), this);
} else if ("session".equals (k)) { } else if ("session".equals (k)) {
sv = new ESBeanWrapper (new SessionBean ((Session)v), this); sv = new ESBeanWrapper (new SessionBean ((Session)v), this);
} else if ("user".equals (k)) {
sv = getNodeWrapper ((User) v);
} else if ("app".equals (k)) { } else if ("app".equals (k)) {
sv = new ESBeanWrapper (new ApplicationBean ((Application)v), this); sv = new ESBeanWrapper (new ApplicationBean ((Application)v), this);
} } else {
else
sv = ESLoader.normalizeValue (v, evaluator); sv = ESLoader.normalizeValue (v, evaluator);
}
global.putHiddenProperty (k, sv); global.putHiddenProperty (k, sv);
} }
// remember the globals set on this evaluator // remember the globals set on this evaluator
@ -434,7 +435,7 @@ public final class FesiEvaluator {
* Get a script wrapper for an implemntation of helma.objectmodel.INode * Get a script wrapper for an implemntation of helma.objectmodel.INode
*/ */
public ESNode getNodeWrapper (INode n) { public ESNode getNodeWrapper (INode n) {
// FIXME: should this return ESNull.theNull? // FIXME: should this return ESNull.theNull?
if (n == null) if (n == null)
return null; return null;