X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fstring%2FString2.java;h=9fb7baff57d500652099213c17d13d6f72d1ed9b;hp=45c6cd0e8198f4ba937991e64a806e9e6f9d94ae;hb=b8bd1e820265fc15c39c1ee8c06289ea8b8e2c1c;hpb=846af2def5b489670668b978e4ea703c8dfb22b6

diff --git a/src/main/java/eu/svjatoslav/commons/string/String2.java b/src/main/java/eu/svjatoslav/commons/string/String2.java
index 45c6cd0..9fb7baf 100755
--- a/src/main/java/eu/svjatoslav/commons/string/String2.java
+++ b/src/main/java/eu/svjatoslav/commons/string/String2.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
@@ -9,86 +9,147 @@
 
 package eu.svjatoslav.commons.string;
 
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
 
 public class String2 {
 
-	private final Vector<Character> chars = new Vector<Character>();
+    private final List<Character> chars = new ArrayList<>();
 
-	public String2(final String value) {
-		for (final Character c : value.toCharArray())
-			chars.add(c);
-	}
+    public String2(String value) {
+        addSuffix(value);
+    }
 
-	public String2 addPrefix(final String prefix) {
-		int j = 0;
-		for (final char c : prefix.toCharArray())
-			chars.insertElementAt(c, j++);
+    public String2 addPrefix(final String prefix) {
+        if (prefix == null)
+            return this;
 
-		return this;
-	}
+        int i = 0;
+        for (final char c : prefix.toCharArray())
+            chars.add(i++, c);
 
-	public String2 addSuffix(final String suffix) {
-		for (final char c : suffix.toCharArray())
-			chars.add(c);
+        return this;
+    }
 
-		return this;
-	}
+    public String2 addSuffix(final String suffix) {
+        if (suffix == null)
+            return this;
 
-	/**
-	 * Cut given amount of characters from the left of the string.
-	 *
-	 * @param cutAmount
-	 *            of characters to cut
-	 * @return cutted part.
-	 */
-	public String cutLeft(final int cutAmount) {
+        for (final char c : suffix.toCharArray())
+            chars.add(c);
 
-		int actualCutAmount = cutAmount;
+        return this;
+    }
 
-		if (actualCutAmount > getLength())
-			actualCutAmount = getLength();
+    public String2 addSuffix(String separator, final String suffix) {
+        if (!isEmpty())
+            addSuffix(separator);
 
-		final String result = getSubString(0, actualCutAmount);
+        addSuffix(suffix);
 
-		chars.subList(0, actualCutAmount).clear();
+        return this;
+    }
 
-		return result;
-	}
+    /**
+     * Cut given amount of characters from the left of the string.
+     *
+     * @param cutAmount of characters to cut
+     * @return part that was cut.
+     */
+    public String2 trimPrefix(final int cutAmount) {
 
-	public String2 enforceLength(final int targetLength) {
-		if (getLength() > targetLength)
-			chars.subList(targetLength, getLength()).clear();
-		else if (getLength() < targetLength) {
-			final int charactersToAdd = targetLength - getLength();
-			for (int i = 0; i < charactersToAdd; i++)
-				chars.add(' ');
-		}
+        int actualCutAmount = cutAmount;
 
-		return this;
-	}
+        if (actualCutAmount > getLength())
+            actualCutAmount = getLength();
 
-	public int getLength() {
-		return chars.size();
-	}
+        chars.subList(0, actualCutAmount).clear();
 
-	public String getSubString(final int startInclusive, final int endExclusive) {
-		final char[] charArray = new char[endExclusive - startInclusive];
+        return this;
+    }
 
-		int j = 0;
-		for (int i = startInclusive; i < endExclusive; i++) {
-			charArray[j] = chars.get(i);
-			j++;
-		}
-		return new String(charArray);
-	}
+    public String2 trimPrefixIfExists(String prefix) {
+        if (prefix == null)
+            return this;
 
-	public boolean isEmpty() {
-		return chars.size() == 0;
-	}
+        if (hasPrefix(prefix))
+            trimPrefix(prefix.length());
 
-	@Override
-	public String toString() {
-		return getSubString(0, chars.size());
-	}
+        return this;
+    }
+
+    public String2 trimSuffixIfExists(String suffix) {
+        if (hasSuffix(suffix))
+            trimSuffix(suffix.length());
+
+        return this;
+    }
+
+    public String2 trimSuffix(int charsToTrim) {
+
+        if (charsToTrim > chars.size()) {
+            chars.clear();
+            return this;
+        }
+
+        for (int i = 0; i < charsToTrim; i++)
+            chars.remove(chars.size() - 1);
+
+        return this;
+    }
+
+    public boolean hasSuffix(String suffix) {
+        return contains(suffix, getLength() - suffix.length());
+    }
+
+    public boolean hasPrefix(String prefix) {
+        return contains(prefix, 0);
+    }
+
+    public boolean contains(String fragment, int index) {
+        if (index + fragment.length() > chars.size())
+            return false;
+
+        for (int i = 0; i < fragment.length(); i++)
+            if (chars.get(index + i) != fragment.charAt(i))
+                return false;
+
+        return true;
+    }
+
+    public String2 enforceLength(final int targetLength) {
+        if (getLength() > targetLength)
+            chars.subList(targetLength, getLength()).clear();
+        else if (getLength() < targetLength) {
+            final int charactersToAdd = targetLength - getLength();
+            for (int i = 0; i < charactersToAdd; i++)
+                chars.add(' ');
+        }
+
+        return this;
+    }
+
+    public int getLength() {
+        return chars.size();
+    }
+
+    public String getSubString(final int startInclusive, final int endExclusive) {
+        final char[] charArray = new char[endExclusive - startInclusive];
+
+        int j = 0;
+        for (int i = startInclusive; i < endExclusive; i++) {
+            charArray[j] = chars.get(i);
+            j++;
+        }
+        return new String(charArray);
+    }
+
+    public boolean isEmpty() {
+        return chars.size() == 0;
+    }
+
+    @Override
+    public String toString() {
+        return getSubString(0, chars.size());
+    }
 }