replaced equalizer by BiPredicate

wumpz · wumpz · commit ea849a9a9860 · 2017-04-22T23:19:21.000+02:00
diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/difflib/DiffUtils.java
@@ -23,14 +23,14 @@
 import difflib.algorithm.DiffException;
 import difflib.algorithm.myers.MyersDiff;
 import difflib.patch.Delta;
-import difflib.patch.Equalizer;
 import difflib.patch.Patch;
 import difflib.patch.PatchFailedException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.BiPredicate;
 import static java.util.stream.Collectors.joining;
 
 /**
@@ -74,7 +74,7 @@ public static Patch<String> diff(String originalText, String revisedText) throws
      * {@code null}.
      */
     public static <T> Patch<T> diff(List<T> original, List<T> revised,
-            Equalizer<T> equalizer) throws DiffException {
+            BiPredicate<T,T> equalizer) throws DiffException {
         if (equalizer != null) {
             return DiffUtils.diff(original, revised,
                     new MyersDiff<>(equalizer));
diff --git a/src/main/java/difflib/algorithm/myers/MyersDiff.java b/src/main/java/difflib/algorithm/myers/MyersDiff.java
@@ -24,11 +24,11 @@
 import difflib.algorithm.DiffAlgorithm;
 import difflib.algorithm.DiffException;
 import difflib.patch.DeltaType;
-import difflib.patch.Equalizer;
 import difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.BiPredicate;
 
 /**
  * A clean-room implementation of Eugene Myers greedy differencing algorithm.
@@ -38,12 +38,12 @@ public final class MyersDiff<T> implements DiffAlgorithm<T> {
     /**
      * Default equalizer.
      */
-    private final Equalizer<T> DEFAULT_EQUALIZER = Object::equals;
+    private final BiPredicate<T,T> DEFAULT_EQUALIZER = Object::equals;
 
     /**
      * The equalizer.
      */
-    private final Equalizer<T> equalizer;
+    private final BiPredicate<T,T> equalizer;
 
     /**
      * Constructs an instance of the Myers differencing algorithm.
@@ -57,7 +57,7 @@ public MyersDiff() {
      *
      * @param equalizer Must not be {@code null}.
      */
-    public MyersDiff(final Equalizer<T> equalizer) {
+    public MyersDiff(final BiPredicate<T,T> equalizer) {
         Objects.requireNonNull(equalizer, "equalizer must not be null");
         this.equalizer = equalizer;
     }
@@ -123,7 +123,7 @@ private PathNode buildPath(final List<T> orig, final List<T> rev)
 
                 PathNode node = new PathNode(i, j, false, false, prev);
 
-                while (i < N && j < M && equalizer.equals(orig.get(i), rev.get(j))) {
+                while (i < N && j < M && equalizer.test(orig.get(i), rev.get(j))) {
                     i++;
                     j++;
                 }
diff --git a/src/main/java/difflib/patch/Equalizer.java b/src/main/java/difflib/patch/Equalizer.java
diff --git a/src/main/java/difflib/text/DiffRowGenerator.java b/src/main/java/difflib/text/DiffRowGenerator.java
@@ -25,11 +25,11 @@
 import difflib.patch.Chunk;
 import difflib.patch.DeleteDelta;
 import difflib.patch.Delta;
-import difflib.patch.Equalizer;
 import difflib.patch.InsertDelta;
 import difflib.patch.Patch;
 import difflib.text.DiffRow.Tag;
 import java.util.*;
+import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -56,7 +56,7 @@ public class DiffRowGenerator {
     private final Function<Boolean, String> newTag;
     private final boolean inlineDiffByWord;
     private final int columnWidth;
-    private final Equalizer<String> equalizer;
+    private final BiPredicate<String, String> equalizer;
     private final boolean mergeOriginalRevised;
 
     /**
@@ -172,9 +172,9 @@ public static Builder create() {
         return new Builder();
     }
 
-    public static final Equalizer<String> IGNORE_WHITESPACE_EQUALIZER = (original, revised) 
+    public static final BiPredicate<String,String> IGNORE_WHITESPACE_EQUALIZER = (original, revised) 
             -> original.trim().replaceAll("\\s+", " ").equals(revised.trim().replaceAll("\\s+", " "));
-    public static final Equalizer<String> DEFAULT_EQUALIZER = Object::equals;
+    public static final BiPredicate<String,String> DEFAULT_EQUALIZER = Object::equals;
     
     private DiffRowGenerator(Builder builder) {
         showInlineDiffs = builder.showInlineDiffs;
