From 81a7fba08c37fd8032c747ada5d9a77340298647 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 9 Oct 2015 11:43:50 +1300
Subject: Fix some FindBugs and style issues

---
 src/org/traccar/helper/PatternBuilder.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/org/traccar/helper/PatternBuilder.java')

diff --git a/src/org/traccar/helper/PatternBuilder.java b/src/org/traccar/helper/PatternBuilder.java
index c52d3bf63..e8f5c605a 100644
--- a/src/org/traccar/helper/PatternBuilder.java
+++ b/src/org/traccar/helper/PatternBuilder.java
@@ -21,8 +21,6 @@ public class PatternBuilder {
 
     private final StringBuilder pattern = new StringBuilder();
 
-    private final boolean collapse = true;
-
     public PatternBuilder xpr(String s) {
         pattern.append(s);
         return this;
@@ -38,10 +36,9 @@ public class PatternBuilder {
     }
 
     public PatternBuilder num(String s) {
-        if (collapse) {
-            s = s.replace("dddd", "d{4}").replace("ddd", "d{3}").replace("dd", "d{2}");
-            s = s.replace("xxxx", "x{4}").replace("xxx", "x{3}").replace("xx", "x{2}");
-        }
+        s = s.replace("dddd", "d{4}").replace("ddd", "d{3}").replace("dd", "d{2}");
+        s = s.replace("xxxx", "x{4}").replace("xxx", "x{3}").replace("xx", "x{2}");
+
         pattern.append(s.replace("d", "\\d").replace("x", "\\p{XDigit}").replaceAll("([\\.\\|])", "\\\\$1"));
         return this;
     }
-- 
cgit v1.2.3