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

* Allow passing a java.util.Locale to Date.format() as second argument.

Browse source
This commit is contained in:
hns 2005-09-16 12:00:37 +00:00
parent d0660ac1b5
commit d76b720a8d
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1078,8 +1078,19 @@ public final class RhinoCore implements ScopeProvider {
public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {
Date date = new Date((long) ScriptRuntime.toNumber(thisObj)); Date date = new Date((long) ScriptRuntime.toNumber(thisObj));
SimpleDateFormat df = null; SimpleDateFormat df = null;
if (args.length > 0 && args[0] != Undefined.instance) { if (args.length > 0 && args[0] != Undefined.instance) {
if (args.length > 1 && args[1] instanceof NativeJavaObject) {
Object locale = ((NativeJavaObject) args[1]).unwrap();
if (locale instanceof Locale) {
df = new SimpleDateFormat(args[0].toString(), (Locale) locale);
} else {
throw new IllegalArgumentException("Second argument to Date.format() not a java.util.Locale: " +
locale.getClass());
}
} else {
df = new SimpleDateFormat(args[0].toString()); df = new SimpleDateFormat(args[0].toString());
}
} else { } else {
df = new SimpleDateFormat(); df = new SimpleDateFormat();
} }