Start re-factoring commands

2 files changed, 12 insertions, 12 deletions

diff --git a/src/org/traccar/database/ActiveDevice.java b/src/org/traccar/database/ActiveDevice.java
index f94e1b12a..33d9adad3 100644
--- a/src/org/traccar/database/ActiveDevice.java
+++ b/src/org/traccar/database/ActiveDevice.java
@@ -17,19 +17,19 @@ package org.traccar.database;
 
 import org.jboss.netty.channel.Channel;
 import org.traccar.Protocol;
-import org.traccar.command.GpsCommand;
+import org.traccar.model.Command;
 
 import java.net.SocketAddress;
 
 public class ActiveDevice {
 
-    private String uniqueId;
+    private long deviceId;
     private Protocol protocol;
     private Channel channel;
     private SocketAddress remoteAddress;
 
-    public ActiveDevice(String uniqueId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
-        this.uniqueId = uniqueId;
+    public ActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
+        this.deviceId = deviceId;
         this.protocol = protocol;
         this.channel = channel;
         this.remoteAddress = remoteAddress;
@@ -39,11 +39,11 @@ public class ActiveDevice {
         return channel;
     }
 
-    public String getUniqueId() {
-        return uniqueId;
+    public long getDeviceId() {
+        return deviceId;
     }
 
-    public void sendCommand(GpsCommand command) {
+    public void sendCommand(Command command) {
         protocol.sendCommand(this, command);
     }
 
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index dc125d7b0..39ec465e6 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -31,7 +31,7 @@ import org.traccar.model.Position;
 
 public class ConnectionManager {
 
-    private final Map<String, ActiveDevice> activeDevices = new HashMap<>();
+    private final Map<Long, ActiveDevice> activeDevices = new HashMap<>();
     private final Map<Long, Position> positions = new HashMap<>();
     private final Map<Long, Set<DataCacheListener>> listeners = new HashMap<>();
     
@@ -47,12 +47,12 @@ public class ConnectionManager {
         }
     }
 
-    public void setActiveDevice(String uniqueId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
-        activeDevices.put(uniqueId, new ActiveDevice(uniqueId, protocol, channel, remoteAddress));
+    public void setActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
+        activeDevices.put(deviceId, new ActiveDevice(deviceId, protocol, channel, remoteAddress));
     }
 
-    public ActiveDevice getActiveDevice(String uniqueId) {
-        return activeDevices.get(uniqueId);
+    public ActiveDevice getActiveDevice(long deviceId) {
+        return activeDevices.get(deviceId);
     }
 
     public synchronized void update(Position position) {