From 83382e14d92cadaa40c62d07cdba05a6ded5af83 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 7 Oct 2015 11:46:04 +1300
Subject: Use pattern builder for Xexun

---
 src/org/traccar/helper/PatternBuilder.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(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 7d307668d..c52d3bf63 100644
--- a/src/org/traccar/helper/PatternBuilder.java
+++ b/src/org/traccar/helper/PatternBuilder.java
@@ -28,6 +28,10 @@ public class PatternBuilder {
         return this;
     }
 
+    public PatternBuilder opx(String s) {
+        return xpr("(?:").xpr(s).xpr(")?");
+    }
+
     public PatternBuilder txt(String s) {
         pattern.append(s.replaceAll("([\\\\\\.\\[\\{\\(\\*\\+\\?\\^\\$\\|])", "\\\\$1"));
         return this;
@@ -42,13 +46,17 @@ public class PatternBuilder {
         return this;
     }
 
+    public PatternBuilder opn(String s) {
+        return xpr("(?:").num(s).xpr(")?");
+    }
+
     public PatternBuilder any() {
         pattern.append(".*");
         return this;
     }
 
     public PatternBuilder not(String s) {
-        return xpr("[^").txt(s).xpr("]+");
+        return xpr("[^").txt(s).xpr("]*");
     }
 
     public PatternBuilder nxt(String s) {
-- 
cgit v1.2.3