aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/Context.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-09-22 17:51:23 +1200
committerGitHub <noreply@github.com>2016-09-22 17:51:23 +1200
commit05cb432d786e3e4248b54dc47d457ebf9e33ba62 (patch)
tree2534c50504dc2282417b5d14567155977d0c32fb /src/org/traccar/Context.java
parent55ee0b56cd1f668711b9ffc82e7d90961435b42f (diff)
parentc8816bdd85d62fb767795b2dc4d31326fdad9cd5 (diff)
downloadtrackermap-server-05cb432d786e3e4248b54dc47d457ebf9e33ba62.tar.gz
trackermap-server-05cb432d786e3e4248b54dc47d457ebf9e33ba62.tar.bz2
trackermap-server-05cb432d786e3e4248b54dc47d457ebf9e33ba62.zip
Merge pull request #2354 from Abyss777/device_attribute_aliases
Add attributes aliases
Diffstat (limited to 'src/org/traccar/Context.java')
-rw-r--r--src/org/traccar/Context.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index c7359e76c..e983ab99e 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -16,6 +16,8 @@
package org.traccar;
import com.ning.http.client.AsyncHttpClient;
+
+import org.traccar.database.AliasesManager;
import org.traccar.database.ConnectionManager;
import org.traccar.database.DataManager;
import org.traccar.database.DeviceManager;
@@ -134,6 +136,12 @@ public final class Context {
return eventForwarder;
}
+ private static AliasesManager aliasesManager;
+
+ public static AliasesManager getAliasesManager() {
+ return aliasesManager;
+ }
+
public static void init(String[] arguments) throws Exception {
config = new Config();
@@ -233,6 +241,8 @@ public final class Context {
eventForwarder = new EventForwarder();
}
+ aliasesManager = new AliasesManager(dataManager);
+
}
public static void init(IdentityManager testIdentityManager) {