X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FTimestamp.java;h=f1d056980de680d5343edf25776ebe56402700d1;hp=6b7f77b55d361d12de91897f8ee34983d305e9de;hb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f;hpb=52bf9e8686c916be37a26a0b75340393d4478b05 diff --git a/tim/prune/data/Timestamp.java b/tim/prune/data/Timestamp.java index 6b7f77b..f1d0569 100644 --- a/tim/prune/data/Timestamp.java +++ b/tim/prune/data/Timestamp.java @@ -17,9 +17,10 @@ public class Timestamp private String _text = null; private String _timeText = null; - private static DateFormat DEFAULT_DATE_FORMAT = DateFormat.getDateTimeInstance(); - private static DateFormat DEFAULT_TIME_FORMAT = DateFormat.getTimeInstance(); - private static DateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + private static final DateFormat DEFAULT_DATE_FORMAT = DateFormat.getDateTimeInstance(); + private static final DateFormat DEFAULT_TIME_FORMAT = DateFormat.getTimeInstance(); + private static final DateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + private static final DateFormat ISO_8601_FORMAT_NOZ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); private static DateFormat[] ALL_DATE_FORMATS = null; private static Calendar CALENDAR = null; private static long SECS_SINCE_1970 = 0L; @@ -53,7 +54,7 @@ public class Timestamp new SimpleDateFormat("HH:mm:ss dd MMM yyyy"), new SimpleDateFormat("dd MMM yyyy HH:mm:ss"), new SimpleDateFormat("yyyy MMM dd HH:mm:ss"), - ISO_8601_FORMAT + ISO_8601_FORMAT, ISO_8601_FORMAT_NOZ }; }