diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-04 13:26:16 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-04 13:26:16 +1200 |
commit | 4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b (patch) | |
tree | 2b6d67fa7164d6b0cb41d3c5162556818b53cd1c /src/org/traccar/web | |
parent | 2d920ecec746615281802e068044a3122a0ae90b (diff) | |
download | trackermap-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.tar.gz trackermap-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.tar.bz2 trackermap-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.zip |
Explicitly use ASCII charset
Diffstat (limited to 'src/org/traccar/web')
-rw-r--r-- | src/org/traccar/web/JsonConverter.java | 26 | ||||
-rw-r--r-- | src/org/traccar/web/WebServer.java | 16 |
2 files changed, 21 insertions, 21 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 { diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index dc933aa00..fc78dce65 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -15,13 +15,6 @@ */ package org.traccar.web; -import java.io.IOException; -import java.io.Writer; -import java.net.InetSocketAddress; -import javax.naming.InitialContext; -import javax.servlet.http.HttpServletRequest; -import javax.sql.DataSource; - import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.SessionManager; @@ -42,8 +35,8 @@ import org.traccar.api.ObjectMapperProvider; import org.traccar.api.ResourceErrorHandler; import org.traccar.api.SecurityRequestFilter; import org.traccar.api.resource.CommandResource; -import org.traccar.api.resource.DeviceResource; import org.traccar.api.resource.DevicePermissionResource; +import org.traccar.api.resource.DeviceResource; import org.traccar.api.resource.GroupPermissionResource; import org.traccar.api.resource.GroupResource; import org.traccar.api.resource.PositionResource; @@ -52,6 +45,13 @@ import org.traccar.api.resource.SessionResource; import org.traccar.api.resource.UserResource; import org.traccar.helper.Log; +import javax.naming.InitialContext; +import javax.servlet.http.HttpServletRequest; +import javax.sql.DataSource; +import java.io.IOException; +import java.io.Writer; +import java.net.InetSocketAddress; + public class WebServer { private Server server; |