From efc37b984a6058cd5df680bd9529374310465f75 Mon Sep 17 00:00:00 2001
From: wumpz <t.warneke@gmx.net>
Date: Fri, 31 Mar 2017 15:04:16 +0200
Subject: [PATCH]

---
 src/main/java/difflib/ChangeDelta.java      | 1 +
 src/main/java/difflib/DeltaComparator.java  | 1 +
 src/main/java/difflib/DiffRowGenerator.java | 1 +
 src/main/java/difflib/DiffUtils.java        | 4 ++--
 src/main/java/difflib/InsertDelta.java      | 1 +
 src/main/java/difflib/myers/DiffNode.java   | 1 +
 src/main/java/difflib/myers/MyersDiff.java  | 3 +++
 src/main/java/difflib/myers/Snake.java      | 1 +
 src/test/java/diffutils/DiffUtilsTest.java  | 4 ++--
 9 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/difflib/ChangeDelta.java b/src/main/java/difflib/ChangeDelta.java
index 7f2c5b7..d0f4865 100644
--- a/src/main/java/difflib/ChangeDelta.java
+++ b/src/main/java/difflib/ChangeDelta.java
@@ -75,6 +75,7 @@ public class ChangeDelta<T> extends Delta<T> {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void verify(List<T> target) throws PatchFailedException {
         getOriginal().verify(target);
         if (getOriginal().getPosition() > target.size()) {
diff --git a/src/main/java/difflib/DeltaComparator.java b/src/main/java/difflib/DeltaComparator.java
index 8f12553..6c42336 100644
--- a/src/main/java/difflib/DeltaComparator.java
+++ b/src/main/java/difflib/DeltaComparator.java
@@ -15,6 +15,7 @@ public class DeltaComparator implements Comparator<Delta<?>>, Serializable {
     private DeltaComparator() {
     }
 
+    @Override
     public int compare(final Delta<?> a, final Delta<?> b) {
         final int posA = a.getOriginal().getPosition();
         final int posB = b.getOriginal().getPosition();
diff --git a/src/main/java/difflib/DiffRowGenerator.java b/src/main/java/difflib/DiffRowGenerator.java
index 92914f1..d4abb32 100644
--- a/src/main/java/difflib/DiffRowGenerator.java
+++ b/src/main/java/difflib/DiffRowGenerator.java
@@ -163,6 +163,7 @@ public class DiffRowGenerator {
         inlineNewCssClass = builder.inlineNewCssClass;
         columnWidth = builder.columnWidth; //
         equalizer = new Equalizer<String>() {
+            @Override
             public boolean equals(String original, String revised) {
                 if (ignoreWhiteSpaces) {
                     original = original.trim().replaceAll("\\s+", " ");
diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/difflib/DiffUtils.java
index d310d90..7f4f277 100644
--- a/src/main/java/difflib/DiffUtils.java
+++ b/src/main/java/difflib/DiffUtils.java
@@ -46,7 +46,7 @@ public final class DiffUtils {
      * {@code null}.
      */
     public static <T> Patch<T> diff(List<T> original, List<T> revised) {
-        return DiffUtils.diff(original, revised, new MyersDiff<T>());
+        return DiffUtils.diff(original, revised, new MyersDiff<>());
     }
 
     /**
@@ -67,7 +67,7 @@ public final class DiffUtils {
             return DiffUtils.diff(original, revised,
                     new MyersDiff<>(equalizer));
         }
-        return DiffUtils.diff(original, revised, new MyersDiff<T>());
+        return DiffUtils.diff(original, revised, new MyersDiff<>());
     }
 
     /**
diff --git a/src/main/java/difflib/InsertDelta.java b/src/main/java/difflib/InsertDelta.java
index 4ec52fd..ac2a863 100644
--- a/src/main/java/difflib/InsertDelta.java
+++ b/src/main/java/difflib/InsertDelta.java
@@ -71,6 +71,7 @@ public class InsertDelta<T> extends Delta<T> {
 
     }
 
+    @Override
     public TYPE getType() {
         return Delta.TYPE.INSERT;
     }
diff --git a/src/main/java/difflib/myers/DiffNode.java b/src/main/java/difflib/myers/DiffNode.java
index 83fc66e..78c39c8 100644
--- a/src/main/java/difflib/myers/DiffNode.java
+++ b/src/main/java/difflib/myers/DiffNode.java
@@ -49,6 +49,7 @@ public final class DiffNode extends PathNode {
      *
      * @return false, always
      */
+    @Override
     public boolean isSnake() {
         return false;
     }
diff --git a/src/main/java/difflib/myers/MyersDiff.java b/src/main/java/difflib/myers/MyersDiff.java
index 02662c4..82ae22b 100644
--- a/src/main/java/difflib/myers/MyersDiff.java
+++ b/src/main/java/difflib/myers/MyersDiff.java
@@ -79,6 +79,7 @@ public class MyersDiff<T> implements DiffAlgorithm<T> {
      * Default equalizer.
      */
     private final Equalizer<T> DEFAULT_EQUALIZER = new Equalizer<T>() {
+        @Override
         public boolean equals(final T original, final T revised) {
             return original.equals(revised);
         }
@@ -113,6 +114,7 @@ public class MyersDiff<T> implements DiffAlgorithm<T> {
      *
      * @return Returns an empty diff if get the error while procession the difference.
      */
+    @Override
     public Patch<T> diff(final T[] original, final T[] revised) {
         return diff(Arrays.asList(original), Arrays.asList(revised));
     }
@@ -122,6 +124,7 @@ public class MyersDiff<T> implements DiffAlgorithm<T> {
      *
      * Return empty diff if get the error while procession the difference.
      */
+    @Override
     public Patch<T> diff(final List<T> original, final List<T> revised) {
         if (original == null) {
             throw new IllegalArgumentException("original list must not be null");
diff --git a/src/main/java/difflib/myers/Snake.java b/src/main/java/difflib/myers/Snake.java
index bd22545..991d74a 100644
--- a/src/main/java/difflib/myers/Snake.java
+++ b/src/main/java/difflib/myers/Snake.java
@@ -86,6 +86,7 @@ public final class Snake extends PathNode {
      *
      * @return true always
      */
+    @Override
     public boolean isSnake() {
         return true;
     }
diff --git a/src/test/java/diffutils/DiffUtilsTest.java b/src/test/java/diffutils/DiffUtilsTest.java
index 6e65deb..a5316a6 100644
--- a/src/test/java/diffutils/DiffUtilsTest.java
+++ b/src/test/java/diffutils/DiffUtilsTest.java
@@ -52,14 +52,14 @@ public class DiffUtilsTest {
 
     @Test
     public void testDiff_EmptyList() {
-        final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), new ArrayList<String>());
+        final Patch<String> patch = DiffUtils.diff(new ArrayList<>(), new ArrayList<>());
         assertNotNull(patch);
         assertEquals(0, patch.getDeltas().size());
     }
 
     @Test
     public void testDiff_EmptyListWithNonEmpty() {
-        final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), Arrays.asList("aaa"));
+        final Patch<String> patch = DiffUtils.diff(new ArrayList<>(), Arrays.asList("aaa"));
         assertNotNull(patch);
         assertEquals(1, patch.getDeltas().size());
         final Delta<String> delta = patch.getDeltas().get(0);