Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

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;
     }