diff options
| author | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:36:18 +0200 |
|---|---|---|
| committer | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:39:03 +0200 |
| commit | 516ef6a30eb59e1b9c3aa297e3595c5acf665530 (patch) | |
| tree | 2bed5e621be4786816bbf3d6adabe41d2d43fbdb /src/org/traccar/web/JsonConverter.java | |
| parent | 5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff) | |
| parent | 59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff) | |
| download | trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.gz trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.bz2 trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.zip | |
Merge branch 'master' into command_framework
Diffstat (limited to 'src/org/traccar/web/JsonConverter.java')
| -rw-r--r-- | src/org/traccar/web/JsonConverter.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/org/traccar/web/JsonConverter.java b/src/org/traccar/web/JsonConverter.java index d018de101..4b7719fd2 100644 --- a/src/org/traccar/web/JsonConverter.java +++ b/src/org/traccar/web/JsonConverter.java @@ -15,6 +15,19 @@ */ package org.traccar.web; +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormatter; +import org.joda.time.format.ISODateTimeFormat; +import org.traccar.helper.Log; +import org.traccar.model.MiscFormatter; + +import javax.json.Json; +import javax.json.JsonArray; +import javax.json.JsonArrayBuilder; +import javax.json.JsonObject; +import javax.json.JsonObjectBuilder; +import javax.json.JsonReader; +import javax.json.JsonValue; import java.beans.Introspector; import java.io.Reader; import java.lang.reflect.InvocationTargetException; @@ -23,19 +36,6 @@ import java.text.ParseException; import java.util.Collection; import java.util.Date; import java.util.Map; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; -import javax.json.JsonValue; - -import org.joda.time.DateTime; -import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.ISODateTimeFormat; -import org.traccar.helper.Log; -import org.traccar.model.MiscFormatter; public final class JsonConverter { |