diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-09 11:43:50 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-09 11:43:50 +1300 |
| commit | 81a7fba08c37fd8032c747ada5d9a77340298647 (patch) | |
| tree | b7b0534868dfc130d1b8779ff0b8c7bf8c149dc5 /src/org/traccar/helper/PatternBuilder.java | |
| parent | 8e555ab17b231d93ab51713d6cb25510c0f92476 (diff) | |
| download | trackermap-server-81a7fba08c37fd8032c747ada5d9a77340298647.tar.gz trackermap-server-81a7fba08c37fd8032c747ada5d9a77340298647.tar.bz2 trackermap-server-81a7fba08c37fd8032c747ada5d9a77340298647.zip | |
Fix some FindBugs and style issues
Diffstat (limited to 'src/org/traccar/helper/PatternBuilder.java')
| -rw-r--r-- | src/org/traccar/helper/PatternBuilder.java | 9 |
1 files changed, 3 insertions, 6 deletions
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; } |