X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fstring%2Ftokenizer%2FTokenizerMatch.java;h=80bd89b826e7370f6c8632abe365ff7bca08cad9;hb=2e7d732cd81135a3db301e48592e62218fb56af3;hp=2b9b1f82ac08b2c3cb6d90408ac784297a1d55c8;hpb=9bb7c6bf73ebbcbc66f4abd0fabf2f698c42d42c;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 2b9b1f8..80bd89b 100755
--- a/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
+++ b/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
@@ -17,11 +17,13 @@ public class TokenizerMatch {
 
     public final Matcher matcher;
 
+    private Tokenizer tokenizer;
 
-    public TokenizerMatch(final String token, final Terminator terminator, Matcher matcher) {
+    public TokenizerMatch(final String token, final Terminator terminator, Matcher matcher, Tokenizer tokenizer) {
         this.token = token;
         this.terminator = terminator;
         this.matcher = matcher;
+        this.tokenizer = tokenizer;
     }
 
     public boolean isGroup(String group){
@@ -36,11 +38,36 @@ public class TokenizerMatch {
         return terminator.group.equals(group);
     }
 
+    public String[] getRegExpGroups(){
+        if (matcher == null) return new String[]{};
+
+        String[] result = new String[matcher.groupCount()];
+
+        for (int i = 0; i< result.length; i++){
+            result[i] = matcher.group(i+1);
+        }
+
+        return result;
+    }
+
     @Override
     public String toString() {
-        return "TokenizerMatch{" +
-                "token='" + token + '\'' +
-                ", terminator=" + terminator +
-                '}';
+        StringBuilder result = new StringBuilder();
+        result.append("TokenizerMatch\n" +
+                "  token='" + token + "'\n" +
+                "  terminator=" + terminator + "\n" +
+                "  groups:\n");
+
+        int i = 0;
+        for (String s : getRegExpGroups()) {
+            result.append("    " + i + ": " + s + "\n");
+            i++;
+        }
+
+        return result.toString();
+    }
+
+    public Tokenizer getTokenizer() {
+        return tokenizer;
     }
 }