karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Minor initialization fixes

Browse Source
This commit is contained in:
Rodrigo Damazio
2010-08-20 23:13:05 -03:00
parent bf7b24ecc0
commit ac8b7264b3
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/content/TracksColumns.java
+5 -5
View File
@@ -68,9 +68,9 @@ public interface TracksColumns extends BaseColumns {
MAXSPEED, MINELEVATION, MAXELEVATION, ELEVATIONGAIN, MINGRADE, MAXGRADE, MAXSPEED, MINELEVATION, MAXELEVATION, ELEVATIONGAIN, MINGRADE, MAXGRADE,
MINLAT, MAXLAT, MINLON, MAXLON }; MINLAT, MAXLAT, MINLON, MAXLON };
public static final byte[] BACKUP_COLUMN_TYPES = { 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, STRING_TYPE_ID, STRING_TYPE_ID, STRING_TYPE_ID,
LONG_TYPE_ID, LONG_TYPE_ID, INT_TYPE_ID, FLOAT_TYPE_ID, LONG_TYPE_ID, LONG_TYPE_ID, LONG_TYPE_ID, LONG_TYPE_ID, LONG_TYPE_ID, INT_TYPE_ID,
LONG_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_TYPE_ID, FLOAT_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, INT_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 }; FLOAT_TYPE_ID, INT_TYPE_ID, INT_TYPE_ID, INT_TYPE_ID, INT_TYPE_ID };
} }
MyTracks/src/com/google/android/apps/mytracks/io/CsvTrackWriter.java
+1 -1
View File
@@ -46,7 +46,7 @@ import java.util.TimeZone;
public class CsvTrackWriter implements TrackFormatWriter { public class CsvTrackWriter implements TrackFormatWriter {
static final SimpleDateFormat TIMESTAMP_FORMAT = static final SimpleDateFormat TIMESTAMP_FORMAT =
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
{ static {
TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
} }
MyTracks/src/com/google/android/apps/mytracks/io/GpxImporter.java
+6 -3
View File
@@ -64,6 +64,11 @@ public class GpxImporter extends DefaultHandler {
static final SimpleDateFormat DATE_FORMAT3 = new SimpleDateFormat( static final SimpleDateFormat DATE_FORMAT3 = new SimpleDateFormat(
"yyyy-MM-dd'T'HH:mm:ss.SSSZ"); "yyyy-MM-dd'T'HH:mm:ss.SSSZ");
static final SimpleTimeZone UTC_TIMEZONE = new SimpleTimeZone(0, "UTC"); 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. * GPX-XML tag names and attributes.
@@ -536,10 +541,8 @@ public class GpxImporter extends DefaultHandler {
throw new SAXException(msg); throw new SAXException(msg);
} }
private long parseTime(String timeContents, SimpleDateFormat formatParam) { private long parseTime(String timeContents, SimpleDateFormat format) {
SimpleDateFormat format = formatParam;
try { try {
format.setTimeZone(UTC_TIMEZONE);
return format.parse(timeContents).getTime(); return format.parse(timeContents).getTime();
} catch (ParseException ex) { } catch (ParseException ex) {
return -1; return -1;
MyTracks/src/com/google/android/apps/mytracks/io/GpxTrackWriter.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class GpxTrackWriter implements TrackFormatWriter {
static final SimpleDateFormat TIMESTAMP_FORMAT = static final SimpleDateFormat TIMESTAMP_FORMAT =
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
{ static {
TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
} }