s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A shorter fix for toString() to handle Date than the last commit.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@1961 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-12-25 21:36:51 +00:00
parent 0ff40eabbd
commit 687e9064df
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/com/google/refine/expr/functions/ToString.java
View File

@ -50,12 +50,7 @@ public class ToString implements Function {
if (args.length >= 1) { if (args.length >= 1) {
Object o1 = args[0]; Object o1 = args[0];
if (o1 != null) { if (o1 != null) {
if (o1 instanceof Date) { if (o1 instanceof Calendar || o1 instanceof Date) {
Calendar c = Calendar.getInstance();
c.setTime((Date) o1);
o1 = c;
}
if (o1 instanceof Calendar) {
DateFormat formatter = null; DateFormat formatter = null;
if (args.length == 2) { if (args.length == 2) {
Object o2 = args[1]; Object o2 = args[1];
@ -66,7 +61,7 @@ public class ToString implements Function {
if (formatter == null) { if (formatter == null) {
formatter = DateFormat.getDateInstance(); formatter = DateFormat.getDateInstance();
} }
return formatter.format(((Calendar) o1).getTime()); return formatter.format(o1 instanceof Date ? ((Date) o1) : ((Calendar) o1).getTime());
} else { } else {
return (o1 instanceof String) ? o1 : o1.toString(); return (o1 instanceof String) ? o1 : o1.toString();
} }