From 48bfd0c24ecda1f43f47ddb74f6c87a4ade3d690 Mon Sep 17 00:00:00 2001 From: jon-stumpf Date: Fri, 17 Mar 2017 08:42:59 -0400 Subject: Removed ISO8601 DateTimeFormat as requested; --- src/org/traccar/helper/Parser.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/org/traccar/helper/Parser.java') diff --git a/src/org/traccar/helper/Parser.java b/src/org/traccar/helper/Parser.java index 1b77390b3..a82086958 100644 --- a/src/org/traccar/helper/Parser.java +++ b/src/org/traccar/helper/Parser.java @@ -180,8 +180,6 @@ public class Parser { DMY_HMSS, // DDMMYYYYHHMMSS.sss or DDMMYYHHMMSS.sss YMD_HMS, // YYYYMMDDHHMMSS or YYMMDDHHMMSS YMD_HMSS, // YYYYMMDDHHMMSS.sss or YYMMDDHHMMSS.sss - - ISO8601 // YYYY-MM-DDTHH:MM:SS+HH:MM } private static final DateTimeFormat DEFAULT_FORMAT = DateTimeFormat.YMD_HMS; @@ -223,23 +221,14 @@ public class Parser { break; case YMD_HMS: case YMD_HMSS: - case ISO8601: default: year = nextInt(radix); month = nextInt(radix); day = nextInt(radix); // (d{2}|d{4})(d{2})(d{2}) hour = nextInt(radix); minute = nextInt(radix); second = nextInt(radix); // (d{2})(d{2})(d{2}) break; } - switch (format) { - case YMD_HMSS: - case DMY_HMSS: + if (format == DateTimeFormat.YMD_HMSS || format == DateTimeFormat.DMY_HMSS) { millisecond = nextInt(radix); // (ddd) - break; - case ISO8601: - timeZone = TimeZone.getTimeZone("GMT" + next()); // ([+-]d{2}:d{2}) - break; - default: - break; } if (year >= 0 && year < 100) { -- cgit v1.2.3