aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/notification
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-07-26 17:52:27 +0500
committerAbyss777 <abyss@fox5.ru>2017-07-26 17:52:27 +0500
commitd31f68d80a8e3ae75fa0c2f02b9ca258486a3cad (patch)
treed44c13177de39aad1d0907a4150dfa6e440ab02f /src/org/traccar/notification
parent82edf57e1b93d5a5ca34294dc62e3620889c2341 (diff)
downloadtrackermap-server-d31f68d80a8e3ae75fa0c2f02b9ca258486a3cad.tar.gz
trackermap-server-d31f68d80a8e3ae75fa0c2f02b9ca258486a3cad.tar.bz2
trackermap-server-d31f68d80a8e3ae75fa0c2f02b9ca258486a3cad.zip
- Implement base manager classes as generics
- Remame getDeviceById and getDeviceByUniqueId functions
Diffstat (limited to 'src/org/traccar/notification')
-rw-r--r--src/org/traccar/notification/EventForwarder.java2
-rw-r--r--src/org/traccar/notification/NotificationFormatter.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java
index 08f55df75..ac37f980c 100644
--- a/src/org/traccar/notification/EventForwarder.java
+++ b/src/org/traccar/notification/EventForwarder.java
@@ -69,7 +69,7 @@ public final class EventForwarder {
data.put(KEY_POSITION, position);
}
if (event.getDeviceId() != 0) {
- Device device = Context.getIdentityManager().getDeviceById(event.getDeviceId());
+ Device device = Context.getIdentityManager().getById(event.getDeviceId());
if (device != null) {
data.put(KEY_DEVICE, device);
}
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index cd9959671..33fd2cdc7 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -40,7 +40,7 @@ public final class NotificationFormatter {
public static VelocityContext prepareContext(long userId, Event event, Position position) {
User user = Context.getPermissionsManager().getUser(userId);
- Device device = Context.getIdentityManager().getDeviceById(event.getDeviceId());
+ Device device = Context.getIdentityManager().getById(event.getDeviceId());
VelocityContext velocityContext = new VelocityContext();
velocityContext.put("user", user);