Skip to content

Commit efc37b9

Browse files
wumpzwumpz
committed
1 parent 6f72db8 commit efc37b9

File tree

9 files changed

+13
-4
lines changed

9 files changed

+13
-4
lines changed

‎src/main/java/difflib/ChangeDelta.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public void restore(List<T> target) {
7575
/**
7676
* {@inheritDoc}
7777
*/
78+
@Override
7879
public void verify(List<T> target) throws PatchFailedException {
7980
getOriginal().verify(target);
8081
if (getOriginal().getPosition() > target.size()) {

‎src/main/java/difflib/DeltaComparator.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class DeltaComparator implements Comparator<Delta<?>>, Serializable {
1515
private DeltaComparator() {
1616
}
1717

18+
@Override
1819
public int compare(final Delta<?> a, final Delta<?> b) {
1920
final int posA = a.getOriginal().getPosition();
2021
final int posB = b.getOriginal().getPosition();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ private DiffRowGenerator(Builder builder) {
163163
inlineNewCssClass = builder.inlineNewCssClass;
164164
columnWidth = builder.columnWidth; //
165165
equalizer = new Equalizer<String>() {
166+
@Override
166167
public boolean equals(String original, String revised) {
167168
if (ignoreWhiteSpaces) {
168169
original = original.trim().replaceAll("\\s+", " ");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public final class DiffUtils {
4646
* {@code null}.
4747
*/
4848
public static <T> Patch<T> diff(List<T> original, List<T> revised) {
49-
return DiffUtils.diff(original, revised, new MyersDiff<T>());
49+
return DiffUtils.diff(original, revised, new MyersDiff<>());
5050
}
5151

5252
/**
@@ -67,7 +67,7 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised,
6767
return DiffUtils.diff(original, revised,
6868
new MyersDiff<>(equalizer));
6969
}
70-
return DiffUtils.diff(original, revised, new MyersDiff<T>());
70+
return DiffUtils.diff(original, revised, new MyersDiff<>());
7171
}
7272

7373
/**

‎src/main/java/difflib/InsertDelta.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public void verify(List<T> target) throws PatchFailedException {
7171

7272
}
7373

74+
@Override
7475
public TYPE getType() {
7576
return Delta.TYPE.INSERT;
7677
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public DiffNode(int i, int j, PathNode prev) {
4949
*
5050
* @return false, always
5151
*/
52+
@Override
5253
public boolean isSnake() {
5354
return false;
5455
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public class MyersDiff<T> implements DiffAlgorithm<T> {
7979
* Default equalizer.
8080
*/
8181
private final Equalizer<T> DEFAULT_EQUALIZER = new Equalizer<T>() {
82+
@Override
8283
public boolean equals(final T original, final T revised) {
8384
return original.equals(revised);
8485
}
@@ -113,6 +114,7 @@ public MyersDiff(final Equalizer<T> equalizer) {
113114
*
114115
* @return Returns an empty diff if get the error while procession the difference.
115116
*/
117+
@Override
116118
public Patch<T> diff(final T[] original, final T[] revised) {
117119
return diff(Arrays.asList(original), Arrays.asList(revised));
118120
}
@@ -122,6 +124,7 @@ public Patch<T> diff(final T[] original, final T[] revised) {
122124
*
123125
* Return empty diff if get the error while procession the difference.
124126
*/
127+
@Override
125128
public Patch<T> diff(final List<T> original, final List<T> revised) {
126129
if (original == null) {
127130
throw new IllegalArgumentException("original list must not be null");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public Snake(int i, int j, PathNode prev) {
8686
*
8787
* @return true always
8888
*/
89+
@Override
8990
public boolean isSnake() {
9091
return true;
9192
}

‎src/test/java/diffutils/DiffUtilsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public void testDiff_Change() {
5252

5353
@Test
5454
public void testDiff_EmptyList() {
55-
final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), new ArrayList<String>());
55+
final Patch<String> patch = DiffUtils.diff(new ArrayList<>(), new ArrayList<>());
5656
assertNotNull(patch);
5757
assertEquals(0, patch.getDeltas().size());
5858
}
5959

6060
@Test
6161
public void testDiff_EmptyListWithNonEmpty() {
62-
final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), Arrays.asList("aaa"));
62+
final Patch<String> patch = DiffUtils.diff(new ArrayList<>(), Arrays.asList("aaa"));
6363
assertNotNull(patch);
6464
assertEquals(1, patch.getDeltas().size());
6565
final Delta<String> delta = patch.getDeltas().get(0);

0 commit comments

Comments
 (0)