X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fstring%2Ftokenizer%2FTokenizerMatch.java;h=2b9b1f82ac08b2c3cb6d90408ac784297a1d55c8;hb=9bb7c6bf73ebbcbc66f4abd0fabf2f698c42d42c;hp=439eb2a460c7df5c9097547f43d62d9fb9bffa17;hpb=cf965fda534cc562368c9f2a3f34475e2519fcdc;p=svjatoslav_commons.git

diff --git a/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java b/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
old mode 100644
new mode 100755
index 439eb2a..2b9b1f8
--- a/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
+++ b/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
@@ -1,21 +1,46 @@
 /*
- * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2013, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
+ * Svjatoslav Commons - shared library of common functionality. Author: Svjatoslav Agejenko.
+ * This project is released under Creative Commons Zero (CC0) license.
  */
-
 package eu.svjatoslav.commons.string.tokenizer;
 
+import java.util.regex.Matcher;
+
 public class TokenizerMatch {
 
-	public String token;
-	public Terminator terminator;
+    public final String token;
+
+    /**
+     * {@link Terminator} that matched current token
+     */
+    public final Terminator terminator;
+
+    public final Matcher matcher;
+
+
+    public TokenizerMatch(final String token, final Terminator terminator, Matcher matcher) {
+        this.token = token;
+        this.terminator = terminator;
+        this.matcher = matcher;
+    }
+
+    public boolean isGroup(String group){
+        if (terminator == null){
+            return group == null;
+        }
+
+        if (terminator.group == null){
+            return group == null;
+        }
+
+        return terminator.group.equals(group);
+    }
 
-	public TokenizerMatch(final String token, final Terminator terminator) {
-		this.token = token;
-		this.terminator = terminator;
-	}
+    @Override
+    public String toString() {
+        return "TokenizerMatch{" +
+                "token='" + token + '\'' +
+                ", terminator=" + terminator +
+                '}';
+    }
 }