Reimplemented getNextToken

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

diff --git a/src/main/java/eu/svjatoslav/commons/string/tokenizer/Terminator.java b/src/main/java/eu/svjatoslav/commons/string/tokenizer/Terminator.java
index bea98bb..a298538 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/string/tokenizer/Terminator.java
+++ b/src/main/java/eu/svjatoslav/commons/string/tokenizer/Terminator.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,21 +11,46 @@ package eu.svjatoslav.commons.string.tokenizer;
 
 public class Terminator {
 
-    final String startSequence;
-    final boolean ignoreTerminator;
-    String endSequence;
+    public final String startSequence;
+    public final String endSequence;
+    public final TerminationStrategy termination;
 
-    public Terminator(final String startPattern, final boolean ignoreTerminator) {
-        startSequence = startPattern;
-        this.ignoreTerminator = ignoreTerminator;
+    public Terminator(final String startSequence, TerminationStrategy termination) {
+        this.startSequence = startSequence;
+        this.endSequence = null;
+        this.termination = termination;
     }
 
-    public Terminator(final String startSequence, final String endSequence,
-                      final boolean ignoreTerminator) {
-
+    public Terminator(final String startSequence, final String endSequence, TerminationStrategy termination) {
         this.startSequence = startSequence;
         this.endSequence = endSequence;
-        this.ignoreTerminator = ignoreTerminator;
+        this.termination = termination;
     }
 
+    public boolean matches(String source, int index) {
+        // boundary check
+        if (source.length() < (index + startSequence.length()))
+            return false;
+
+        // match check
+        for (int i = 0; i < startSequence.length(); i++)
+            if (startSequence.charAt(i) != source.charAt(index + i))
+                return false;
+
+        return true;
+    }
+
+    public enum TerminationStrategy {
+        PRESERVE,
+        DROP
+    }
+
+    @Override
+    public String toString() {
+        return "Terminator{" +
+                "startSequence='" + startSequence + '\'' +
+                ", endSequence='" + endSequence + '\'' +
+                ", termination=" + termination +
+                '}';
+    }
 }