Code cleanup and formatting. Migrated to java 1.8.

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

diff --git a/src/main/java/eu/svjatoslav/commons/string/String2.java b/src/main/java/eu/svjatoslav/commons/string/String2.java
index 45c6cd0..37ee8e9 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/string/String2.java
+++ b/src/main/java/eu/svjatoslav/commons/string/String2.java
@@ -13,82 +13,81 @@ import java.util.Vector;
 
 public class String2 {
 
-       private final Vector<Character> chars = new Vector<Character>();
-
-       public String2(final String value) {
-               for (final Character c : value.toCharArray())
-                       chars.add(c);
-       }
-
-       public String2 addPrefix(final String prefix) {
-               int j = 0;
-               for (final char c : prefix.toCharArray())
-                       chars.insertElementAt(c, j++);
-
-               return this;
-       }
-
-       public String2 addSuffix(final String suffix) {
-               for (final char c : suffix.toCharArray())
-                       chars.add(c);
-
-               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) {
-
-               int actualCutAmount = cutAmount;
-
-               if (actualCutAmount > getLength())
-                       actualCutAmount = getLength();
-
-               final String result = getSubString(0, actualCutAmount);
-
-               chars.subList(0, actualCutAmount).clear();
-
-               return result;
-       }
-
-       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());
-       }
+    private final Vector<Character> chars = new Vector<>();
+
+    public String2(final String value) {
+        for (final Character c : value.toCharArray())
+            chars.add(c);
+    }
+
+    public String2 addPrefix(final String prefix) {
+        int j = 0;
+        for (final char c : prefix.toCharArray())
+            chars.insertElementAt(c, j++);
+
+        return this;
+    }
+
+    public String2 addSuffix(final String suffix) {
+        for (final char c : suffix.toCharArray())
+            chars.add(c);
+
+        return this;
+    }
+
+    /**
+     * Cut given amount of characters from the left of the string.
+     *
+     * @param cutAmount of characters to cut
+     * @return part that was cut.
+     */
+    public String trimLeft(final int cutAmount) {
+
+        int actualCutAmount = cutAmount;
+
+        if (actualCutAmount > getLength())
+            actualCutAmount = getLength();
+
+        final String result = getSubString(0, actualCutAmount);
+
+        chars.subList(0, actualCutAmount).clear();
+
+        return result;
+    }
+
+    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());
+    }
 }