java/java-diff-utils
1
0
Fork 0
mirror of https://github.com/java-diff-utils/java-diff-utils.git synced 2026-03-13 10:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

uses instanceof instead of getClass.equals

Browse Source
This commit is contained in:
wumpz
2017-03-31 08:44:11 +02:00
parent 90fcdee364
commit 55646e9429
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/difflib/DiffRowGenerator.java
View File

@@ -245,7 +245,7 @@ public class DiffRowGenerator {
}
// 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 class DiffRowGenerator {
}
// 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 @@ public class DiffRowGenerator {
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);

9
src/test/java/diffutils/DiffTest.java
View File

@@ -7,6 +7,7 @@ import java.util.Collections;
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 class DiffTest {
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 class DiffTest {
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 class DiffTest {
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 class DiffTest {
assertNotNull(patch);
assertEquals(1, patch.getDeltas().size());
final Delta<String> delta = patch.getDeltas().get(0);
assertEquals(InsertDelta.class, delta.getClass());
assertTrue(delta instanceof InsertDelta);
}
}