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

Unwrap JS-native number and boolean objects in put() and return them as

Browse source 
they are in get().
This commit is contained in:
hns 2003-09-05 15:44:24 +00:00
parent 6d7a8eba66
commit fb3196cfd5
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/helma/scripting/rhino/HopObject.java
View file

@ -486,6 +486,10 @@ public class HopObject extends ScriptableObject implements Wrapper {
node.setDate(name, new Date((long) ScriptRuntime.toNumber(s))); node.setDate(name, new Date((long) ScriptRuntime.toNumber(s)));
} else if ("String".equals(s.getClassName())) { } else if ("String".equals(s.getClassName())) {
node.setString(name, ScriptRuntime.toString(s)); node.setString(name, ScriptRuntime.toString(s));
} else if ("Number".equals(s.getClassName())) {
node.setFloat(name, ScriptRuntime.toNumber(s));
} else if ("Boolean".equals(s.getClassName())) {
node.setBoolean(name, ScriptRuntime.toBoolean(s));
} else if (s instanceof MapWrapper) { } else if (s instanceof MapWrapper) {
node.setJavaObject(name, ((MapWrapper) s).unwrap()); node.setJavaObject(name, ((MapWrapper) s).unwrap());
} else { } else {
@ -580,20 +584,13 @@ public class HopObject extends ScriptableObject implements Wrapper {
IProperty p = node.get(name); IProperty p = node.get(name);
if (p != null) { if (p != null) {
if (p.getType() == IProperty.STRING) {
return p.getStringValue();
}
if (p.getType() == IProperty.BOOLEAN) { switch (p.getType()) {
return p.getBooleanValue() ? Boolean.TRUE : Boolean.FALSE; case IProperty.STRING:
} case IProperty.INTEGER:
case IProperty.FLOAT:
if (p.getType() == IProperty.INTEGER) { case IProperty.BOOLEAN:
return new Long(p.getIntegerValue()); return p.getValue();
}
if (p.getType() == IProperty.FLOAT) {
return new Double(p.getFloatValue());
} }
Context cx = Context.getCurrentContext(); Context cx = Context.getCurrentContext();