- 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/BceProtocolDecoder.java b/src/org/traccar/protocol/BceProtocolDecoder.java
index fc0a9a3f4..5502de5b2 100644
--- a/src/org/traccar/protocol/BceProtocolDecoder.java
+++ b/src/org/traccar/protocol/BceProtocolDecoder.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;
@@ -94,22 +93,22 @@ public class BceProtocolDecoder extends BaseProtocolDecoder {
                         position.setSpeed(buf.readUnsignedByte());
 
                         int gps = buf.readUnsignedByte();
-                        position.set(Event.KEY_SATELLITES, gps & 0xf);
-                        position.set(Event.KEY_HDOP, gps >> 4);
+                        position.set(Position.KEY_SATELLITES, gps & 0xf);
+                        position.set(Position.KEY_HDOP, gps >> 4);
 
                         position.setCourse(buf.readUnsignedByte());
                         position.setAltitude(buf.readUnsignedShort());
 
-                        position.set(Event.KEY_ODOMETER, buf.readUnsignedInt());
+                        position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
                     }
 
                     if (BitUtil.check(mask, 1)) {
-                        position.set(Event.KEY_INPUT, buf.readUnsignedShort());
+                        position.set(Position.KEY_INPUT, buf.readUnsignedShort());
                     }
 
                     for (int i = 1; i <= 8; i++) {
                         if (BitUtil.check(mask, i + 1)) {
-                            position.set(Event.PREFIX_ADC + i, buf.readUnsignedShort());
+                            position.set(Position.PREFIX_ADC + i, buf.readUnsignedShort());
                         }
                     }
 
@@ -127,11 +126,11 @@ public class BceProtocolDecoder extends BaseProtocolDecoder {
                     }
 
                     if (BitUtil.check(mask, 14)) {
-                        position.set(Event.KEY_MCC, buf.readUnsignedShort());
-                        position.set(Event.KEY_MNC, buf.readUnsignedByte());
-                        position.set(Event.KEY_LAC, buf.readUnsignedShort());
-                        position.set(Event.KEY_CID, buf.readUnsignedShort());
-                        position.set(Event.KEY_GSM, buf.readUnsignedByte());
+                        position.set(Position.KEY_MCC, buf.readUnsignedShort());
+                        position.set(Position.KEY_MNC, buf.readUnsignedByte());
+                        position.set(Position.KEY_LAC, buf.readUnsignedShort());
+                        position.set(Position.KEY_CID, buf.readUnsignedShort());
+                        position.set(Position.KEY_GSM, buf.readUnsignedByte());
                         buf.readUnsignedByte();
                     }