diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/difflib/DiffUtils.java index 4762781..ecf51bb 100644 --- a/src/main/java/difflib/DiffUtils.java +++ b/src/main/java/difflib/DiffUtils.java @@ -21,7 +21,7 @@ import difflib.patch.Chunk; 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 index 3f62fd3..c22689a 100644 --- 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/algorithm/myers/Equalizer.java b/src/main/java/difflib/patch/Equalizer.java similarity index 80% rename from src/main/java/difflib/algorithm/myers/Equalizer.java rename to src/main/java/difflib/patch/Equalizer.java index 18e2fb6..37c7b04 100644 --- a/src/main/java/difflib/algorithm/myers/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 index 44c89bd..fd5e7c5 100644 --- a/src/main/java/difflib/text/DiffRowGenerator.java +++ b/src/main/java/difflib/text/DiffRowGenerator.java @@ -23,7 +23,7 @@ import difflib.text.DiffRow.Tag; 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 @@ public class DiffRowGenerator { List orig = (List) delta.getOriginal().getLines(); List rev = (List) delta.getRevised().getLines(); LinkedList origList = new LinkedList<>(); - for (Character character : join(orig, "\n").toCharArray()) { + for (Character character : String.join("\n", orig).toCharArray()) { origList.add(character.toString()); } LinkedList revList = new LinkedList<>(); - for (Character character : join(rev, "\n").toCharArray()) { + for (Character character : String.join("\n", rev).toCharArray()) { revList.add(character.toString()); } List> inlineDeltas = DiffUtils.diff(origList, revList).getDeltas(); @@ -392,24 +392,4 @@ public class DiffRowGenerator { return startTag + line + endTag; } - - /** - * The helper method for joining collections - * - * @param - * @param objs the collection to join - * @param delimiter the delimiter to use - * @return the joined string - */ - private static String join(final Iterable objs, final String delimiter) { - Iterator 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 index a6ec0c6..d750550 100644 --- a/src/main/java/difflib/text/StringUtils.java +++ b/src/main/java/difflib/text/StringUtils.java @@ -18,7 +18,7 @@ package difflib.text; import java.util.LinkedList; import java.util.List; -public final class StringUtils { +final class StringUtils { /** * Replaces all opening an closing tags with < or >.