Removed Other changes to prepare for pull request

3 files changed, 0 insertions, 21 deletions

diff --git a/src/org/traccar/model/DataManager.java b/src/org/traccar/model/DataManager.java
index 7228409f1..f0bfdb50d 100644
--- a/src/org/traccar/model/DataManager.java
+++ b/src/org/traccar/model/DataManager.java
@@ -27,7 +27,6 @@ public interface DataManager {
      */
     public List<Device> getDevices() throws Exception;
     public Device getDeviceByImei(String imei) throws Exception;
-    public Device getDeviceById(Long id) throws Exception;
 
     /**
      * Manage positions
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index 8c8c74e28..1276216fc 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -72,17 +72,4 @@ public class Device {
         this.uniqueId = uniqueId;
     }
 
-    /**
-     * Database (for multi-database systems)
-     */
-    private String database;
-
-    public String getDatabase() {
-        return database;
-    }
-
-    public void setDatabase(String database) {
-        this.database = database;
-    }
-
 }
diff --git a/test/org/traccar/helper/TestDataManager.java b/test/org/traccar/helper/TestDataManager.java
index 000b7196d..9e8147b05 100644
--- a/test/org/traccar/helper/TestDataManager.java
+++ b/test/org/traccar/helper/TestDataManager.java
@@ -19,13 +19,6 @@ public class TestDataManager implements DataManager {
         return device;
     }
     @Override
-    public Device getDeviceById(Long id) {
-        Device device = new Device();
-        device.setId(new Long(1));
-        device.setImei("123456789012345");
-        return device;
-    }
-    @Override
     public Long addPosition(Position position) {
         return null;
     }