X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fstring%2FString2.java;h=705df579627140832f6197eb198592215a44d65b;hb=443c6a564efa9f5868fd81c0db23a480cbe3cab4;hp=504c41d876a2ff24c52e18e17a27d4a63a2195ce;hpb=1195d9ce07d2e4f2d4c2a7d67dc0bd657556e2c7;p=svjatoslav_commons.git

diff --git a/src/main/java/eu/svjatoslav/commons/string/String2.java b/src/main/java/eu/svjatoslav/commons/string/String2.java
index 504c41d..705df57 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-2017, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright ©2012-2018, 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
@@ -14,15 +14,16 @@ import java.util.List;
 
 public class String2 {
 
-    private final List<Character> chars;
+    private final List<Character> chars = new ArrayList<>();
 
-    public String2(final String value) {
-        chars = new ArrayList<>(value.length());
-        for (final Character c : value.toCharArray())
-            chars.add(c);
+    public String2(String value) {
+        addSuffix(value);
     }
 
     public String2 addPrefix(final String prefix) {
+        if (prefix == null)
+            return this;
+
         int i = 0;
         for (final char c : prefix.toCharArray())
             chars.add(i++, c);
@@ -31,12 +32,24 @@ public class String2 {
     }
 
     public String2 addSuffix(final String suffix) {
+        if (suffix == null)
+            return this;
+
         for (final char c : suffix.toCharArray())
             chars.add(c);
 
         return this;
     }
 
+    public String2 addSuffix(String separator, final String suffix) {
+        if (!isEmpty())
+            addSuffix(separator);
+
+        addSuffix(suffix);
+
+        return this;
+    }
+
     /**
      * Cut given amount of characters from the left of the string.
      *
@@ -55,14 +68,17 @@ public class String2 {
         return this;
     }
 
-    public String2 trimPrefixIfExists(String prefix){
+    public String2 trimPrefixIfExists(String prefix) {
+        if (prefix == null)
+            return this;
+
         if (hasPrefix(prefix))
             trimPrefix(prefix.length());
 
         return this;
     }
 
-    public String2 trimSuffixIfExists(String suffix){
+    public String2 trimSuffixIfExists(String suffix) {
         if (hasSuffix(suffix))
             trimSuffix(suffix.length());
 
@@ -71,13 +87,13 @@ public class String2 {
 
     public String2 trimSuffix(int charsToTrim) {
 
-        if (charsToTrim > chars.size()){
+        if (charsToTrim > chars.size()) {
             chars.clear();
             return this;
         }
 
-        for (int i = 0; i<charsToTrim; i++)
-            chars.remove(chars.size()-1);
+        for (int i = 0; i < charsToTrim; i++)
+            chars.remove(chars.size() - 1);
 
         return this;
     }
@@ -86,11 +102,11 @@ public class String2 {
         return contains(suffix, getLength() - suffix.length());
     }
 
-    public boolean hasPrefix(String prefix){
+    public boolean hasPrefix(String prefix) {
         return contains(prefix, 0);
     }
 
-    public boolean contains(String fragment, int index){
+    public boolean contains(String fragment, int index) {
         if (index + fragment.length() > chars.size())
             return false;