From 26a0601bd1bfeea259706964d4e9c6765c594cf0 Mon Sep 17 00:00:00 2001 From: wumpz Date: Thu, 30 Mar 2017 13:04:42 +0200 Subject: [PATCH] introduced diamond operator --- src/main/java/difflib/DiffRowGenerator.java | 8 ++--- src/main/java/difflib/DiffUtils.java | 34 +++++++++---------- src/main/java/difflib/Patch.java | 6 ++-- src/main/java/difflib/StringUtills.java | 4 +-- src/main/java/difflib/myers/MyersDiff.java | 16 ++++----- src/test/java/diffutils/DiffTest.java | 12 +++---- .../diffutils/GenerateUnifiedDiffTest.java | 6 ++-- src/test/java/diffutils/examples/Example.java | 2 +- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/main/java/difflib/DiffRowGenerator.java b/src/main/java/difflib/DiffRowGenerator.java index 2f6b4d3..daa119b 100644 --- a/src/main/java/difflib/DiffRowGenerator.java +++ b/src/main/java/difflib/DiffRowGenerator.java @@ -189,7 +189,7 @@ public class DiffRowGenerator { } private List removeBlankLines(List lines) { - List result = new ArrayList(); + List result = new ArrayList<>(); for (String line: lines) { if (line.trim().length() == 0) { result.add(""); @@ -217,7 +217,7 @@ public class DiffRowGenerator { original = StringUtills.wrapText(original, this.columnWidth); revised = StringUtills.wrapText(revised, this.columnWidth); - List diffRows = new ArrayList(); + List diffRows = new ArrayList<>(); int endPos = 0; final List> deltaList = patch.getDeltas(); for (int i = 0; i < deltaList.size(); i++) { @@ -292,11 +292,11 @@ public class DiffRowGenerator { private void addInlineDiffs(Delta delta) { List orig = (List) delta.getOriginal().getLines(); List rev = (List) delta.getRevised().getLines(); - LinkedList origList = new LinkedList(); + LinkedList origList = new LinkedList<>(); for (Character character : join(orig, "\n").toCharArray()) { origList.add(character.toString()); } - LinkedList revList = new LinkedList(); + LinkedList revList = new LinkedList<>(); for (Character character : join(rev, "\n").toCharArray()) { revList.add(character.toString()); } diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/difflib/DiffUtils.java index 8b8ce87..de3d0c9 100644 --- a/src/main/java/difflib/DiffUtils.java +++ b/src/main/java/difflib/DiffUtils.java @@ -70,7 +70,7 @@ public class DiffUtils { Equalizer equalizer) { if (equalizer != null) { return DiffUtils.diff(original, revised, - new MyersDiff(equalizer)); + new MyersDiff<>(equalizer)); } return DiffUtils.diff(original, revised, new MyersDiff()); } @@ -141,8 +141,8 @@ public class DiffUtils { */ public static Patch parseUnifiedDiff(List diff) { boolean inPrelude = true; - List rawChunk = new ArrayList(); - Patch patch = new Patch(); + List rawChunk = new ArrayList<>(); + Patch patch = new Patch<>(); int old_ln = 0, new_ln = 0; String tag; @@ -159,8 +159,8 @@ public class DiffUtils { if (m.find()) { // Process the lines in the previous chunk if (!rawChunk.isEmpty()) { - List oldChunkLines = new ArrayList(); - List newChunkLines = new ArrayList(); + List oldChunkLines = new ArrayList<>(); + List newChunkLines = new ArrayList<>(); for (String[] raw_line : rawChunk) { tag = raw_line[0]; @@ -172,8 +172,8 @@ public class DiffUtils { newChunkLines.add(rest); } } - patch.addDelta(new ChangeDelta(new Chunk( - old_ln - 1, oldChunkLines), new Chunk( + patch.addDelta(new ChangeDelta<>(new Chunk<>( + old_ln - 1, oldChunkLines), new Chunk<>( new_ln - 1, newChunkLines))); rawChunk.clear(); } @@ -202,8 +202,8 @@ public class DiffUtils { // Process the lines in the last chunk if (!rawChunk.isEmpty()) { - List oldChunkLines = new ArrayList(); - List newChunkLines = new ArrayList(); + List oldChunkLines = new ArrayList<>(); + List newChunkLines = new ArrayList<>(); for (String[] raw_line : rawChunk) { tag = raw_line[0]; @@ -216,8 +216,8 @@ public class DiffUtils { } } - patch.addDelta(new ChangeDelta(new Chunk( - old_ln - 1, oldChunkLines), new Chunk(new_ln - 1, + patch.addDelta(new ChangeDelta<>(new Chunk<>( + old_ln - 1, oldChunkLines), new Chunk<>(new_ln - 1, newChunkLines))); rawChunk.clear(); } @@ -248,15 +248,15 @@ public class DiffUtils { String revised, List originalLines, Patch patch, int contextSize) { if (!patch.getDeltas().isEmpty()) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); ret.add("--- " + original); ret.add("+++ " + revised); - List> patchDeltas = new ArrayList>( + List> patchDeltas = new ArrayList<>( patch.getDeltas()); // code outside the if block also works for single-delta issues. - List> deltas = new ArrayList>(); // current + List> deltas = new ArrayList<>(); // current // list // of // Delta's to @@ -300,7 +300,7 @@ public class DiffUtils { ret.addAll(curBlock); return ret; } - return new ArrayList(); + return new ArrayList<>(); } /** @@ -318,7 +318,7 @@ public class DiffUtils { */ private static List processDeltas(List origLines, List> deltas, int contextSize) { - List buffer = new ArrayList(); + List buffer = new ArrayList<>(); int origTotal = 0; // counter for total lines output from Original int revTotal = 0; // counter for total lines output from Original int line; @@ -410,7 +410,7 @@ public class DiffUtils { * @author Bill James (tankerbay@gmail.com) */ private static List getDeltaText(Delta delta) { - List buffer = new ArrayList(); + List buffer = new ArrayList<>(); for (String line : delta.getOriginal().getLines()) { buffer.add("-" + line); } diff --git a/src/main/java/difflib/Patch.java b/src/main/java/difflib/Patch.java index b93a5f1..8fb655c 100644 --- a/src/main/java/difflib/Patch.java +++ b/src/main/java/difflib/Patch.java @@ -27,7 +27,7 @@ import java.util.ListIterator; * @param T The type of the compared elements in the 'lines'. */ public class Patch { - private List> deltas = new LinkedList>(); + private List> deltas = new LinkedList<>(); /** * Apply this patch to the given target @@ -35,7 +35,7 @@ public class Patch { * @throws PatchFailedException if can't apply patch */ public List applyTo(List target) throws PatchFailedException { - List result = new LinkedList(target); + List result = new LinkedList<>(target); ListIterator> it = getDeltas().listIterator(deltas.size()); while (it.hasPrevious()) { Delta delta = (Delta) it.previous(); @@ -50,7 +50,7 @@ public class Patch { * @return the restored text */ public List restore(List target) { - List result = new LinkedList(target); + List result = new LinkedList<>(target); ListIterator> it = getDeltas().listIterator(deltas.size()); while (it.hasPrevious()) { Delta delta = (Delta) it.previous(); diff --git a/src/main/java/difflib/StringUtills.java b/src/main/java/difflib/StringUtills.java index 6917036..d3d3753 100644 --- a/src/main/java/difflib/StringUtills.java +++ b/src/main/java/difflib/StringUtills.java @@ -56,7 +56,7 @@ public class StringUtills { } public static List normalize(List list) { - List result = new LinkedList(); + List result = new LinkedList<>(); for (String line : list) { result.add(normalize(line)); } @@ -64,7 +64,7 @@ public class StringUtills { } public static List wrapText(List list, int columnWidth) { - List result = new LinkedList(); + List result = new LinkedList<>(); for (String line : list) { result.add(wrapText(line, columnWidth)); } diff --git a/src/main/java/difflib/myers/MyersDiff.java b/src/main/java/difflib/myers/MyersDiff.java index 3ef17b5..b0794fb 100644 --- a/src/main/java/difflib/myers/MyersDiff.java +++ b/src/main/java/difflib/myers/MyersDiff.java @@ -132,7 +132,7 @@ public class MyersDiff implements DiffAlgorithm { } catch (DifferentiationFailedException e) { e.printStackTrace(); } - return new Patch(); + return new Patch<>(); } /** @@ -229,7 +229,7 @@ public class MyersDiff implements DiffAlgorithm { if (rev == null) throw new IllegalArgumentException("revised sequence is null"); - Patch patch = new Patch(); + Patch patch = new Patch<>(); if (path.isSnake()) path = path.prev; while (path != null && path.prev != null && path.prev.j >= 0) { @@ -242,15 +242,15 @@ public class MyersDiff implements DiffAlgorithm { int ianchor = path.i; int janchor = path.j; - Chunk original = new Chunk(ianchor, copyOfRange(orig, ianchor, i)); - Chunk revised = new Chunk(janchor, copyOfRange(rev, janchor, j)); + Chunk original = new Chunk<>(ianchor, copyOfRange(orig, ianchor, i)); + Chunk revised = new Chunk<>(janchor, copyOfRange(rev, janchor, j)); Delta delta = null; if (original.size() == 0 && revised.size() != 0) { - delta = new InsertDelta(original, revised); + delta = new InsertDelta<>(original, revised); } else if (original.size() > 0 && revised.size() == 0) { - delta = new DeleteDelta(original, revised); + delta = new DeleteDelta<>(original, revised); } else { - delta = new ChangeDelta(original, revised); + delta = new ChangeDelta<>(original, revised); } patch.addDelta(delta); @@ -269,7 +269,7 @@ public class MyersDiff implements DiffAlgorithm { */ private List copyOfRange( final List original, final int fromIndex, final int to ) { - return new ArrayList( original.subList( fromIndex, to ) ); + return new ArrayList<>( original.subList( fromIndex, to ) ); } /** diff --git a/src/test/java/diffutils/DiffTest.java b/src/test/java/diffutils/DiffTest.java index 28f6f9b..3962409 100644 --- a/src/test/java/diffutils/DiffTest.java +++ b/src/test/java/diffutils/DiffTest.java @@ -18,8 +18,8 @@ public class DiffTest { assertEquals(1, patch.getDeltas().size()); final Delta delta = patch.getDeltas().get(0); assertEquals(InsertDelta.class, delta.getClass()); - assertEquals(new Chunk(1, Collections. emptyList()), delta.getOriginal()); - assertEquals(new Chunk(1, Arrays.asList("jjj", "kkk")), delta.getRevised()); + assertEquals(new Chunk<>(1, Collections. emptyList()), delta.getOriginal()); + assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getRevised()); } @Test @@ -29,8 +29,8 @@ public class DiffTest { assertEquals(1, patch.getDeltas().size()); final Delta delta = patch.getDeltas().get(0); assertEquals(DeleteDelta.class, delta.getClass()); - assertEquals(new Chunk(0, Arrays.asList("ddd", "fff")), delta.getOriginal()); - assertEquals(new Chunk(0, Collections. emptyList()), delta.getRevised()); + assertEquals(new Chunk<>(0, Arrays.asList("ddd", "fff")), delta.getOriginal()); + assertEquals(new Chunk<>(0, Collections. emptyList()), delta.getRevised()); } @Test @@ -43,8 +43,8 @@ public class DiffTest { assertEquals(1, patch.getDeltas().size()); final Delta delta = patch.getDeltas().get(0); assertEquals(ChangeDelta.class, delta.getClass()); - assertEquals(new Chunk(1, Arrays.asList("bbb")), delta.getOriginal()); - assertEquals(new Chunk(1, Arrays.asList("zzz")), delta.getRevised()); + assertEquals(new Chunk<>(1, Arrays.asList("bbb")), delta.getOriginal()); + assertEquals(new Chunk<>(1, Arrays.asList("zzz")), delta.getRevised()); } @Test diff --git a/src/test/java/diffutils/GenerateUnifiedDiffTest.java b/src/test/java/diffutils/GenerateUnifiedDiffTest.java index 917ad29..e5c04ea 100644 --- a/src/test/java/diffutils/GenerateUnifiedDiffTest.java +++ b/src/test/java/diffutils/GenerateUnifiedDiffTest.java @@ -18,7 +18,7 @@ public class GenerateUnifiedDiffTest { public List fileToLines(String filename) { - List lines = new LinkedList(); + List lines = new LinkedList<>(); String line = ""; BufferedReader in = null; try { @@ -99,8 +99,8 @@ public class GenerateUnifiedDiffTest { */ @Test public void testDiffWithHeaderLineInText() { - List original = new ArrayList(); - List revised = new ArrayList(); + List original = new ArrayList<>(); + List revised = new ArrayList<>(); original.add("test line1"); original.add("test line2"); diff --git a/src/test/java/diffutils/examples/Example.java b/src/test/java/diffutils/examples/Example.java index 28526cb..0fbb19a 100644 --- a/src/test/java/diffutils/examples/Example.java +++ b/src/test/java/diffutils/examples/Example.java @@ -22,7 +22,7 @@ public abstract class Example { * @return A list of lines. */ public static List fileToLines(String filename) { - List lines = new LinkedList(); + List lines = new LinkedList<>(); String line = ""; BufferedReader in = null; try {