Merge pull request #1978 from Abyss777/master

Simplification of the models hierarchy

1 files changed, 8 insertions, 9 deletions

diff --git a/src/org/traccar/protocol/ProgressProtocolDecoder.java b/src/org/traccar/protocol/ProgressProtocolDecoder.java
index e45cf313c..0439c99db 100644
--- a/src/org/traccar/protocol/ProgressProtocolDecoder.java
+++ b/src/org/traccar/protocol/ProgressProtocolDecoder.java
@@ -20,7 +20,6 @@ import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.helper.BitUtil;
-import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -96,17 +95,17 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder {
                 position.setDeviceId(getDeviceId());
 
                 if (type == MSG_LOGMSG) {
-                    position.set(Event.KEY_ARCHIVE, true);
+                    position.set(Position.KEY_ARCHIVE, true);
                     int subtype = buf.readUnsignedShort();
                     if (subtype == MSG_ALARM) {
-                        position.set(Event.KEY_ALARM, true);
+                        position.set(Position.KEY_ALARM, true);
                     }
                     if (buf.readUnsignedShort() > buf.readableBytes()) {
                         lastIndex += 1;
                         break; // workaround for device bug
                     }
                     lastIndex = buf.readUnsignedInt();
-                    position.set(Event.KEY_INDEX, lastIndex);
+                    position.set(Position.KEY_INDEX, lastIndex);
                 } else {
                     newIndex = buf.readUnsignedInt();
                 }
@@ -120,17 +119,17 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder {
 
                 int satellites = buf.readUnsignedByte();
                 position.setValid(satellites >= 3);
-                position.set(Event.KEY_SATELLITES, satellites);
+                position.set(Position.KEY_SATELLITES, satellites);
 
-                position.set(Event.KEY_GSM, buf.readUnsignedByte());
-                position.set(Event.KEY_ODOMETER, buf.readUnsignedInt());
+                position.set(Position.KEY_GSM, buf.readUnsignedByte());
+                position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
 
                 long extraFlags = buf.readLong();
 
                 if (BitUtil.check(extraFlags, 0)) {
                     int count = buf.readUnsignedShort();
                     for (int i = 1; i <= count; i++) {
-                        position.set(Event.PREFIX_ADC + i, buf.readUnsignedShort());
+                        position.set(Position.PREFIX_ADC + i, buf.readUnsignedShort());
                     }
                 }
 
@@ -146,7 +145,7 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder {
                 }
 
                 if (type == MSG_ALARM) {
-                    position.set(Event.KEY_ALARM, true);
+                    position.set(Position.KEY_ALARM, true);
                     byte[] response = {(byte) 0xC9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
                     channel.write(ChannelBuffers.wrappedBuffer(response));
                 }