Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 7 insertions, 8 deletions

diff --git a/src/org/traccar/protocol/HaicomProtocolDecoder.java b/src/org/traccar/protocol/HaicomProtocolDecoder.java
index fd989cecb..f8509d63a 100644
--- a/src/org/traccar/protocol/HaicomProtocolDecoder.java
+++ b/src/org/traccar/protocol/HaicomProtocolDecoder.java
@@ -21,7 +21,6 @@ import org.traccar.helper.BitUtil;
 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;
@@ -71,7 +70,7 @@ public class HaicomProtocolDecoder extends BaseProtocolDecoder {
         }
         position.setDeviceId(getDeviceId());
 
-        position.set(Event.KEY_VERSION, parser.next());
+        position.set(Position.KEY_VERSION, parser.next());
 
         DateBuilder dateBuilder = new DateBuilder()
                 .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt())
@@ -99,12 +98,12 @@ public class HaicomProtocolDecoder extends BaseProtocolDecoder {
         position.setSpeed(parser.nextDouble() / 10);
         position.setCourse(parser.nextDouble() / 10);
 
-        position.set(Event.KEY_STATUS, parser.next());
-        position.set(Event.KEY_GSM, parser.next());
-        position.set(Event.KEY_GPS, parser.next());
-        position.set(Event.KEY_INPUT, parser.next());
-        position.set(Event.KEY_OUTPUT, parser.next());
-        position.set(Event.KEY_BATTERY, parser.nextDouble() / 10);
+        position.set(Position.KEY_STATUS, parser.next());
+        position.set(Position.KEY_GSM, parser.next());
+        position.set(Position.KEY_GPS, parser.next());
+        position.set(Position.KEY_INPUT, parser.next());
+        position.set(Position.KEY_OUTPUT, parser.next());
+        position.set(Position.KEY_BATTERY, parser.nextDouble() / 10);
 
         return position;
     }