From 80119f59a0d4b89396f5d7d57ba2d80257a8da79 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 30 May 2016 12:07:43 +0500 Subject: - Style fixes (use lower camel case in all cases) - Added TYPE_prefix for event.type strings - Removed commented code - Removed "database.selectLastEvents" because it is not cross-database. Do the same via code. --- src/org/traccar/model/Event.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/org/traccar/model/Event.java') diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java index 27c750c49..75049c433 100644 --- a/src/org/traccar/model/Event.java +++ b/src/org/traccar/model/Event.java @@ -30,18 +30,18 @@ public class Event extends Message { this.id = id; } - public static final String COMMAND_RESULT = "command-result"; + public static final String TYPE_COMMAND_RESULT = "commandResult"; - public static final String DEVICE_ONLINE = "device-online"; - public static final String DEVICE_OFFLINE = "device-offline"; + public static final String TYPE_DEVICE_ONLINE = "deviceOnline"; + public static final String TYPE_DEVICE_OFFLINE = "deviceOffline"; - public static final String DEVICE_MOVING = "device-moving"; - public static final String DEVICE_STOPPED = "device-stopped"; + public static final String TYPE_DEVICE_MOVING = "deviceMoving"; + public static final String TYPE_DEVICE_STOPPED = "deviceStopped"; - public static final String DEVICE_OVERSPEED = "device-overspeed"; + public static final String TYPE_DEVICE_OVERSPEED = "deviceOverspeed"; - public static final String GEOFENCE_ENTER = "geofence-enter"; - public static final String GEOFENCE_EXIT = "geofence-exit"; + public static final String TYPE_GEOFENCE_ENTER = "geofenceEnter"; + public static final String TYPE_GEOFENCE_EXIT = "geofenceExit"; private Date eventTime; -- cgit v1.2.3