Reimplemented getNextToken

[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / string / tokenizer / TokenizerMatch.java

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 7e8eae1..f005bc1 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
+++ b/src/main/java/eu/svjatoslav/commons/string/tokenizer/TokenizerMatch.java
@@ -1,6 +1,6 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * 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
@@ -11,11 +11,22 @@ package eu.svjatoslav.commons.string.tokenizer;
 
 public class TokenizerMatch {
 
-       public String token;
-       public Terminator terminator;
+    public final String token;
+    public final String reminder;
+    public final Terminator terminator;
 
-       public TokenizerMatch(final String token, final Terminator terminator) {
-               this.token = token;
-               this.terminator = terminator;
-       }
+    public TokenizerMatch(final String token, final String reminder, final Terminator terminator) {
+        this.token = token;
+        this.reminder = reminder;
+        this.terminator = terminator;
+    }
+
+    @Override
+    public String toString() {
+        return "TokenizerMatch{" +
+                "token='" + token + '\'' +
+                ", reminder='" + reminder + '\'' +
+                ", terminator=" + terminator +
+                '}';
+    }
 }