- Simplification of the hierarchy of models classes

- Removed automatically founded unnecessary imports

1 files changed, 10 insertions, 11 deletions

diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
index 5c247c08a..6529ff124 100644
--- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
@@ -24,7 +24,6 @@ import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
 import org.traccar.helper.UnitsConverter;
-import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -88,8 +87,8 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
 
         if (version == 1) {
 
-            position.set(Event.KEY_SATELLITES, buf.readUnsignedByte());
-            position.set(Event.KEY_POWER, buf.readUnsignedByte());
+            position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+            position.set(Position.KEY_POWER, buf.readUnsignedByte());
 
             buf.readByte(); // other flags and sensors
 
@@ -98,21 +97,21 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
             int cid = buf.readUnsignedShort();
             int lac = buf.readUnsignedShort();
             if (cid != 0 && lac != 0) {
-                position.set(Event.KEY_CID, cid);
-                position.set(Event.KEY_LAC, lac);
+                position.set(Position.KEY_CID, cid);
+                position.set(Position.KEY_LAC, lac);
             }
 
-            position.set(Event.KEY_GSM, buf.readUnsignedByte());
+            position.set(Position.KEY_GSM, buf.readUnsignedByte());
 
         } else if (version == 2) {
 
             int fuel = buf.readUnsignedByte() << 8;
 
-            position.set(Event.KEY_STATUS, buf.readUnsignedInt());
-            position.set(Event.KEY_ODOMETER, buf.readUnsignedInt());
+            position.set(Position.KEY_STATUS, buf.readUnsignedInt());
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
 
             fuel += buf.readUnsignedByte();
-            position.set(Event.KEY_FUEL, fuel);
+            position.set(Position.KEY_FUEL, fuel);
 
         }
 
@@ -150,7 +149,7 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
         Position position = new Position();
         position.setProtocol(getProtocolName());
 
-        position.set(Event.KEY_ALARM, true);
+        position.set(Position.KEY_ALARM, true);
 
         if (!identify(parser.next(), channel, remoteAddress)) {
             return null;
@@ -169,7 +168,7 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
         position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
         position.setCourse(parser.nextDouble());
 
-        position.set(Event.KEY_POWER, parser.nextDouble());
+        position.set(Position.KEY_POWER, parser.nextDouble());
 
         return position;
     }