Skip to content

Commit 26a0601

Browse files
wumpzwumpz
committed
introduced diamond operator
1 parent cc585e2 commit 26a0601

File tree

8 files changed

+44
-44
lines changed

8 files changed

+44
-44
lines changed

‎src/main/java/difflib/DiffRowGenerator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public List<DiffRow> generateDiffRows(List<String> original, List<String> revise
189189
}
190190

191191
private List<String> removeBlankLines(List<String> lines) {
192-
List<String> result = new ArrayList<String>();
192+
List<String> result = new ArrayList<>();
193193
for (String line: lines) {
194194
if (line.trim().length() == 0) {
195195
result.add("");
@@ -217,7 +217,7 @@ public List<DiffRow> generateDiffRows(List<String> original, List<String> revise
217217
original = StringUtills.wrapText(original, this.columnWidth);
218218
revised = StringUtills.wrapText(revised, this.columnWidth);
219219

220-
List<DiffRow> diffRows = new ArrayList<DiffRow>();
220+
List<DiffRow> diffRows = new ArrayList<>();
221221
int endPos = 0;
222222
final List<Delta<String>> deltaList = patch.getDeltas();
223223
for (int i = 0; i < deltaList.size(); i++) {
@@ -292,11 +292,11 @@ public List<DiffRow> generateDiffRows(List<String> original, List<String> revise
292292
private void addInlineDiffs(Delta<String> delta) {
293293
List<String> orig = (List<String>) delta.getOriginal().getLines();
294294
List<String> rev = (List<String>) delta.getRevised().getLines();
295-
LinkedList<String> origList = new LinkedList<String>();
295+
LinkedList<String> origList = new LinkedList<>();
296296
for (Character character : join(orig, "\n").toCharArray()) {
297297
origList.add(character.toString());
298298
}
299-
LinkedList<String> revList = new LinkedList<String>();
299+
LinkedList<String> revList = new LinkedList<>();
300300
for (Character character : join(rev, "\n").toCharArray()) {
301301
revList.add(character.toString());
302302
}

‎src/main/java/difflib/DiffUtils.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised,
7070
Equalizer<T> equalizer) {
7171
if (equalizer != null) {
7272
return DiffUtils.diff(original, revised,
73-
new MyersDiff<T>(equalizer));
73+
new MyersDiff<>(equalizer));
7474
}
7575
return DiffUtils.diff(original, revised, new MyersDiff<T>());
7676
}
@@ -141,8 +141,8 @@ public static <T> List<T> unpatch(List<T> revised, Patch<T> patch) {
141141
*/
142142
public static Patch<String> parseUnifiedDiff(List<String> diff) {
143143
boolean inPrelude = true;
144-
List<String[]> rawChunk = new ArrayList<String[]>();
145-
Patch<String> patch = new Patch<String>();
144+
List<String[]> rawChunk = new ArrayList<>();
145+
Patch<String> patch = new Patch<>();
146146

147147
int old_ln = 0, new_ln = 0;
148148
String tag;
@@ -159,8 +159,8 @@ public static Patch<String> parseUnifiedDiff(List<String> diff) {
159159
if (m.find()) {
160160
// Process the lines in the previous chunk
161161
if (!rawChunk.isEmpty()) {
162-
List<String> oldChunkLines = new ArrayList<String>();
163-
List<String> newChunkLines = new ArrayList<String>();
162+
List<String> oldChunkLines = new ArrayList<>();
163+
List<String> newChunkLines = new ArrayList<>();
164164

165165
for (String[] raw_line : rawChunk) {
166166
tag = raw_line[0];
@@ -172,8 +172,8 @@ public static Patch<String> parseUnifiedDiff(List<String> diff) {
172172
newChunkLines.add(rest);
173173
}
174174
}
175-
patch.addDelta(new ChangeDelta<String>(new Chunk<String>(
176-
old_ln - 1, oldChunkLines), new Chunk<String>(
175+
patch.addDelta(new ChangeDelta<>(new Chunk<>(
176+
old_ln - 1, oldChunkLines), new Chunk<>(
177177
new_ln - 1, newChunkLines)));
178178
rawChunk.clear();
179179
}
@@ -202,8 +202,8 @@ public static Patch<String> parseUnifiedDiff(List<String> diff) {
202202

203203
// Process the lines in the last chunk
204204
if (!rawChunk.isEmpty()) {
205-
List<String> oldChunkLines = new ArrayList<String>();
206-
List<String> newChunkLines = new ArrayList<String>();
205+
List<String> oldChunkLines = new ArrayList<>();
206+
List<String> newChunkLines = new ArrayList<>();
207207

208208
for (String[] raw_line : rawChunk) {
209209
tag = raw_line[0];
@@ -216,8 +216,8 @@ public static Patch<String> parseUnifiedDiff(List<String> diff) {
216216
}
217217
}
218218

219-
patch.addDelta(new ChangeDelta<String>(new Chunk<String>(
220-
old_ln - 1, oldChunkLines), new Chunk<String>(new_ln - 1,
219+
patch.addDelta(new ChangeDelta<>(new Chunk<>(
220+
old_ln - 1, oldChunkLines), new Chunk<>(new_ln - 1,
221221
newChunkLines)));
222222
rawChunk.clear();
223223
}
@@ -248,15 +248,15 @@ public static List<String> generateUnifiedDiff(String original,
248248
String revised, List<String> originalLines, Patch<String> patch,
249249
int contextSize) {
250250
if (!patch.getDeltas().isEmpty()) {
251-
List<String> ret = new ArrayList<String>();
251+
List<String> ret = new ArrayList<>();
252252
ret.add("--- " + original);
253253
ret.add("+++ " + revised);
254254

255-
List<Delta<String>> patchDeltas = new ArrayList<Delta<String>>(
255+
List<Delta<String>> patchDeltas = new ArrayList<>(
256256
patch.getDeltas());
257257

258258
// code outside the if block also works for single-delta issues.
259-
List<Delta<String>> deltas = new ArrayList<Delta<String>>(); // current
259+
List<Delta<String>> deltas = new ArrayList<>(); // current
260260
// list
261261
// of
262262
// Delta's to
@@ -300,7 +300,7 @@ public static List<String> generateUnifiedDiff(String original,
300300
ret.addAll(curBlock);
301301
return ret;
302302
}
303-
return new ArrayList<String>();
303+
return new ArrayList<>();
304304
}
305305

306306
/**
@@ -318,7 +318,7 @@ public static List<String> generateUnifiedDiff(String original,
318318
*/
319319
private static List<String> processDeltas(List<String> origLines,
320320
List<Delta<String>> deltas, int contextSize) {
321-
List<String> buffer = new ArrayList<String>();
321+
List<String> buffer = new ArrayList<>();
322322
int origTotal = 0; // counter for total lines output from Original
323323
int revTotal = 0; // counter for total lines output from Original
324324
int line;
@@ -410,7 +410,7 @@ private static List<String> processDeltas(List<String> origLines,
410410
* @author Bill James (tankerbay@gmail.com)
411411
*/
412412
private static List<String> getDeltaText(Delta<String> delta) {
413-
List<String> buffer = new ArrayList<String>();
413+
List<String> buffer = new ArrayList<>();
414414
for (String line : delta.getOriginal().getLines()) {
415415
buffer.add("-" + line);
416416
}

‎src/main/java/difflib/Patch.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
* @param T The type of the compared elements in the 'lines'.
2828
*/
2929
public class Patch<T> {
30-
private List<Delta<T>> deltas = new LinkedList<Delta<T>>();
30+
private List<Delta<T>> deltas = new LinkedList<>();
3131

3232
/**
3333
* Apply this patch to the given target
3434
* @return the patched text
3535
* @throws PatchFailedException if can't apply patch
3636
*/
3737
public List<T> applyTo(List<T> target) throws PatchFailedException {
38-
List<T> result = new LinkedList<T>(target);
38+
List<T> result = new LinkedList<>(target);
3939
ListIterator<Delta<T>> it = getDeltas().listIterator(deltas.size());
4040
while (it.hasPrevious()) {
4141
Delta<T> delta = (Delta<T>) it.previous();
@@ -50,7 +50,7 @@ public List<T> applyTo(List<T> target) throws PatchFailedException {
5050
* @return the restored text
5151
*/
5252
public List<T> restore(List<T> target) {
53-
List<T> result = new LinkedList<T>(target);
53+
List<T> result = new LinkedList<>(target);
5454
ListIterator<Delta<T>> it = getDeltas().listIterator(deltas.size());
5555
while (it.hasPrevious()) {
5656
Delta<T> delta = (Delta<T>) it.previous();

‎src/main/java/difflib/StringUtills.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ public static String normalize(String str) {
5656
}
5757

5858
public static List<String> normalize(List<String> list) {
59-
List<String> result = new LinkedList<String>();
59+
List<String> result = new LinkedList<>();
6060
for (String line : list) {
6161
result.add(normalize(line));
6262
}
6363
return result;
6464
}
6565

6666
public static List<String> wrapText(List<String> list, int columnWidth) {
67-
List<String> result = new LinkedList<String>();
67+
List<String> result = new LinkedList<>();
6868
for (String line : list) {
6969
result.add(wrapText(line, columnWidth));
7070
}

‎src/main/java/difflib/myers/MyersDiff.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public Patch<T> diff(final List<T> original, final List<T> revised) {
132132
} catch (DifferentiationFailedException e) {
133133
e.printStackTrace();
134134
}
135-
return new Patch<T>();
135+
return new Patch<>();
136136
}
137137

138138
/**
@@ -229,7 +229,7 @@ public Patch<T> buildRevision(PathNode path, List<T> orig, List<T> rev) {
229229
if (rev == null)
230230
throw new IllegalArgumentException("revised sequence is null");
231231

232-
Patch<T> patch = new Patch<T>();
232+
Patch<T> patch = new Patch<>();
233233
if (path.isSnake())
234234
path = path.prev;
235235
while (path != null && path.prev != null && path.prev.j >= 0) {
@@ -242,15 +242,15 @@ public Patch<T> buildRevision(PathNode path, List<T> orig, List<T> rev) {
242242
int ianchor = path.i;
243243
int janchor = path.j;
244244

245-
Chunk<T> original = new Chunk<T>(ianchor, copyOfRange(orig, ianchor, i));
246-
Chunk<T> revised = new Chunk<T>(janchor, copyOfRange(rev, janchor, j));
245+
Chunk<T> original = new Chunk<>(ianchor, copyOfRange(orig, ianchor, i));
246+
Chunk<T> revised = new Chunk<>(janchor, copyOfRange(rev, janchor, j));
247247
Delta<T> delta = null;
248248
if (original.size() == 0 && revised.size() != 0) {
249-
delta = new InsertDelta<T>(original, revised);
249+
delta = new InsertDelta<>(original, revised);
250250
} else if (original.size() > 0 && revised.size() == 0) {
251-
delta = new DeleteDelta<T>(original, revised);
251+
delta = new DeleteDelta<>(original, revised);
252252
} else {
253-
delta = new ChangeDelta<T>(original, revised);
253+
delta = new ChangeDelta<>(original, revised);
254254
}
255255

256256
patch.addDelta(delta);
@@ -269,7 +269,7 @@ public Patch<T> buildRevision(PathNode path, List<T> orig, List<T> rev) {
269269
270270
*/
271271
private List<T> copyOfRange( final List<T> original, final int fromIndex, final int to ) {
272-
return new ArrayList<T>( original.subList( fromIndex, to ) );
272+
return new ArrayList<>( original.subList( fromIndex, to ) );
273273
}
274274

275275
/**

‎src/test/java/diffutils/DiffTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public void testDiff_Insert() {
1818
assertEquals(1, patch.getDeltas().size());
1919
final Delta<String> delta = patch.getDeltas().get(0);
2020
assertEquals(InsertDelta.class, delta.getClass());
21-
assertEquals(new Chunk<String>(1, Collections.<String> emptyList()), delta.getOriginal());
22-
assertEquals(new Chunk<String>(1, Arrays.asList("jjj", "kkk")), delta.getRevised());
21+
assertEquals(new Chunk<>(1, Collections.<String> emptyList()), delta.getOriginal());
22+
assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getRevised());
2323
}
2424

2525
@Test
@@ -29,8 +29,8 @@ public void testDiff_Delete() {
2929
assertEquals(1, patch.getDeltas().size());
3030
final Delta<String> delta = patch.getDeltas().get(0);
3131
assertEquals(DeleteDelta.class, delta.getClass());
32-
assertEquals(new Chunk<String>(0, Arrays.asList("ddd", "fff")), delta.getOriginal());
33-
assertEquals(new Chunk<String>(0, Collections.<String> emptyList()), delta.getRevised());
32+
assertEquals(new Chunk<>(0, Arrays.asList("ddd", "fff")), delta.getOriginal());
33+
assertEquals(new Chunk<>(0, Collections.<String> emptyList()), delta.getRevised());
3434
}
3535

3636
@Test
@@ -43,8 +43,8 @@ public void testDiff_Change() {
4343
assertEquals(1, patch.getDeltas().size());
4444
final Delta<String> delta = patch.getDeltas().get(0);
4545
assertEquals(ChangeDelta.class, delta.getClass());
46-
assertEquals(new Chunk<String>(1, Arrays.asList("bbb")), delta.getOriginal());
47-
assertEquals(new Chunk<String>(1, Arrays.asList("zzz")), delta.getRevised());
46+
assertEquals(new Chunk<>(1, Arrays.asList("bbb")), delta.getOriginal());
47+
assertEquals(new Chunk<>(1, Arrays.asList("zzz")), delta.getRevised());
4848
}
4949

5050
@Test

‎src/test/java/diffutils/GenerateUnifiedDiffTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class GenerateUnifiedDiffTest {
1818

1919

2020
public List<String> fileToLines(String filename) {
21-
List<String> lines = new LinkedList<String>();
21+
List<String> lines = new LinkedList<>();
2222
String line = "";
2323
BufferedReader in = null;
2424
try {
@@ -99,8 +99,8 @@ public void testDiff5() {
9999
*/
100100
@Test
101101
public void testDiffWithHeaderLineInText() {
102-
List<String> original = new ArrayList<String>();
103-
List<String> revised = new ArrayList<String>();
102+
List<String> original = new ArrayList<>();
103+
List<String> revised = new ArrayList<>();
104104

105105
original.add("test line1");
106106
original.add("test line2");

‎src/test/java/diffutils/examples/Example.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public abstract class Example {
2222
* @return A list of lines.
2323
*/
2424
public static List<String> fileToLines(String filename) {
25-
List<String> lines = new LinkedList<String>();
25+
List<String> lines = new LinkedList<>();
2626
String line = "";
2727
BufferedReader in = null;
2828
try {

0 commit comments

Comments
 (0)