diff options
author | Abyss777 <abyss@fox5.ru> | 2016-05-26 09:30:43 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-05-26 09:30:43 +0500 |
commit | aa12e5c750e771016545269ffa39409b06b47eee (patch) | |
tree | d21b4414b532bfc53c9a905f3caa09f70b43b59e /src/org/traccar/protocol/Tr900ProtocolDecoder.java | |
parent | ac2405f0d57fac51fe95aa755f90fe82f26f73bc (diff) | |
download | trackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.tar.gz trackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.tar.bz2 trackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.zip |
- Simplification of the hierarchy of models classes
- Removed automatically founded unnecessary imports
Diffstat (limited to 'src/org/traccar/protocol/Tr900ProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/Tr900ProtocolDecoder.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/Tr900ProtocolDecoder.java b/src/org/traccar/protocol/Tr900ProtocolDecoder.java index 8e96df2bf..8659861d8 100644 --- a/src/org/traccar/protocol/Tr900ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tr900ProtocolDecoder.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; @@ -84,12 +83,12 @@ public class Tr900ProtocolDecoder extends BaseProtocolDecoder { position.setSpeed(parser.nextDouble()); position.setCourse(parser.nextDouble()); - position.set(Event.KEY_GSM, parser.next()); - position.set(Event.KEY_EVENT, parser.nextInt()); - position.set(Event.PREFIX_ADC + 1, parser.nextInt()); - position.set(Event.KEY_BATTERY, parser.nextInt()); - position.set(Event.KEY_INPUT, parser.next()); - position.set(Event.KEY_STATUS, parser.next()); + position.set(Position.KEY_GSM, parser.next()); + position.set(Position.KEY_EVENT, parser.nextInt()); + position.set(Position.PREFIX_ADC + 1, parser.nextInt()); + position.set(Position.KEY_BATTERY, parser.nextInt()); + position.set(Position.KEY_INPUT, parser.next()); + position.set(Position.KEY_STATUS, parser.next()); return position; } |