svn commit: r1585958 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java

[adrianc]

Author: adrianc
Date: Wed Apr  9 12:55:00 2014
New Revision: 1585958

URL: http://svn.apache.org/r1585958
Log:
Modified the String to java.sql.Date conversion. Replace deprecated constructor call with a Calendar implementation.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java?rev=1585958&r1=1585957&r2=1585958&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java Wed Apr  9 12:55:00 2014
@@ -555,7 +555,6 @@ public class DateTimeConverters implemen
             return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
         }
 
-        @SuppressWarnings("deprecation")
         public java.sql.Date convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException {
             String trimStr = obj.trim();
             if (trimStr.length() == 0) {
@@ -569,7 +568,10 @@ public class DateTimeConverters implemen
             }
             try {
                 java.util.Date parsedDate = df.parse(trimStr);
-                return new java.sql.Date(parsedDate.getYear(), parsedDate.getMonth(), parsedDate.getDate());
+                Calendar cal = UtilDateTime.toCalendar(parsedDate, timeZone, locale);
+                cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+                cal.set(Calendar.MILLISECOND, 0);
+                return new java.sql.Date(cal.getTimeInMillis());
             } catch (ParseException e) {
                 throw new ConversionException(e);
             }