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 --- .../traccar/protocol/FlextrackProtocolDecoder.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/org/traccar/protocol/FlextrackProtocolDecoder.java') diff --git a/src/org/traccar/protocol/FlextrackProtocolDecoder.java b/src/org/traccar/protocol/FlextrackProtocolDecoder.java index 9bfac2537..a0f151ac2 100644 --- a/src/org/traccar/protocol/FlextrackProtocolDecoder.java +++ b/src/org/traccar/protocol/FlextrackProtocolDecoder.java @@ -21,7 +21,6 @@ import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; -import org.traccar.model.Event; import org.traccar.model.Position; import java.net.SocketAddress; @@ -116,19 +115,19 @@ public class FlextrackProtocolDecoder extends BaseProtocolDecoder { position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt())); position.setCourse(parser.nextInt()); - position.set(Event.KEY_SATELLITES, parser.nextInt()); - position.set(Event.KEY_BATTERY, parser.nextInt()); - position.set(Event.KEY_GSM, parser.nextInt()); - position.set(Event.KEY_STATUS, parser.nextInt(16)); - position.set(Event.KEY_MCC, parser.nextInt()); - position.set(Event.KEY_MNC, parser.nextInt()); + position.set(Position.KEY_SATELLITES, parser.nextInt()); + position.set(Position.KEY_BATTERY, parser.nextInt()); + position.set(Position.KEY_GSM, parser.nextInt()); + position.set(Position.KEY_STATUS, parser.nextInt(16)); + position.set(Position.KEY_MCC, parser.nextInt()); + position.set(Position.KEY_MNC, parser.nextInt()); position.setAltitude(parser.nextInt()); - position.set(Event.KEY_HDOP, parser.nextInt() * 0.1); - position.set(Event.KEY_CID, parser.nextInt(16)); - position.set(Event.KEY_LAC, parser.nextInt(16)); - position.set(Event.KEY_ODOMETER, parser.nextInt()); + position.set(Position.KEY_HDOP, parser.nextInt() * 0.1); + position.set(Position.KEY_CID, parser.nextInt(16)); + position.set(Position.KEY_LAC, parser.nextInt(16)); + position.set(Position.KEY_ODOMETER, parser.nextInt()); return position; } -- cgit v1.2.3