Changeset 10475 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-06-24T08:36:12+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13045 - Inconsistent timezone handling in tests/nmea (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/NmeaReader.java (modified) (2 diffs)
• tools/date/DateUtils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -166 +167 @@
 
     public NmeaReader(InputStream source) throws IOException {
+        rmcTimeFmt.setTimeZone(DateUtils.UTC);
+        rmcTimeFmtStd.setTimeZone(DateUtils.UTC);
 
         // create the data tree

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -30 +30 @@
 public final class DateUtils {
 
+    /**
+     * The UTC time zone.
+     */
+    public static final TimeZone UTC = TimeZone.getTimeZone("UTC");
+
     protected DateUtils() {
         // Hide default constructor for utils classes
@@ -46 +51 @@
      * with the timezone lookup, is very expensive.
      */
-    private static final GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+    private static final GregorianCalendar calendar = new GregorianCalendar(UTC);
     private static final GregorianCalendar calendarLocale = new GregorianCalendar(TimeZone.getDefault());
     private static final DatatypeFactory XML_DATE;