From 5538a83ac7eda6ad5775e582688dd0199e6c538c Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 24 Oct 2015 22:57:38 +1300 Subject: Refactor pattern builder class --- .../traccar/protocol/TopflytechProtocolDecoder.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/org/traccar/protocol/TopflytechProtocolDecoder.java') diff --git a/src/org/traccar/protocol/TopflytechProtocolDecoder.java b/src/org/traccar/protocol/TopflytechProtocolDecoder.java index 5fa4b3456..768de3463 100644 --- a/src/org/traccar/protocol/TopflytechProtocolDecoder.java +++ b/src/org/traccar/protocol/TopflytechProtocolDecoder.java @@ -33,16 +33,16 @@ public class TopflytechProtocolDecoder extends BaseProtocolDecoder { } private static final Pattern PATTERN = new PatternBuilder() - .txt("(") - .num("(d+)") // imei + .text("(") + .number("(d+)") // imei .any() - .num("(dd)(dd)(dd)") // date (yymmdd) - .num("(dd)(dd)(dd)") // time - .xpr("([AV])") - .num("(dd)(dd.dddd)([NS])") // latitude - .num("(ddd)(dd.dddd)([EW])") // longitude - .num("(ddd.d)") // speed - .num("(d+.d+)") // course + .number("(dd)(dd)(dd)") // date (yymmdd) + .number("(dd)(dd)(dd)") // time + .expression("([AV])") + .number("(dd)(dd.dddd)([NS])") // latitude + .number("(ddd)(dd.dddd)([EW])") // longitude + .number("(ddd.d)") // speed + .number("(d+.d+)") // course .compile(); @Override -- cgit v1.2.3