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=5dc5a89510ed63b9044b41a0441c828cc07afc09;hpb=b8bd1e820265fc15c39c1ee8c06289ea8b8e2c1c;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
index 5dc5a89..2b9b1f8 100755
--- a/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
+++ b/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
@@ -1,31 +1,45 @@
 /*
- * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2017, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public License
- * or later 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 final String token;
-    public final String reminder;
+
+    /**
+     * {@link Terminator} that matched current token
+     */
     public final Terminator terminator;
 
-    public TokenizerMatch(final String token, final String reminder, final Terminator terminator) {
+    public final Matcher matcher;
+
+
+    public TokenizerMatch(final String token, final Terminator terminator, Matcher matcher) {
         this.token = token;
-        this.reminder = reminder;
         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);
     }
 
     @Override
     public String toString() {
         return "TokenizerMatch{" +
                 "token='" + token + '\'' +
-                ", reminder='" + reminder + '\'' +
                 ", terminator=" + terminator +
                 '}';
     }