From 393192ff0253e74e1ada9cb364a1c05cc7ac7e23 Mon Sep 17 00:00:00 2001
From: Gábor Somogyi <gabor.g.somogyi@gmail.com>
Date: Fri, 6 May 2016 00:00:33 +0200
Subject: Rename SupportedCommand to CommandType

---
 .../traccar/api/resource/CommandTypeResource.java  | 49 ++++++++++++++++++++++
 .../api/resource/SupportedCommandResource.java     | 49 ----------------------
 2 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 src/org/traccar/api/resource/CommandTypeResource.java
 delete mode 100644 src/org/traccar/api/resource/SupportedCommandResource.java

(limited to 'src/org/traccar/api')

diff --git a/src/org/traccar/api/resource/CommandTypeResource.java b/src/org/traccar/api/resource/CommandTypeResource.java
new file mode 100644
index 000000000..9f9ecf249
--- /dev/null
+++ b/src/org/traccar/api/resource/CommandTypeResource.java
@@ -0,0 +1,49 @@
+/*
+ * 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.api.resource;
+
+import org.traccar.Context;
+import org.traccar.api.BaseResource;
+import org.traccar.model.Position;
+import org.traccar.model.CommandType;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Collections;
+
+@Path("commandtypes")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class CommandTypeResource extends BaseResource {
+
+    @GET
+    public Collection<CommandType> get(@QueryParam("deviceId") long deviceId) throws SQLException {
+        Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
+        Position lastPosition = Context.getConnectionManager().getLastPosition(deviceId);
+        if (lastPosition != null) {
+            return Context.getServerManager().getProtocolCommandTypes(lastPosition.getProtocol());
+        } else {
+            return Collections.EMPTY_LIST;
+        }
+    }
+
+}
diff --git a/src/org/traccar/api/resource/SupportedCommandResource.java b/src/org/traccar/api/resource/SupportedCommandResource.java
deleted file mode 100644
index 1d5ce8595..000000000
--- a/src/org/traccar/api/resource/SupportedCommandResource.java
+++ /dev/null
@@ -1,49 +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.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.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Collections;
-
-@Path("supportedcommands")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class SupportedCommandResource extends BaseResource {
-
-    @GET
-    public Collection<SupportedCommand> get(@QueryParam("deviceId") long deviceId) throws SQLException {
-        Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-        Position lastPosition = Context.getConnectionManager().getLastPosition(deviceId);
-        if (lastPosition != null) {
-            return Context.getServerManager().getProtocolSuppportedCommands(lastPosition.getProtocol());
-        } else {
-            return Collections.EMPTY_LIST;
-        }
-    }
-
-}
-- 
cgit v1.2.3