aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJed <Jed@192.168.1.100>2014-09-09 13:49:37 +0800
committerJed <Jed@192.168.1.100>2014-09-09 13:49:37 +0800
commit41e46eb9f51a16ab39f1a20ba81cdf573c06c86f (patch)
tree10ae8bc656a7a499905c4e4b0222130a77cdfff9
parentbf246bdd20e94141c6b1b99886108f33995f4f36 (diff)
downloadtrackermap-server-41e46eb9f51a16ab39f1a20ba81cdf573c06c86f.tar.gz
trackermap-server-41e46eb9f51a16ab39f1a20ba81cdf573c06c86f.tar.bz2
trackermap-server-41e46eb9f51a16ab39f1a20ba81cdf573c06c86f.zip
Removed Other changes to prepare for pull request
-rw-r--r--src/org/traccar/model/DataManager.java1
-rw-r--r--src/org/traccar/model/Device.java13
-rw-r--r--test/org/traccar/helper/TestDataManager.java7
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;
}