diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-16 19:01:05 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 19:01:05 +1300 |
| commit | 308d00b7f72b7455c58a98013fff06e227360097 (patch) | |
| tree | 55367dae3f7e85c65432dfbf91adc4496df16254 /src/org/traccar/helper | |
| parent | 2f782faaf27ffdae3753e06a6386c1cd49b2ed16 (diff) | |
| parent | f7a668371769a7b4c176e57626f23314e3838e1c (diff) | |
| download | trackermap-server-308d00b7f72b7455c58a98013fff06e227360097.tar.gz trackermap-server-308d00b7f72b7455c58a98013fff06e227360097.tar.bz2 trackermap-server-308d00b7f72b7455c58a98013fff06e227360097.zip | |
Merge pull request #3011 from Abyss777/reports_timezone
Use timezone from preferences for excel reports
Diffstat (limited to 'src/org/traccar/helper')
| -rw-r--r-- | src/org/traccar/helper/DateUtil.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/org/traccar/helper/DateUtil.java b/src/org/traccar/helper/DateUtil.java index de36d4420..30bb1b2fa 100644 --- a/src/org/traccar/helper/DateUtil.java +++ b/src/org/traccar/helper/DateUtil.java @@ -18,7 +18,6 @@ package org.traccar.helper; import java.util.Calendar; import java.util.Date; -import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; @@ -64,9 +63,4 @@ public final class DateUtil { public static Date parseDate(String value) { return DATE_FORMAT.parseDateTime(value).toDate(); } - - public static DateTime parseDateTime(String value) { - return DATE_FORMAT.withOffsetParsed().parseDateTime(value); - } - } |