From 27b76e26e7f438976e6702c9f3c71be93f68fa52 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 3 Nov 2013 11:56:19 +1300
Subject: Merge AVL08 and Totem protocols

---
 src/org/traccar/protocol/TotemProtocolDecoder.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index 5b9aeff84..1a0f22d80 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -33,7 +33,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
         super(serverManager);
     }
 
-    static private Pattern patternFirst = Pattern.compile(
+    private static final Pattern patternFirst = Pattern.compile(
             "\\$\\$" +                          // Header
             "\\p{XDigit}{2}" +                  // Length
             "(\\d+)\\|" +                       // IMEI
@@ -62,9 +62,10 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             "(\\d+)\\|" +                       // Temperature
             "(\\d+.\\d+)\\|" +                  // Milage
             "\\d+\\|" +                         // Serial Number
+            ".*\\|?" +
             "\\p{XDigit}{4}");                  // Checksum
             
-    static private Pattern patternSecond = Pattern.compile(
+    private static final Pattern patternSecond = Pattern.compile(
             "\\$\\$" +                          // Header
             "\\p{XDigit}{2}" +                  // Length
             "(\\d+)\\|" +                       // IMEI
@@ -90,7 +91,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             "\\d+\\|" +                         // Serial Number
             "\\p{XDigit}{4}");                  // Checksum
 
-    static private Pattern patternThird = Pattern.compile(
+    private static final Pattern patternThird = Pattern.compile(
             "\\$\\$" +                          // Header
             "\\p{XDigit}{2}" +                  // Length
             "(\\d+)\\|" +                       // IMEI
@@ -188,7 +189,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
 
             // Validity
-            position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false);
+            position.setValid(parser.group(index++).compareTo("A") == 0);
 
             // Latitude
             Double latitude = Double.valueOf(parser.group(index++));
-- 
cgit v1.2.3