diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-27 17:00:45 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 17:00:45 +1200 |
| commit | 495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598 (patch) | |
| tree | 4b65fbe2d6081f31762a0d8aa790b9fcf81e81f7 /src/org/traccar/processing/ComputedAttributesHandler.java | |
| parent | 194263a9dc8040ebcbf62c80733aca5097eb3e36 (diff) | |
| parent | 49fa4893269b1732806f7176c279742291e02edf (diff) | |
| download | traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.gz traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.bz2 traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.zip | |
Merge pull request #3391 from Abyss777/refactor_drivers_groups
Split Drivers and Groups management
Diffstat (limited to 'src/org/traccar/processing/ComputedAttributesHandler.java')
| -rw-r--r-- | src/org/traccar/processing/ComputedAttributesHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/processing/ComputedAttributesHandler.java b/src/org/traccar/processing/ComputedAttributesHandler.java index d6a762535..f1f371475 100644 --- a/src/org/traccar/processing/ComputedAttributesHandler.java +++ b/src/org/traccar/processing/ComputedAttributesHandler.java @@ -51,7 +51,7 @@ public class ComputedAttributesHandler extends BaseDataHandler { private MapContext prepareContext(Position position) { MapContext result = new MapContext(); if (mapDeviceAttributes) { - Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId()); + Device device = Context.getIdentityManager().getById(position.getDeviceId()); if (device != null) { for (Object key : device.getAttributes().keySet()) { result.set((String) key, device.getAttributes().get(key)); @@ -86,7 +86,7 @@ public class ComputedAttributesHandler extends BaseDataHandler { @Override protected Position handlePosition(Position position) { - Collection<Attribute> attributes = Context.getAttributesManager().getItems(Attribute.class, + Collection<Attribute> attributes = Context.getAttributesManager().getItems( Context.getAttributesManager().getAllDeviceItems(position.getDeviceId())); for (Attribute attribute : attributes) { if (attribute.getAttribute() != null) { |