From ac8b7264b3491a7f7c3cd7c75b5774c2dbd9fe79 Mon Sep 17 00:00:00 2001
From: Rodrigo Damazio <rodrigo@damazio.org>
Date: Fri, 20 Aug 2010 23:13:05 -0300
Subject: [PATCH] Minor initialization fixes

---
 .../android/apps/mytracks/content/TracksColumns.java   | 10 +++++-----
 .../android/apps/mytracks/io/CsvTrackWriter.java       |  2 +-
 .../google/android/apps/mytracks/io/GpxImporter.java   |  9 ++++++---
 .../android/apps/mytracks/io/GpxTrackWriter.java       |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TracksColumns.java b/MyTracks/src/com/google/android/apps/mytracks/content/TracksColumns.java
index 912915b34..5e22926c9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/TracksColumns.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/TracksColumns.java
@@ -68,9 +68,9 @@ public interface TracksColumns extends BaseColumns {
       MAXSPEED, MINELEVATION, MAXELEVATION, ELEVATIONGAIN, MINGRADE, MAXGRADE,
       MINLAT, MAXLAT, MINLON, MAXLON };
   public static final byte[] BACKUP_COLUMN_TYPES = {
-      LONG_TYPE_ID, STRING_TYPE_ID, STRING_TYPE_ID, LONG_TYPE_ID, LONG_TYPE_ID,
-      LONG_TYPE_ID, LONG_TYPE_ID, INT_TYPE_ID, FLOAT_TYPE_ID, LONG_TYPE_ID,
-      LONG_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID,
-      FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, INT_TYPE_ID,
-      INT_TYPE_ID, INT_TYPE_ID, INT_TYPE_ID };
+      LONG_TYPE_ID, STRING_TYPE_ID, STRING_TYPE_ID, STRING_TYPE_ID,
+      LONG_TYPE_ID, LONG_TYPE_ID, LONG_TYPE_ID, LONG_TYPE_ID, INT_TYPE_ID,
+      FLOAT_TYPE_ID, LONG_TYPE_ID, LONG_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID,
+      FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID,
+      FLOAT_TYPE_ID, INT_TYPE_ID, INT_TYPE_ID, INT_TYPE_ID, INT_TYPE_ID };
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java
index a48c3fdd4..22797b4af 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java
@@ -46,7 +46,7 @@ import java.util.TimeZone;
 public class CsvTrackWriter implements TrackFormatWriter {
   static final SimpleDateFormat TIMESTAMP_FORMAT =
       new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-  {
+  static {
     TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java
index c16678e03..4fbba6150 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java
@@ -64,6 +64,11 @@ public class GpxImporter extends DefaultHandler {
   static final SimpleDateFormat DATE_FORMAT3 = new SimpleDateFormat(
       "yyyy-MM-dd'T'HH:mm:ss.SSSZ");
   static final SimpleTimeZone UTC_TIMEZONE = new SimpleTimeZone(0, "UTC");
+  static {
+    DATE_FORMAT1.setTimeZone(UTC_TIMEZONE);
+    DATE_FORMAT2.setTimeZone(UTC_TIMEZONE);
+    DATE_FORMAT3.setTimeZone(UTC_TIMEZONE);
+  }
 
   /*
    * GPX-XML tag names and attributes.
@@ -536,10 +541,8 @@ public class GpxImporter extends DefaultHandler {
     throw new SAXException(msg);
   }
 
-  private long parseTime(String timeContents, SimpleDateFormat formatParam) {
-    SimpleDateFormat format = formatParam;
+  private long parseTime(String timeContents, SimpleDateFormat format) {
     try {
-      format.setTimeZone(UTC_TIMEZONE);
       return format.parse(timeContents).getTime();
     } catch (ParseException ex) {
       return -1;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
index 1e31ee815..6054dc9a5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
@@ -37,7 +37,7 @@ public class GpxTrackWriter implements TrackFormatWriter {
 
   static final SimpleDateFormat TIMESTAMP_FORMAT =
       new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-  {
+  static {
     TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
   }