From aa12e5c750e771016545269ffa39409b06b47eee Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 26 May 2016 09:30:43 +0500 Subject: - Simplification of the hierarchy of models classes - Removed automatically founded unnecessary imports --- src/org/traccar/protocol/WialonProtocolDecoder.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/org/traccar/protocol/WialonProtocolDecoder.java') diff --git a/src/org/traccar/protocol/WialonProtocolDecoder.java b/src/org/traccar/protocol/WialonProtocolDecoder.java index bf6857ee9..1de2f9dbf 100644 --- a/src/org/traccar/protocol/WialonProtocolDecoder.java +++ b/src/org/traccar/protocol/WialonProtocolDecoder.java @@ -20,7 +20,6 @@ import org.traccar.BaseProtocolDecoder; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; -import org.traccar.model.Event; import org.traccar.model.Position; import java.net.SocketAddress; @@ -92,21 +91,21 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder { if (parser.hasNext()) { int satellites = parser.nextInt(); position.setValid(satellites >= 3); - position.set(Event.KEY_SATELLITES, satellites); + position.set(Position.KEY_SATELLITES, satellites); } - position.set(Event.KEY_HDOP, parser.next()); - position.set(Event.KEY_INPUT, parser.next()); - position.set(Event.KEY_OUTPUT, parser.next()); + position.set(Position.KEY_HDOP, parser.next()); + position.set(Position.KEY_INPUT, parser.next()); + position.set(Position.KEY_OUTPUT, parser.next()); if (parser.hasNext()) { String[] values = parser.next().split(","); for (int i = 0; i < values.length; i++) { - position.set(Event.PREFIX_ADC + (i + 1), values[i]); + position.set(Position.PREFIX_ADC + (i + 1), values[i]); } } - position.set(Event.KEY_RFID, parser.next()); + position.set(Position.KEY_RFID, parser.next()); if (parser.hasNext()) { String[] values = parser.next().split(","); -- cgit v1.2.3