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/database | |
parent | 2d920ecec746615281802e068044a3122a0ae90b (diff) | |
download | traccar-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.tar.gz traccar-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.tar.bz2 traccar-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.zip |
Explicitly use ASCII charset
Diffstat (limited to 'src/org/traccar/database')
-rw-r--r-- | src/org/traccar/database/ActiveDevice.java | 3 | ||||
-rw-r--r-- | src/org/traccar/database/ConnectionManager.java | 20 | ||||
-rw-r--r-- | src/org/traccar/database/DataManager.java | 36 | ||||
-rw-r--r-- | src/org/traccar/database/PermissionsManager.java | 11 | ||||
-rw-r--r-- | src/org/traccar/database/QueryBuilder.java | 15 |
5 files changed, 44 insertions, 41 deletions
diff --git a/src/org/traccar/database/ActiveDevice.java b/src/org/traccar/database/ActiveDevice.java index 571ebf465..746d3b393 100644 --- a/src/org/traccar/database/ActiveDevice.java +++ b/src/org/traccar/database/ActiveDevice.java @@ -15,11 +15,12 @@ */ package org.traccar.database; -import java.net.SocketAddress; import org.jboss.netty.channel.Channel; import org.traccar.Protocol; import org.traccar.model.Command; +import java.net.SocketAddress; + public class ActiveDevice { private final long deviceId; diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java index e91aa2d5b..bb9958232 100644 --- a/src/org/traccar/database/ConnectionManager.java +++ b/src/org/traccar/database/ConnectionManager.java @@ -15,6 +15,16 @@ */ package org.traccar.database; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.util.Timeout; +import org.jboss.netty.util.TimerTask; +import org.traccar.Context; +import org.traccar.GlobalTimer; +import org.traccar.Protocol; +import org.traccar.helper.Log; +import org.traccar.model.Device; +import org.traccar.model.Position; + import java.net.SocketAddress; import java.sql.SQLException; import java.util.Collection; @@ -27,16 +37,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.util.Timeout; -import org.jboss.netty.util.TimerTask; -import org.traccar.Context; -import org.traccar.GlobalTimer; -import org.traccar.Protocol; -import org.traccar.helper.Log; -import org.traccar.model.Device; -import org.traccar.model.Position; - public class ConnectionManager { private static final long DEFAULT_TIMEOUT = 600; diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index eb0be9274..5a233411b 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -16,23 +16,6 @@ package org.traccar.database; import com.mchange.v2.c3p0.ComboPooledDataSource; -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import javax.naming.InitialContext; -import javax.sql.DataSource; - import liquibase.Contexts; import liquibase.Liquibase; import liquibase.database.Database; @@ -44,13 +27,30 @@ import org.traccar.Config; import org.traccar.Context; import org.traccar.helper.Log; import org.traccar.model.Device; +import org.traccar.model.DevicePermission; import org.traccar.model.Group; import org.traccar.model.GroupPermission; -import org.traccar.model.DevicePermission; import org.traccar.model.Position; import org.traccar.model.Server; import org.traccar.model.User; +import javax.naming.InitialContext; +import javax.sql.DataSource; +import java.io.File; +import java.lang.reflect.Method; +import java.net.URL; +import java.net.URLClassLoader; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + public class DataManager implements IdentityManager { private static final long DEFAULT_REFRESH_DELAY = 300; diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java index 57307b58a..08d44b382 100644 --- a/src/org/traccar/database/PermissionsManager.java +++ b/src/org/traccar/database/PermissionsManager.java @@ -15,11 +15,6 @@ */ package org.traccar.database; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; import org.traccar.helper.Log; import org.traccar.model.Device; import org.traccar.model.DevicePermission; @@ -28,6 +23,12 @@ import org.traccar.model.GroupPermission; import org.traccar.model.Server; import org.traccar.model.User; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + public class PermissionsManager { private final DataManager dataManager; diff --git a/src/org/traccar/database/QueryBuilder.java b/src/org/traccar/database/QueryBuilder.java index d0c1c649f..c5a682b7e 100644 --- a/src/org/traccar/database/QueryBuilder.java +++ b/src/org/traccar/database/QueryBuilder.java @@ -15,6 +15,14 @@ */ package org.traccar.database; +import org.traccar.Context; +import org.traccar.helper.Log; +import org.traccar.model.MiscFormatter; + +import javax.json.Json; +import javax.json.JsonReader; +import javax.json.stream.JsonParsingException; +import javax.sql.DataSource; import java.io.StringReader; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -32,13 +40,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import javax.json.Json; -import javax.json.JsonReader; -import javax.json.stream.JsonParsingException; -import javax.sql.DataSource; -import org.traccar.Context; -import org.traccar.helper.Log; -import org.traccar.model.MiscFormatter; public final class QueryBuilder { |