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

Always convert java.util.Dates to JavaScript Date objects in Wrap Factory.

Browse source
This commit is contained in:
hns 2005-01-26 13:28:36 +00:00
parent 7e45ee5fbf
commit 755a0f5606
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/helma/scripting/rhino/RhinoCore.java
View file

@ -997,15 +997,27 @@ public final class RhinoCore {
class WrapMaker extends WrapFactory { class WrapMaker extends WrapFactory {
public Object wrap(Context cx, Scriptable scope, Object obj, Class staticType) { public Object wrap(Context cx, Scriptable scope, Object obj, Class staticType) {
// System.err.println ("Wrapping: "+obj); // Wrap Nodes
if (obj instanceof INode) { if (obj instanceof INode) {
return getNodeWrapper((INode) obj); return getNodeWrapper((INode) obj);
} }
// Masquerade SystemMap and WrappedMap as native JavaScript objects
if (obj instanceof SystemMap || obj instanceof WrappedMap) { if (obj instanceof SystemMap || obj instanceof WrappedMap) {
return new MapWrapper((Map) obj, RhinoCore.this); return new MapWrapper((Map) obj, RhinoCore.this);
} }
// Convert java.util.Date objects to JavaScript Dates
if (obj instanceof Date) {
Object[] args = { new Long(((Date) obj).getTime()) };
try {
return cx.newObject(global, "Date", args);
} catch (JavaScriptException nafx) {
return obj;
}
}
// Wrap scripted Java objects
if (obj != null && app.getPrototypeName(obj) != null) { if (obj != null && app.getPrototypeName(obj) != null) {
return getElementWrapper(obj); return getElementWrapper(obj);
} }