aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource
diff options
context:
space:
mode:
authorGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 12:49:23 +0200
committerGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 12:49:23 +0200
commit1cc86f7df5704aa19d1af643c5fbf852a301858b (patch)
tree28ffae07132f57c2cdd7fd065b2315f4fb7cd7fd /src/org/traccar/api/resource
parent1a605980b1a120614ccaeb56faac37b05a81a4e9 (diff)
downloadtraccar-server-1cc86f7df5704aa19d1af643c5fbf852a301858b.tar.gz
traccar-server-1cc86f7df5704aa19d1af643c5fbf852a301858b.tar.bz2
traccar-server-1cc86f7df5704aa19d1af643c5fbf852a301858b.zip
SupportedCommand model removed
Diffstat (limited to 'src/org/traccar/api/resource')
-rw-r--r--src/org/traccar/api/resource/DeviceResource.java5
-rw-r--r--src/org/traccar/api/resource/SupportedCommandResource.java3
2 files changed, 1 insertions, 7 deletions
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index f7494aa6a..5c58d3b32 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -19,7 +19,6 @@ import org.traccar.Context;
import org.traccar.api.BaseResource;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.Collection;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -33,11 +32,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.traccar.helper.Log;
-import org.traccar.model.Command;
import org.traccar.model.Device;
-import org.traccar.model.Position;
-import org.traccar.model.SupportedCommand;
@Path("devices")
@Produces(MediaType.APPLICATION_JSON)
diff --git a/src/org/traccar/api/resource/SupportedCommandResource.java b/src/org/traccar/api/resource/SupportedCommandResource.java
index bf4fd4969..097acaa4f 100644
--- a/src/org/traccar/api/resource/SupportedCommandResource.java
+++ b/src/org/traccar/api/resource/SupportedCommandResource.java
@@ -18,7 +18,6 @@ package org.traccar.api.resource;
import org.traccar.Context;
import org.traccar.api.BaseResource;
import org.traccar.model.Position;
-import org.traccar.model.SupportedCommand;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
@@ -32,7 +31,7 @@ import java.util.Collections;
public class SupportedCommandResource extends BaseResource {
@GET
- public Collection<SupportedCommand> get(@QueryParam("deviceId") long deviceId) throws SQLException {
+ public Collection<String> get(@QueryParam("deviceId") long deviceId) throws SQLException {
Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
Position lastPosition = Context.getConnectionManager().getLastPosition(deviceId);
if (lastPosition != null) {