From 1cc86f7df5704aa19d1af643c5fbf852a301858b Mon Sep 17 00:00:00 2001
From: Gabor Somogyi <Gabor_Somogyi@epam.com>
Date: Wed, 4 May 2016 12:49:23 +0200
Subject: SupportedCommand model removed

---
 src/org/traccar/ServerManager.java                 | 12 ++-----
 src/org/traccar/api/resource/DeviceResource.java   |  5 ---
 .../api/resource/SupportedCommandResource.java     |  3 +-
 src/org/traccar/model/SupportedCommand.java        | 39 ----------------------
 src/org/traccar/web/WebServer.java                 |  1 -
 5 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 src/org/traccar/model/SupportedCommand.java

(limited to 'src/org')

diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 1fc145869..73c21599f 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -15,8 +15,6 @@
  */
 package org.traccar;
 
-import org.traccar.model.SupportedCommand;
-
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
@@ -92,17 +90,13 @@ public class ServerManager {
         }
     }
 
-    public Collection<SupportedCommand> getProtocolSuppportedCommands(String protocol) {
-        ArrayList<SupportedCommand> result = new ArrayList<>();
+    public Collection<String> getProtocolSuppportedCommands(String protocol) {
+        ArrayList<String> result = new ArrayList<>();
 
         if (protocol != null) {
             BaseProtocol baseProtocol = protocols.get(protocol);
             for (String commandKey : baseProtocol.getSupportedCommands()) {
-                SupportedCommand supportedCommand = new SupportedCommand();
-                supportedCommand.setKey(commandKey);
-                String commandName = "command" + commandKey.substring(0, 1).toUpperCase() + commandKey.substring(1);
-                supportedCommand.setName(commandName);
-                result.add(supportedCommand);
+                result.add(commandKey);
             }
         }
 
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) {
diff --git a/src/org/traccar/model/SupportedCommand.java b/src/org/traccar/model/SupportedCommand.java
deleted file mode 100644
index a8f31ab30..000000000
--- a/src/org/traccar/model/SupportedCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2016 Gabor Somogyi (gabor.g.somogyi@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.model;
-
-public class SupportedCommand {
-
-    private String key;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 3862d1384..46add3a75 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -43,7 +43,6 @@ import org.traccar.api.ResourceErrorHandler;
 import org.traccar.api.SecurityRequestFilter;
 import org.traccar.api.resource.*;
 import org.traccar.helper.Log;
-import org.traccar.model.SupportedCommand;
 
 public class WebServer {
 
-- 
cgit v1.2.3