- Simplification of the hierarchy of models classes

- Removed automatically founded unnecessary imports

1 files changed, 5 insertions, 6 deletions

diff --git a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java
index 087dc8841..13e036f0a 100644
--- a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java
+++ b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java
@@ -22,7 +22,6 @@ import org.traccar.Context;
 import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Log;
-import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -71,7 +70,7 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder {
             position.setProtocol(getProtocolName());
 
             if (BitUtil.check(mask, 1)) {
-                position.set(Event.KEY_STATUS, buf.readUnsignedInt());
+                position.set(Position.KEY_STATUS, buf.readUnsignedInt());
             }
 
             String id;
@@ -145,7 +144,7 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder {
             }
 
             if (BitUtil.check(mask, 16)) {
-                position.set(Event.KEY_SATELLITES, buf.readUnsignedByte());
+                position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
             }
 
             if (BitUtil.check(mask, 17)) {
@@ -157,7 +156,7 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder {
             }
 
             if (BitUtil.check(mask, 21)) {
-                position.set(Event.KEY_ODOMETER, buf.readUnsignedInt());
+                position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
             }
 
             if (BitUtil.check(mask, 22)) {
@@ -165,7 +164,7 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder {
             }
 
             if (BitUtil.check(mask, 24)) {
-                position.set(Event.KEY_POWER, buf.readUnsignedShort() / 1000.0);
+                position.set(Position.KEY_POWER, buf.readUnsignedShort() / 1000.0);
             }
 
             if (BitUtil.check(mask, 25)) {
@@ -177,7 +176,7 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder {
             }
 
             if (BitUtil.check(mask, 28)) {
-                position.set(Event.KEY_INDEX, buf.readUnsignedShort());
+                position.set(Position.KEY_INDEX, buf.readUnsignedShort());
             }
 
             return position;