|
23 | 23 | import javax.annotation.Nonnull; |
24 | 24 | import javax.annotation.Nullable; |
25 | 25 |
|
| 26 | +import com.google.common.base.Joiner; |
| 27 | + |
26 | 28 | /** |
27 | 29 | * This class for generating DiffRows for side-by-sidy view. |
28 | 30 | * You can customize the way of generating. For example, show inline diffs on not, ignoring |
|
44 | 46 | * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a> |
45 | 47 | */ |
46 | 48 | public class DiffRowGenerator { |
| 49 | + private static final Joiner LF_JOINER = Joiner.on("\n"); |
| 50 | + |
47 | 51 | private final boolean showInlineDiffs; |
48 | 52 | private final boolean ignoreWhiteSpaces; |
49 | 53 | private final boolean ignoreBlankLines; |
@@ -308,11 +312,11 @@ private void addInlineDiffs(Delta<String> delta) { |
308 | 312 | List<String> orig = (List<String>) delta.getOriginal().getLines(); |
309 | 313 | List<String> rev = (List<String>) delta.getRevised().getLines(); |
310 | 314 | LinkedList<String> origList = new LinkedList<String>(); |
311 | | - for (Character character : join(orig, "\n").toCharArray()) { |
| 315 | + for (Character character : LF_JOINER.join(orig).toCharArray()) { |
312 | 316 | origList.add(character.toString()); |
313 | 317 | } |
314 | 318 | LinkedList<String> revList = new LinkedList<String>(); |
315 | | - for (Character character : join(rev, "\n").toCharArray()) { |
| 319 | + for (Character character : LF_JOINER.join(rev).toCharArray()) { |
316 | 320 | revList.add(character.toString()); |
317 | 321 | } |
318 | 322 | List<Delta<String>> inlineDeltas = DiffUtils.diff(origList, revList).getDeltas(); |
@@ -409,23 +413,4 @@ public static String wrapInTag(String line, String tag, String cssClass) { |
409 | 413 |
|
410 | 414 | return startTag + line + endTag; |
411 | 415 | } |
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 | | - } |
431 | 416 | } |
0 commit comments