Skip to content
This repository was archived by the owner on Nov 12, 2019. It is now read-only.

Commit d327b37

Browse files
committed
replace idiom with Guava
1 parent 62869ef commit d327b37

File tree

2 files changed

+6
-35
lines changed

2 files changed

+6
-35
lines changed

src/main/java/difflib/DiffRowGenerator.java

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import javax.annotation.Nonnull;
2424
import javax.annotation.Nullable;
2525

26+
import com.google.common.base.Joiner;
27+
2628
/**
2729
* This class for generating DiffRows for side-by-sidy view.
2830
* You can customize the way of generating. For example, show inline diffs on not, ignoring
@@ -44,6 +46,8 @@
4446
* @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
4547
*/
4648
public class DiffRowGenerator {
49+
private static final Joiner LF_JOINER = Joiner.on("\n");
50+
4751
private final boolean showInlineDiffs;
4852
private final boolean ignoreWhiteSpaces;
4953
private final boolean ignoreBlankLines;
@@ -308,11 +312,11 @@ private void addInlineDiffs(Delta<String> delta) {
308312
List<String> orig = (List<String>) delta.getOriginal().getLines();
309313
List<String> rev = (List<String>) delta.getRevised().getLines();
310314
LinkedList<String> origList = new LinkedList<String>();
311-
for (Character character : join(orig, "\n").toCharArray()) {
315+
for (Character character : LF_JOINER.join(orig).toCharArray()) {
312316
origList.add(character.toString());
313317
}
314318
LinkedList<String> revList = new LinkedList<String>();
315-
for (Character character : join(rev, "\n").toCharArray()) {
319+
for (Character character : LF_JOINER.join(rev).toCharArray()) {
316320
revList.add(character.toString());
317321
}
318322
List<Delta<String>> inlineDeltas = DiffUtils.diff(origList, revList).getDeltas();
@@ -409,23 +413,4 @@ public static String wrapInTag(String line, String tag, String cssClass) {
409413

410414
return startTag + line + endTag;
411415
}
412-
413-
/**
414-
* The helper method for joining collections
415-
* @param <T>
416-
* @param objs the collection to join
417-
* @param delimiter the delimiter to use
418-
* @return the joined string
419-
*/
420-
private static <T> String join(final Iterable<T> objs, final String delimiter) {
421-
Iterator<T> iter = objs.iterator();
422-
if (!iter.hasNext()) {
423-
return "";
424-
}
425-
StringBuffer buffer = new StringBuffer(String.valueOf(iter.next()));
426-
while (iter.hasNext()) {
427-
buffer.append(delimiter).append(String.valueOf(iter.next()));
428-
}
429-
return buffer.toString();
430-
}
431416
}

src/main/java/difflib/StringUtills.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,10 @@
1515
*/
1616
package difflib;
1717

18-
import java.util.Iterator;
1918
import java.util.LinkedList;
2019
import java.util.List;
2120

2221
public class StringUtills {
23-
24-
public static <T> String join(final Iterable<T> objs, final String delimiter) {
25-
Iterator<T> iter = objs.iterator();
26-
if (!iter.hasNext()) {
27-
return "";
28-
}
29-
StringBuffer buffer = new StringBuffer(String.valueOf(iter.next()));
30-
while (iter.hasNext()) {
31-
buffer.append(delimiter).append(String.valueOf(iter.next()));
32-
}
33-
return buffer.toString();
34-
}
35-
3622
/**
3723
* Replaces all tabs with 4 spaces.
3824
* @param str The string.

0 commit comments

Comments
 (0)