Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 13 insertions, 14 deletions

diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index c1f0af42f..f8256a5ab 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.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;
@@ -146,8 +145,8 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
 
             getLastLocation(position, null);
 
-            position.set(Event.KEY_LAC, parser.nextInt(16));
-            position.set(Event.KEY_CID, parser.nextInt(16));
+            position.set(Position.KEY_LAC, parser.nextInt(16));
+            position.set(Position.KEY_CID, parser.nextInt(16));
 
             return position;
 
@@ -167,14 +166,14 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
 
             getLastLocation(position, dateBuilder.getDate());
 
-            position.set(Event.KEY_ODOMETER, parser.nextInt());
-            position.set(Event.KEY_FUEL, parser.next());
-            position.set(Event.KEY_HOURS, parser.next());
-            position.set(Event.KEY_OBD_SPEED, parser.next());
-            position.set(Event.PREFIX_TEMP + 1, parser.next());
-            position.set(Event.KEY_THROTTLE, parser.next());
-            position.set(Event.KEY_RPM, parser.next());
-            position.set(Event.KEY_BATTERY, parser.next());
+            position.set(Position.KEY_ODOMETER, parser.nextInt());
+            position.set(Position.KEY_FUEL, parser.next());
+            position.set(Position.KEY_HOURS, parser.next());
+            position.set(Position.KEY_OBD_SPEED, parser.next());
+            position.set(Position.PREFIX_TEMP + 1, parser.next());
+            position.set(Position.KEY_THROTTLE, parser.next());
+            position.set(Position.KEY_RPM, parser.next());
+            position.set(Position.KEY_BATTERY, parser.next());
 
             return position;
 
@@ -192,7 +191,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
         position.setDeviceId(getDeviceId());
 
         String alarm = parser.next();
-        position.set(Event.KEY_ALARM, alarm);
+        position.set(Position.KEY_ALARM, alarm);
         if (channel != null && alarm.equals("help me")) {
             channel.write("**,imei:" + imei + ",E;", remoteAddress);
         }
@@ -205,7 +204,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
 
         String rfid = parser.next();
         if (alarm.equals("rfid")) {
-            position.set(Event.KEY_RFID, rfid);
+            position.set(Position.KEY_RFID, rfid);
         }
 
         String utcHours = parser.next();
@@ -234,7 +233,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
         position.setAltitude(parser.nextDouble());
 
         for (int i = 1; i <= 5; i++) {
-            position.set(Event.PREFIX_IO + i, parser.next());
+            position.set(Position.PREFIX_IO + i, parser.next());
         }
 
         return position;