uses instanceof instead of getClass.equals

wumpz · wumpz · commit 55646e942904 · 2017-03-31T08:44:11.000+02:00
diff --git a/src/main/java/difflib/DiffRowGenerator.java b/src/main/java/difflib/DiffRowGenerator.java
@@ -245,7 +245,7 @@ public List<DiffRow> generateDiffRows(List<String> original, List<String> revise
             }
 
             // Inserted DiffRow
-            if (delta.getClass().equals(InsertDelta.class)) {
+            if (delta instanceof InsertDelta) {
                 endPos = orig.last() + 1;
                 for (String line : (List<String>) rev.getLines()) {
                     diffRows.add(new DiffRow(Tag.INSERT, "", line));
@@ -254,7 +254,7 @@ public List<DiffRow> generateDiffRows(List<String> original, List<String> revise
             }
 
             // Deleted DiffRow
-            if (delta.getClass().equals(DeleteDelta.class)) {
+            if (delta instanceof DeleteDelta) {
                 endPos = orig.last() + 1;
                 for (String line : (List<String>) orig.getLines()) {
                     diffRows.add(new DiffRow(Tag.DELETE, line, ""));
@@ -314,14 +314,14 @@ private void addInlineDiffs(Delta<String> delta) {
             for (Delta<String> inlineDelta : inlineDeltas) {
                 Chunk<String> inlineOrig = inlineDelta.getOriginal();
                 Chunk<String> inlineRev = inlineDelta.getRevised();
-                if (inlineDelta.getClass().equals(DeleteDelta.class)) {
+                if (inlineDelta instanceof DeleteDelta) {
                     origList = wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
                             .getPosition()
                             + inlineOrig.size() + 1, this.InlineOldTag, this.InlineOldCssClass);
-                } else if (inlineDelta.getClass().equals(InsertDelta.class)) {
+                } else if (inlineDelta instanceof InsertDelta) {
                     revList = wrapInTag(revList, inlineRev.getPosition(), inlineRev.getPosition()
                             + inlineRev.size() + 1, this.InlineNewTag, this.InlineNewCssClass);
-                } else if (inlineDelta.getClass().equals(ChangeDelta.class)) {
+                } else if (inlineDelta instanceof ChangeDelta) {
                     origList = wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
                             .getPosition()
                             + inlineOrig.size() + 1, this.InlineOldTag, this.InlineOldCssClass);
diff --git a/src/test/java/diffutils/DiffTest.java b/src/test/java/diffutils/DiffTest.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 public class DiffTest {
@@ -18,7 +19,7 @@ public void testDiff_Insert() {
         assertNotNull(patch);
         assertEquals(1, patch.getDeltas().size());
         final Delta<String> delta = patch.getDeltas().get(0);
-        assertEquals(InsertDelta.class, delta.getClass());
+        assertTrue(delta instanceof InsertDelta);
         assertEquals(new Chunk<>(1, Collections.<String>emptyList()), delta.getOriginal());
         assertEquals(new Chunk<>(1, Arrays.asList("jjj", "kkk")), delta.getRevised());
     }
@@ -30,7 +31,7 @@ public void testDiff_Delete() {
         assertNotNull(patch);
         assertEquals(1, patch.getDeltas().size());
         final Delta<String> delta = patch.getDeltas().get(0);
-        assertEquals(DeleteDelta.class, delta.getClass());
+        assertTrue(delta instanceof DeleteDelta);
         assertEquals(new Chunk<>(0, Arrays.asList("ddd", "fff")), delta.getOriginal());
         assertEquals(new Chunk<>(0, Collections.<String>emptyList()), delta.getRevised());
     }
@@ -44,7 +45,7 @@ public void testDiff_Change() {
         assertNotNull(patch);
         assertEquals(1, patch.getDeltas().size());
         final Delta<String> delta = patch.getDeltas().get(0);
-        assertEquals(ChangeDelta.class, delta.getClass());
+        assertTrue(delta instanceof ChangeDelta);
         assertEquals(new Chunk<>(1, Arrays.asList("bbb")), delta.getOriginal());
         assertEquals(new Chunk<>(1, Arrays.asList("zzz")), delta.getRevised());
     }
@@ -62,6 +63,6 @@ public void testDiff_EmptyListWithNonEmpty() {
         assertNotNull(patch);
         assertEquals(1, patch.getDeltas().size());
         final Delta<String> delta = patch.getDeltas().get(0);
-        assertEquals(InsertDelta.class, delta.getClass());
+        assertTrue(delta instanceof InsertDelta);
     }
 }
