refactored whole tooling packages

wumpz · wumpz · commit c29c53d9827a · 2017-04-03T14:37:46.000+02:00
diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/difflib/DiffUtils.java
@@ -21,7 +21,7 @@
 import difflib.patch.Patch;
 import difflib.patch.ChangeDelta;
 import difflib.algorithm.DiffAlgorithm;
-import difflib.algorithm.myers.Equalizer;
+import difflib.patch.Equalizer;
 import difflib.algorithm.myers.MyersDiff;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/difflib/algorithm/myers/MyersDiff.java b/src/main/java/difflib/algorithm/myers/MyersDiff.java
@@ -56,6 +56,7 @@
  */
 package difflib.algorithm.myers;
 
+import difflib.patch.Equalizer;
 import difflib.patch.InsertDelta;
 import difflib.patch.Delta;
 import difflib.patch.Chunk;
diff --git a/src/main/java/difflib/patch/Equalizer.java b/src/main/java/difflib/patch/Equalizer.java
@@ -1,7 +1,7 @@
-package difflib.algorithm.myers;
+package difflib.patch;
 
 /**
- * Specifies when two compared elements in the Myers algorithm are equal.
+ * Specifies when two compared elements are equal.
  *
  * @param T The type of the compared elements in the 'lines'.
  */
diff --git a/src/main/java/difflib/text/DiffRowGenerator.java b/src/main/java/difflib/text/DiffRowGenerator.java
@@ -23,7 +23,7 @@
 import difflib.DiffUtils;
 import difflib.patch.InsertDelta;
 import difflib.patch.Patch;
-import difflib.algorithm.myers.Equalizer;
+import difflib.patch.Equalizer;
 import java.util.*;
 
 /**
@@ -288,11 +288,11 @@ private void addInlineDiffs(Delta<String> delta) {
         List<String> orig = (List<String>) delta.getOriginal().getLines();
         List<String> rev = (List<String>) delta.getRevised().getLines();
         LinkedList<String> origList = new LinkedList<>();
-        for (Character character : join(orig, "\n").toCharArray()) {
+        for (Character character : String.join("\n", orig).toCharArray()) {
             origList.add(character.toString());
         }
         LinkedList<String> revList = new LinkedList<>();
-        for (Character character : join(rev, "\n").toCharArray()) {
+        for (Character character : String.join("\n", rev).toCharArray()) {
             revList.add(character.toString());
         }
         List<Delta<String>> inlineDeltas = DiffUtils.diff(origList, revList).getDeltas();
@@ -392,24 +392,4 @@ public static String wrapInTag(String line, String tag, String cssClass) {
 
         return startTag + line + endTag;
     }
-
-    /**
-     * The helper method for joining collections
-     *
-     * @param <T>
-     * @param objs the collection to join
-     * @param delimiter the delimiter to use
-     * @return the joined string
-     */
-    private static <T> String join(final Iterable<T> objs, final String delimiter) {
-        Iterator<T> iter = objs.iterator();
-        if (!iter.hasNext()) {
-            return "";
-        }
-        StringBuilder buffer = new StringBuilder(String.valueOf(iter.next()));
-        while (iter.hasNext()) {
-            buffer.append(delimiter).append(String.valueOf(iter.next()));
-        }
-        return buffer.toString();
-    }
 }
diff --git a/src/main/java/difflib/text/StringUtils.java b/src/main/java/difflib/text/StringUtils.java
@@ -18,7 +18,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-public final class StringUtils {
+final class StringUtils {
 
     /**
      * Replaces all opening an closing tags with <code>&lt;</code> or <code>&gt;</code>.

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-package difflib.algorithm.myers;`
	`1`	`+package difflib.patch;`
`2`	`2`
`3`	`3`	`/**`
`4`		`- * Specifies when two compared elements in the Myers algorithm are equal.`
	`4`	`+ * Specifies when two compared elements are equal.`
`5`	`5`	`*`
`6`	`6`	`* @param T The type of the compared elements in the 'lines'.`
`7`	`7`	`*/`