X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fstring%2Ftokenizer%2FTerminator.java;h=a298538fd28c7fbc6b5c0c0ea77a6ed394760c01;hp=14fcbb562c730d739e701ab977f117009106a9d0;hb=798a165906826270924f0d5d58cfa04cf6bdc113;hpb=cf965fda534cc562368c9f2a3f34475e2519fcdc

diff --git a/src/main/java/eu/svjatoslav/commons/string/tokenizer/Terminator.java b/src/main/java/eu/svjatoslav/commons/string/tokenizer/Terminator.java
old mode 100644
new mode 100755
index 14fcbb5..a298538
--- a/src/main/java/eu/svjatoslav/commons/string/tokenizer/Terminator.java
+++ b/src/main/java/eu/svjatoslav/commons/string/tokenizer/Terminator.java
@@ -1,31 +1,56 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2013, 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 2 of the GNU General Public License
- * as published by the Free Software Foundation.
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
  */
 
 package eu.svjatoslav.commons.string.tokenizer;
 
 public class Terminator {
 
-	String startSequence;
-	String endSequence;
-	boolean ignoreTerminator;
+    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.termination = termination;
+    }
 
-		this.startSequence = startSequence;
-		this.endSequence = endSequence;
-		this.ignoreTerminator = ignoreTerminator;
-	}
+    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 +
+                '}';
+    }
 }