Refactor Totem protocol decoder

2 files changed, 7 insertions, 23 deletions

diff --git a/src/org/traccar/helper/DateBuilder.java b/src/org/traccar/helper/DateBuilder.java
index 094dfff16..77c6821aa 100644
--- a/src/org/traccar/helper/DateBuilder.java
+++ b/src/org/traccar/helper/DateBuilder.java
@@ -60,16 +60,6 @@ public class DateBuilder {
         return setDate(year, month, day);
     }
 
-    @Deprecated
-    public DateBuilder setDate(String year, String month, String day) {
-        return setDate(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
-    }
-
-    @Deprecated
-    public DateBuilder setDateReverse(String day, String month, String year) {
-        return setDate(year, month, day);
-    }
-
     public DateBuilder setCurrentDate() {
         Calendar now = Calendar.getInstance(calendar.getTimeZone());
         return setYear(now.get(Calendar.YEAR)).setMonth(now.get(Calendar.MONTH)).setDay(now.get(Calendar.DAY_OF_MONTH));
@@ -104,19 +94,10 @@ public class DateBuilder {
         return setHour(hour).setMinute(minute).setSecond(second);
     }
 
-    @Deprecated
-    public DateBuilder setTime(String hour, String minute, String second) {
-        return setTime(Integer.parseInt(hour), Integer.parseInt(minute), Integer.parseInt(second));
-    }
-
     public DateBuilder setTime(int hour, int minute, int second, int millis) {
         return setHour(hour).setMinute(minute).setSecond(second).setMillis(millis);
     }
 
-    public DateBuilder setDateTime(int year, int month, int day, int hour, int minute, int second) {
-        return setDate(year, month, day).setTime(hour, minute, second);
-    }
-
     public Date getDate() {
         return calendar.getTime();
     }
diff --git a/src/org/traccar/helper/PatternBuilder.java b/src/org/traccar/helper/PatternBuilder.java
index 5d9d3afa8..4ce4295dd 100644
--- a/src/org/traccar/helper/PatternBuilder.java
+++ b/src/org/traccar/helper/PatternBuilder.java
@@ -33,6 +33,8 @@ public class PatternBuilder {
     }
 
     public PatternBuilder expression(String s) {
+        s = s.replaceAll("\\|$", "\\\\|"); // special case for delimiter
+
         fragments.add(s);
         return this;
     }
@@ -63,6 +65,11 @@ public class PatternBuilder {
         return this;
     }
 
+    public PatternBuilder or() {
+        fragments.add("|");
+        return this;
+    }
+
     public PatternBuilder groupBegin() {
         return expression("(?:");
     }
@@ -75,10 +82,6 @@ public class PatternBuilder {
         return expression(")" + s);
     }
 
-    public PatternBuilder or() {
-        return expression("|");
-    }
-
     public Pattern compile() {
         return Pattern.compile(toString(), Pattern.DOTALL);
     }