From 0ff40eabbd767e02a297d59b2922f52464dcf55e Mon Sep 17 00:00:00 2001 From: David Huynh Date: Sat, 25 Dec 2010 21:33:59 +0000 Subject: [PATCH] toString() should handle Date, too, rather than just Calendar. git-svn-id: http://google-refine.googlecode.com/svn/trunk@1960 7d457c2a-affb-35e4-300a-418c747d4874 --- main/src/com/google/refine/expr/functions/ToString.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/main/src/com/google/refine/expr/functions/ToString.java b/main/src/com/google/refine/expr/functions/ToString.java index 3f56f5a95..7611b85f8 100644 --- a/main/src/com/google/refine/expr/functions/ToString.java +++ b/main/src/com/google/refine/expr/functions/ToString.java @@ -36,6 +36,7 @@ package com.google.refine.expr.functions; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; import java.util.Properties; import org.json.JSONException; @@ -49,6 +50,11 @@ public class ToString implements Function { if (args.length >= 1) { Object o1 = args[0]; if (o1 != null) { + if (o1 instanceof Date) { + Calendar c = Calendar.getInstance(); + c.setTime((Date) o1); + o1 = c; + } if (o1 instanceof Calendar) { DateFormat formatter = null; if (args.length == 2) {