From 1a86616ca2032fa0c3fee7446a6dc545f4f77451 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 5 Nov 2015 14:59:40 +1300
Subject: Partially refactor AutoFon 45 decoder

---
 src/org/traccar/protocol/AutoFonProtocolDecoder.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/org/traccar/protocol/AutoFonProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/AutoFonProtocolDecoder.java b/src/org/traccar/protocol/AutoFonProtocolDecoder.java
index 1da024e0b..c0c3aaf08 100644
--- a/src/org/traccar/protocol/AutoFonProtocolDecoder.java
+++ b/src/org/traccar/protocol/AutoFonProtocolDecoder.java
@@ -45,7 +45,6 @@ public class AutoFonProtocolDecoder extends BaseProtocolDecoder {
 
     private Position decodePosition(ChannelBuffer buf, boolean history) {
 
-        // Create new position
         Position position = new Position();
         position.setProtocol(getProtocolName());
         position.setDeviceId(getDeviceId());
@@ -61,7 +60,6 @@ public class AutoFonProtocolDecoder extends BaseProtocolDecoder {
         position.set(Event.KEY_BATTERY, buf.readUnsignedByte());
         buf.skipBytes(6); // time
 
-        // Timers
         if (!history) {
             for (int i = 0; i < 2; i++) {
                 buf.skipBytes(5); // time
@@ -77,12 +75,10 @@ public class AutoFonProtocolDecoder extends BaseProtocolDecoder {
         buf.readUnsignedShort(); // lac
         buf.readUnsignedShort(); // cid
 
-        // GPS status
         int valid = buf.readUnsignedByte();
         position.setValid((valid & 0xc0) != 0);
         position.set(Event.KEY_SATELLITES, valid & 0x3f);
 
-        // Date and time
         Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         time.clear();
         time.set(Calendar.DAY_OF_MONTH, buf.readUnsignedByte());
@@ -93,7 +89,6 @@ public class AutoFonProtocolDecoder extends BaseProtocolDecoder {
         time.set(Calendar.SECOND, buf.readUnsignedByte());
         position.setTime(time.getTime());
 
-        // Location
         position.setLatitude(convertCoordinate(buf.readInt()));
         position.setLongitude(convertCoordinate(buf.readInt()));
         position.setAltitude(buf.readShort());
@@ -109,8 +104,7 @@ public class AutoFonProtocolDecoder extends BaseProtocolDecoder {
 
     @Override
     protected Object decode(
-            Channel channel, SocketAddress remoteAddress, Object msg)
-            throws Exception {
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
         ChannelBuffer buf = (ChannelBuffer) msg;
 
-- 
cgit v1.2.3