From 1424c2048346206f750bd68232ba6e2cbe1545e9 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 24 Nov 2016 11:46:28 +0500 Subject: - Invert variable meaning - Style fixes --- src/org/traccar/CopyAttributesHandler.java | 4 +-- src/org/traccar/database/DeviceManager.java | 35 +++++++++++----------- .../traccar/events/MaintenanceEventHandler.java | 4 +-- src/org/traccar/events/OverspeedEventHandler.java | 2 +- src/org/traccar/reports/Summary.java | 2 +- src/org/traccar/reports/Trips.java | 2 +- 6 files changed, 25 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/org/traccar/CopyAttributesHandler.java b/src/org/traccar/CopyAttributesHandler.java index d7f0b4180..f6326ea84 100644 --- a/src/org/traccar/CopyAttributesHandler.java +++ b/src/org/traccar/CopyAttributesHandler.java @@ -29,8 +29,8 @@ public class CopyAttributesHandler extends BaseDataHandler { @Override protected Position handlePosition(Position position) { - String attributesString = Context.getDeviceManager().lookupAttributeString(position.getDeviceId(), - "processing.copyAttributes", null, false); + String attributesString = Context.getDeviceManager().lookupAttributeString( + position.getDeviceId(), "processing.copyAttributes", null, true); Position last = getLastPosition(position.getDeviceId()); if (attributesString != null && last != null) { for (String attribute : attributesString.split(" ")) { diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java index b0364051e..c70e67231 100644 --- a/src/org/traccar/database/DeviceManager.java +++ b/src/org/traccar/database/DeviceManager.java @@ -317,50 +317,51 @@ public class DeviceManager implements IdentityManager { groupsById.remove(groupId); } - public boolean lookupAttributeBoolean(long deviceId, String attributeName, boolean defaultValue, - boolean lookupServer) { - String result = lookupAttribute(deviceId, attributeName, lookupServer); + public boolean lookupAttributeBoolean( + long deviceId, String attributeName, boolean defaultValue, boolean lookupConfig) { + String result = lookupAttribute(deviceId, attributeName, lookupConfig); if (result != null) { return Boolean.parseBoolean(result); } return defaultValue; } - public String lookupAttributeString(long deviceId, String attributeName, String defaultValue, - boolean lookupServer) { - String result = lookupAttribute(deviceId, attributeName, lookupServer); + public String lookupAttributeString( + long deviceId, String attributeName, String defaultValue, boolean lookupConfig) { + String result = lookupAttribute(deviceId, attributeName, lookupConfig); if (result != null) { return result; } return defaultValue; } - public int lookupAttributeInteger(long deviceId, String attributeName, int defaultValue, boolean lookupServer) { - String result = lookupAttribute(deviceId, attributeName, lookupServer); + public int lookupAttributeInteger(long deviceId, String attributeName, int defaultValue, boolean lookupConfig) { + String result = lookupAttribute(deviceId, attributeName, lookupConfig); if (result != null) { return Integer.parseInt(result); } return defaultValue; } - public long lookupAttributeLong(long deviceId, String attributeName, long defaultValue, boolean lookupServer) { - String result = lookupAttribute(deviceId, attributeName, lookupServer); + public long lookupAttributeLong( + long deviceId, String attributeName, long defaultValue, boolean lookupConfig) { + String result = lookupAttribute(deviceId, attributeName, lookupConfig); if (result != null) { return Long.parseLong(result); } return defaultValue; } - public double lookupAttributeDouble(long deviceId, String attributeName, double defaultValue, - boolean lookupServer) { - String result = lookupAttribute(deviceId, attributeName, lookupServer); + public double lookupAttributeDouble( + long deviceId, String attributeName, double defaultValue, boolean lookupConfig) { + String result = lookupAttribute(deviceId, attributeName, lookupConfig); if (result != null) { return Double.parseDouble(result); } return defaultValue; } - private String lookupAttribute(long deviceId, String attributeName, boolean lookupServer) { + private String lookupAttribute(long deviceId, String attributeName, boolean lookupConfig) { String result = null; Device device = getDeviceById(deviceId); if (device != null) { @@ -380,11 +381,11 @@ public class DeviceManager implements IdentityManager { } } if (result == null) { - if (lookupServer) { + if (lookupConfig) { + result = Context.getConfig().getString(attributeName); + } else { Server server = Context.getPermissionsManager().getServer(); result = server.getString(attributeName); - } else { - result = Context.getConfig().getString(attributeName); } } } diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java index 9cc4a1aeb..5a36a74d1 100644 --- a/src/org/traccar/events/MaintenanceEventHandler.java +++ b/src/org/traccar/events/MaintenanceEventHandler.java @@ -38,12 +38,12 @@ public class MaintenanceEventHandler extends BaseEventHandler { } double maintenanceInterval = Context.getDeviceManager() - .lookupAttributeDouble(device.getId(), ATTRIBUTE_MAINTENANCE_INTERVAL, 0, true); + .lookupAttributeDouble(device.getId(), ATTRIBUTE_MAINTENANCE_INTERVAL, 0, false); if (maintenanceInterval == 0) { return null; } double maintenanceStart = Context.getDeviceManager() - .lookupAttributeDouble(device.getId(), ATTRIBUTE_MAINTENANCE_START, 0, true); + .lookupAttributeDouble(device.getId(), ATTRIBUTE_MAINTENANCE_START, 0, false); Collection events = new ArrayList<>(); double oldTotalDistance = 0.0; diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java index 4e4d7bb66..505d706f4 100644 --- a/src/org/traccar/events/OverspeedEventHandler.java +++ b/src/org/traccar/events/OverspeedEventHandler.java @@ -48,7 +48,7 @@ public class OverspeedEventHandler extends BaseEventHandler { Collection events = new ArrayList<>(); double speed = position.getSpeed(); double speedLimit = Context.getDeviceManager() - .lookupAttributeDouble(device.getId(), ATTRIBUTE_SPEED_LIMIT, 0, true); + .lookupAttributeDouble(device.getId(), ATTRIBUTE_SPEED_LIMIT, 0, false); if (speedLimit == 0) { return null; } diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java index 7fc064ac2..cacb4d1d6 100644 --- a/src/org/traccar/reports/Summary.java +++ b/src/org/traccar/reports/Summary.java @@ -60,7 +60,7 @@ public final class Summary { result.setMaxSpeed(position.getSpeed()); } boolean ignoreOdometer = Context.getDeviceManager() - .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, false); + .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, true); result.setDistance(ReportUtils.calculateDistance(firstPosition, previousPosition, !ignoreOdometer)); result.setAverageSpeed(speedSum / positions.size()); } diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java index 134fd4969..d4e25f5e5 100644 --- a/src/org/traccar/reports/Trips.java +++ b/src/org/traccar/reports/Trips.java @@ -80,7 +80,7 @@ public final class Trips { trip.setEndAddress(endTrip.getAddress()); boolean ignoreOdometer = Context.getDeviceManager() - .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, false); + .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, true); trip.setDistance(ReportUtils.calculateDistance(startTrip, endTrip, !ignoreOdometer)); trip.setDuration(tripDuration); trip.setAverageSpeed(speedSum / (endIndex - startIndex)); -- cgit v1.2.3