aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-23 09:11:55 +0500
committerAbyss777 <abyss@fox5.ru>2016-11-23 09:11:55 +0500
commit2e2ec32b732f27df9c73f83a1982944cae45bf70 (patch)
tree7926b10de73b9b595bf8887c4e52010789bf9caa
parent64560f850e12ec8ff5db9d2401158d5d3007b214 (diff)
downloadtraccar-server-2e2ec32b732f27df9c73f83a1982944cae45bf70.tar.gz
traccar-server-2e2ec32b732f27df9c73f83a1982944cae45bf70.tar.bz2
traccar-server-2e2ec32b732f27df9c73f83a1982944cae45bf70.zip
Adjust constants names
-rw-r--r--src/org/traccar/events/MaintenanceEventHandler.java6
-rw-r--r--src/org/traccar/model/Event.java2
-rw-r--r--src/org/traccar/notification/NotificationFormatter.java14
3 files changed, 11 insertions, 11 deletions
diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java
index 078848b86..466e0b617 100644
--- a/src/org/traccar/events/MaintenanceEventHandler.java
+++ b/src/org/traccar/events/MaintenanceEventHandler.java
@@ -27,8 +27,8 @@ import org.traccar.model.Position;
public class MaintenanceEventHandler extends BaseEventHandler {
- public static final String ATTRIBUTE_MAINTENANCE_START = "device.maintenanceStart";
- public static final String ATTRIBUTE_MAINTENANCE_INTERVAL = "device.maintenanceInterval";
+ public static final String ATTRIBUTE_MAINTENANCE_START = "maintenance.start";
+ public static final String ATTRIBUTE_MAINTENANCE_INTERVAL = "maintenance.interval";
@Override
protected Collection<Event> analyzePosition(Position position) {
@@ -61,7 +61,7 @@ public class MaintenanceEventHandler extends BaseEventHandler {
oldTotalDistance -= maintenanceStart;
newTotalDistance -= maintenanceStart;
if ((long) (oldTotalDistance / maintenanceInterval) < (long) (newTotalDistance / maintenanceInterval)) {
- events.add(new Event(Event.TYPE_MAINTENANCE_NEED, position.getDeviceId(), position.getId()));
+ events.add(new Event(Event.TYPE_MAINTENANCE_NEEDED, position.getDeviceId(), position.getId()));
}
return events;
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 9c252a1c3..45da9a711 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -56,7 +56,7 @@ public class Event extends Message {
public static final String TYPE_IGNITION_ON = "ignitionOn";
public static final String TYPE_IGNITION_OFF = "ignitionOff";
- public static final String TYPE_MAINTENANCE_NEED = "maintenanceNeed";
+ public static final String TYPE_MAINTENANCE_NEEDED = "maintenanceNeeded";
private Date serverTime;
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index d21c05afe..07be178fd 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -92,10 +92,10 @@ public final class NotificationFormatter {
+ "Ignition OFF%n"
+ "Point: http://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n"
+ "Time: %2$tc%n";
- public static final String TITLE_TEMPLATE_TYPE_MAINTENANCE_NEED = "%1$s: maintenance is needed";
- public static final String MESSAGE_TEMPLATE_TYPE_MAINTENANCE_NEED = "Device: %1$s%n"
+ public static final String TITLE_TEMPLATE_TYPE_MAINTENANCE_NEEDED = "%1$s: maintenance is needed";
+ public static final String MESSAGE_TEMPLATE_TYPE_MAINTENANCE_NEEDED = "Device: %1$s%n"
+ "Maintenance is needed%n"
- + "Point: http://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n"
+ + "Point: https://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n"
+ "Time: %2$tc%n";
public static String formatTitle(long userId, Event event, Position position) {
@@ -140,8 +140,8 @@ public final class NotificationFormatter {
case Event.TYPE_IGNITION_OFF:
formatter.format(TITLE_TEMPLATE_TYPE_IGNITION_OFF, device.getName());
break;
- case Event.TYPE_MAINTENANCE_NEED:
- formatter.format(TITLE_TEMPLATE_TYPE_MAINTENANCE_NEED, device.getName());
+ case Event.TYPE_MAINTENANCE_NEEDED:
+ formatter.format(TITLE_TEMPLATE_TYPE_MAINTENANCE_NEEDED, device.getName());
break;
default:
formatter.format("Unknown type");
@@ -206,8 +206,8 @@ public final class NotificationFormatter {
formatter.format(MESSAGE_TEMPLATE_TYPE_IGNITION_OFF, device.getName(), position.getFixTime(),
position.getLatitude(), position.getLongitude());
break;
- case Event.TYPE_MAINTENANCE_NEED:
- formatter.format(MESSAGE_TEMPLATE_TYPE_MAINTENANCE_NEED, device.getName(), position.getFixTime(),
+ case Event.TYPE_MAINTENANCE_NEEDED:
+ formatter.format(MESSAGE_TEMPLATE_TYPE_MAINTENANCE_NEEDED, device.getName(), position.getFixTime(),
position.getLatitude(), position.getLongitude());
break;
default: