commit aa51274e25103f7c38a9a00020655528e0e92df4
author Tatu Saloranta <tsaloranta@gmail.com> Wed Feb 22 22:51:33 2012 -0800
committer Tatu Saloranta <tsaloranta@gmail.com> Wed Feb 22 22:51:33 2012 -0800
tree 9bd1786025ba86f588674f8b7e8ff544acbaa2d2
parent 26b2e1b3d7c8662092079a7ba6e997dafd87c47e

Implemented [JACKSON-435], using @JsonFormat for Dates, Calendars

src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java

diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
index 4149f7c..585e3a8 100644
--- a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
+++ b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.databind.util.ArrayBuilders;
 import com.fasterxml.jackson.databind.util.ClassUtil;
+import com.fasterxml.jackson.databind.util.ISO8601Utils;
 import com.fasterxml.jackson.databind.util.LinkedNode;
 import com.fasterxml.jackson.databind.util.ObjectBuffer;
 
@@ -70,7 +71,24 @@
      * owners (<code>ObjectMapper</code>, <code>ObjectReader</code>)
      * access it.
      */
-    public final DeserializerFactory _factory;
+    protected final DeserializerFactory _factory;
+
+    /*
+    /**********************************************************
+    /* Configuration, other
+    /**********************************************************
+     */
+
+    /**
+     * Locale used for formatting purposes.
+     */
+    protected Locale _locale;
+
+    /**
+     * Timezone to use as the default; if not specified, will
+     * default to GMT
+     */
+    protected TimeZone _timezone;
 
     /*
     /**********************************************************
@@ -170,6 +188,26 @@
         _parser = jp;
         _injectableValues = injectableValues;
     }
+
+    /*
+    /**********************************************************
+    /* Public API, mutators
+    /**********************************************************
+     */
+
+    /**
+     * @since 2.0
+     */
+    public void setLocale(Locale l) {
+        _locale = l;
+    }
+    
+    /**
+     * @since 2.0
+     */
+    public void setTimeZone(TimeZone tz) {
+        _timezone = tz;
+    }
     
     /*
     /**********************************************************
@@ -281,6 +319,23 @@
         return _config.getTypeFactory();
     }
 
+    /**
+     * Method for accessing default Locale to use; can be overridden.
+     */
+    public Locale getLocale() {
+        if (_locale != null) {
+            return _locale;
+        }
+        return Locale.getDefault();
+    }
+
+    public TimeZone getTimeZone() {
+        if (_timezone != null) {
+            return _timezone;
+        }
+        return ISO8601Utils.timeZoneGMT();
+    }
+    
     /*
     /**********************************************************
     /* Public API, pass-through to DeserializerCache
@@ -459,8 +514,8 @@
     {
         try {
             return getDateFormat().parse(dateStr);
-        } catch (ParseException pex) {
-            throw new IllegalArgumentException(pex.getMessage());
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("Failed to parse Date value '"+dateStr+"': "+e.getMessage());
         }
     }
 
@@ -473,7 +528,7 @@
         /* 08-Jan-2008, tatu: not optimal, but should work for the
          *   most part; let's revise as needed.
          */
-        Calendar c = Calendar.getInstance();
+        Calendar c = Calendar.getInstance(getTimeZone());
         c.setTime(d);
         return c;
     }