Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 9 insertions, 10 deletions

diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index 92df085a6..48ee95c13 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -24,7 +24,6 @@ import org.traccar.helper.Checksum;
 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.InetSocketAddress;
@@ -198,7 +197,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
 
         // Custom data
         if (command == MSG_ALARM) {
-            position.set(Event.KEY_ALARM, buf.readUnsignedByte());
+            position.set(Position.KEY_ALARM, buf.readUnsignedByte());
         } else if (command == MSG_POSITION_LOGGED) {
             buf.skipBytes(6);
         }
@@ -214,7 +213,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
                 if (rfid != 0) {
                     String card = String.format("%010d", rfid);
                     position.set("card" + (i + 1), card);
-                    position.set(Event.KEY_RFID, card);
+                    position.set(Position.KEY_RFID, card);
                 }
             }
         }
@@ -266,33 +265,33 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
             dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
             position.setTime(dateBuilder.getDate());
 
-            position.set(Event.KEY_HDOP, parser.next());
+            position.set(Position.KEY_HDOP, parser.next());
 
             if (parser.hasNext()) {
                 position.setAltitude(parser.nextDouble());
             }
 
-            position.set(Event.KEY_STATUS, parser.next());
+            position.set(Position.KEY_STATUS, parser.next());
 
             for (int i = 1; i <= 8; i++) {
                 if (parser.hasNext()) {
-                    position.set(Event.PREFIX_ADC + i, parser.nextInt(16));
+                    position.set(Position.PREFIX_ADC + i, parser.nextInt(16));
                 }
             }
 
             if (parser.hasNext()) {
-                position.set(Event.KEY_GSM, parser.nextInt(16));
+                position.set(Position.KEY_GSM, parser.nextInt(16));
             }
 
             if (parser.hasNext()) {
-                position.set(Event.KEY_ODOMETER, parser.nextInt(16));
+                position.set(Position.KEY_ODOMETER, parser.nextInt(16));
             }
             if (parser.hasNext()) {
-                position.set(Event.KEY_ODOMETER, parser.nextInt(16));
+                position.set(Position.KEY_ODOMETER, parser.nextInt(16));
             }
 
             if (parser.hasNext()) {
-                position.set(Event.KEY_RFID, parser.nextInt(16));
+                position.set(Position.KEY_RFID, parser.nextInt(16));
             }
 
         }