From c344d4086bb2179d485c9b25af4d737e26f23221 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 7 Oct 2015 18:50:10 +1300 Subject: Rename pattern to upper case style --- src/org/traccar/protocol/TotemProtocolDecoder.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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 960cd9963..087416f18 100644 --- a/src/org/traccar/protocol/TotemProtocolDecoder.java +++ b/src/org/traccar/protocol/TotemProtocolDecoder.java @@ -32,7 +32,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { super(protocol); } - private static final Pattern pattern1 = new PatternBuilder() + private static final Pattern PATTERN1 = new PatternBuilder() .txt("$$") // header .num("xx") // length .num("(d+)|") // imei @@ -65,7 +65,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { .any() .compile(); - private static final Pattern pattern2 = Pattern.compile( + private static final Pattern PATTERN2 = Pattern.compile( "\\$\\$" + // Header "\\p{XDigit}{2}" + // Length "(\\d+)\\|" + // IMEI @@ -92,7 +92,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { "\\p{XDigit}{4}" + // Checksum "\r?\n?"); - private static final Pattern pattern3 = Pattern.compile( + private static final Pattern PATTERN3 = Pattern.compile( "\\$\\$" + // Header "\\p{XDigit}{2}" + // Length "(\\d+)\\|" + // IMEI @@ -130,13 +130,13 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { String sentence = (String) msg; // Determine format - Pattern pattern = pattern3; + Pattern pattern = PATTERN3; if (sentence.contains("$GPRMC")) { - pattern = pattern1; + pattern = PATTERN1; } else { int index = sentence.indexOf('|'); if (index != -1 && sentence.indexOf('|', index + 1) != -1) { - pattern = pattern2; + pattern = PATTERN2; } } @@ -161,13 +161,13 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { // Alarm type position.set(Event.KEY_ALARM, parser.group(index++)); - if (pattern == pattern1 || pattern == pattern2) { + if (pattern == PATTERN1 || pattern == PATTERN2) { // Time Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); time.clear(); int year = 0; - if (pattern == pattern2) { + if (pattern == PATTERN2) { time.set(Calendar.DAY_OF_MONTH, Integer.parseInt(parser.group(index++))); time.set(Calendar.MONTH, Integer.parseInt(parser.group(index++)) - 1); year = Integer.parseInt(parser.group(index++)); @@ -205,7 +205,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { } // Date - if (pattern == pattern1) { + if (pattern == PATTERN1) { time.set(Calendar.DAY_OF_MONTH, Integer.parseInt(parser.group(index++))); time.set(Calendar.MONTH, Integer.parseInt(parser.group(index++)) - 1); year = Integer.parseInt(parser.group(index++)); @@ -238,7 +238,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { // Odometer position.set(Event.KEY_ODOMETER, parser.group(index++)); - } else if (pattern == pattern3) { + } else if (pattern == PATTERN3) { // Time Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); -- cgit v1.2.3