aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-07-15 15:33:08 +0500
committerAbyss777 <abyss@fox5.ru>2016-07-15 15:33:08 +0500
commitd71210f1f408c757d4fe3da07829bbc3362a7e93 (patch)
treed5c3a2c5e6856cc3bd145d5030b9acec7184acda /src/org/traccar/api/resource
parent1f411961db56f7024d3e88cfaef89f1ab26fc9f1 (diff)
downloadtrackermap-server-d71210f1f408c757d4fe3da07829bbc3362a7e93.tar.gz
trackermap-server-d71210f1f408c757d4fe3da07829bbc3362a7e93.tar.bz2
trackermap-server-d71210f1f408c757d4fe3da07829bbc3362a7e93.zip
Move code related to devices to DeviceManager
Diffstat (limited to 'src/org/traccar/api/resource')
-rw-r--r--src/org/traccar/api/resource/DeviceResource.java10
-rw-r--r--src/org/traccar/api/resource/PositionResource.java2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index d6c53dc04..f48df7553 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -44,20 +44,20 @@ public class DeviceResource extends BaseResource {
@QueryParam("all") boolean all, @QueryParam("userId") long userId) throws SQLException {
if (all) {
Context.getPermissionsManager().checkAdmin(getUserId());
- return Context.getDataManager().getAllDevicesCached();
+ return Context.getDeviceManager().getAllDevices();
} else {
if (userId == 0) {
userId = getUserId();
}
Context.getPermissionsManager().checkUser(getUserId(), userId);
- return Context.getDataManager().getDevices(userId);
+ return Context.getDeviceManager().getDevices(userId);
}
}
@POST
public Response add(Device entity) throws SQLException {
Context.getPermissionsManager().checkReadonly(getUserId());
- Context.getDataManager().addDevice(entity);
+ Context.getDeviceManager().addDevice(entity);
Context.getDataManager().linkDevice(getUserId(), entity.getId());
Context.getPermissionsManager().refresh();
if (Context.getGeofenceManager() != null) {
@@ -71,7 +71,7 @@ public class DeviceResource extends BaseResource {
public Response update(@PathParam("id") long id, Device entity) throws SQLException {
Context.getPermissionsManager().checkReadonly(getUserId());
Context.getPermissionsManager().checkDevice(getUserId(), id);
- Context.getDataManager().updateDevice(entity);
+ Context.getDeviceManager().updateDevice(entity);
if (Context.getGeofenceManager() != null) {
Context.getGeofenceManager().refresh();
}
@@ -83,7 +83,7 @@ public class DeviceResource extends BaseResource {
public Response remove(@PathParam("id") long id) throws SQLException {
Context.getPermissionsManager().checkReadonly(getUserId());
Context.getPermissionsManager().checkDevice(getUserId(), id);
- Context.getDataManager().removeDevice(id);
+ Context.getDeviceManager().removeDevice(id);
Context.getPermissionsManager().refresh();
if (Context.getGeofenceManager() != null) {
Context.getGeofenceManager().refresh();
diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/org/traccar/api/resource/PositionResource.java
index 2da517d4f..e00e06e7a 100644
--- a/src/org/traccar/api/resource/PositionResource.java
+++ b/src/org/traccar/api/resource/PositionResource.java
@@ -39,7 +39,7 @@ public class PositionResource extends BaseResource {
@QueryParam("deviceId") long deviceId, @QueryParam("from") String from, @QueryParam("to") String to)
throws SQLException {
if (deviceId == 0) {
- return Context.getConnectionManager().getInitialState(getUserId());
+ return Context.getDeviceManager().getInitialState(getUserId());
} else {
Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
return Context.getDataManager().getPositions(