aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/helper/Parser.java
diff options
context:
space:
mode:
authorjon-stumpf <jon.stumpf@gmail.com>2017-03-17 08:42:59 -0400
committerjon-stumpf <jon.stumpf@gmail.com>2017-03-17 13:48:21 -0400
commit48bfd0c24ecda1f43f47ddb74f6c87a4ade3d690 (patch)
treedf157e60225050f789daaae85d101e69513c2925 /src/org/traccar/helper/Parser.java
parent876169d832846e4ee1a5eea769771e0e1abcfea2 (diff)
downloadtrackermap-server-48bfd0c24ecda1f43f47ddb74f6c87a4ade3d690.tar.gz
trackermap-server-48bfd0c24ecda1f43f47ddb74f6c87a4ade3d690.tar.bz2
trackermap-server-48bfd0c24ecda1f43f47ddb74f6c87a4ade3d690.zip
Removed ISO8601 DateTimeFormat as requested;
Diffstat (limited to 'src/org/traccar/helper/Parser.java')
-rw-r--r--src/org/traccar/helper/Parser.java13
1 files changed, 1 insertions, 12 deletions
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) {