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

Eliminate most unchecked and unsafe operation warnings (#108)

Browse Source 
Thx for improving java-diff-utils.
This commit is contained in:
Jerry James
2020-12-17 15:08:59 -07:00
committed by GitHub
parent 759a2ba67a
commit ab76d7229a
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
View File

@@ -41,7 +41,7 @@ public class HistogramDiffTest {
public void testDiff() throws PatchFailedException {
List<String> orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
List<String> revList = Arrays.asList("C", "B", "A", "B", "A", "C");
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null));
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff<String>().computeDiff(orgList, revList, null));
System.out.println(patch);
assertNotNull(patch);
assertEquals(3, patch.getDeltas().size());
@@ -57,7 +57,7 @@ public class HistogramDiffTest {
List<String> revList = Arrays.asList("C", "B", "A", "B", "A", "C");
List<String> logdata = new ArrayList<>();
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() {
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff<String>().computeDiff(orgList, revList, new DiffAlgorithmListener() {
@Override
public void diffStart() {
logdata.add("start");

2
java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
View File

@@ -45,7 +45,7 @@ public class LRHistogramDiffTest {
List<String> revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));
List<String> logdata = new ArrayList<>();
Patch<String> patch = Patch.generate(original, revised, new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
Patch<String> patch = Patch.generate(original, revised, new HistogramDiff<String>().computeDiff(original, revised, new DiffAlgorithmListener() {
@Override
public void diffStart() {
logdata.add("start");

2
java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
View File

@@ -75,6 +75,6 @@ public final class ChangeDelta<T> extends AbstractDelta<T> {
@Override
public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
return new ChangeDelta(original, revised);
return new ChangeDelta<T>(original, revised);
}
}

2
java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
View File

@@ -156,7 +156,7 @@ public final class Chunk<T> implements Serializable {
if (getClass() != obj.getClass()) {
return false;
}
Chunk<T> other = (Chunk) obj;
Chunk<?> other = (Chunk<?>) obj;
if (lines == null) {
if (other.lines != null) {
return false;

2
java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
View File

@@ -62,6 +62,6 @@ public final class DeleteDelta<T> extends AbstractDelta<T> {
@Override
public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
return new DeleteDelta(original, revised);
return new DeleteDelta<T>(original, revised);
}
}

2
java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
View File

@@ -44,6 +44,6 @@ public class EqualDelta<T> extends AbstractDelta<T> {
@Override
public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
return new EqualDelta(original, revised);
return new EqualDelta<T>(original, revised);
}
}

2
java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
View File

@@ -62,6 +62,6 @@ public final class InsertDelta<T> extends AbstractDelta<T> {
@Override
public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
return new InsertDelta(original, revised);
return new InsertDelta<T>(original, revised);
}
}

4
java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
View File

@@ -125,7 +125,7 @@ public final class Patch<T> implements Serializable {
for (Change change : changes) {
if (includeEquals && startOriginal < change.startOriginal) {
patch.addDelta(new EqualDelta(
patch.addDelta(new EqualDelta<T>(
buildChunk(startOriginal, change.startOriginal, original),
buildChunk(startRevised, change.startRevised, revised)));
}
@@ -150,7 +150,7 @@ public final class Patch<T> implements Serializable {
}
if (includeEquals && startOriginal < original.size()) {
patch.addDelta(new EqualDelta(
patch.addDelta(new EqualDelta<T>(
buildChunk(startOriginal, original.size(), original),
buildChunk(startRevised, revised.size(), revised)));
}

2
java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
View File

@@ -112,7 +112,7 @@ public class DiffUtilsTest {
final Patch<Integer> patch = DiffUtils.diff(original, revised);
for (AbstractDelta delta : patch.getDeltas()) {
for (AbstractDelta<Integer> delta : patch.getDeltas()) {
System.out.println(delta);
}

4
java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
View File

@@ -147,7 +147,7 @@ public class GenerateUnifiedDiffTest {
private void validateChangePosition(Patch<String> patch, int index, List<Integer> realRemoveList,
List<Integer> realAddList ) {
final Chunk originChunk = patch.getDeltas().get(index).getSource();
final Chunk<String> originChunk = patch.getDeltas().get(index).getSource();
List<Integer> removeList = originChunk.getChangePosition();
assertEquals(realRemoveList.size(), removeList.size());
for (Integer ele: realRemoveList) {
@@ -156,7 +156,7 @@ public class GenerateUnifiedDiffTest {
for (Integer ele: removeList) {
assertTrue(realAddList.contains(ele));
}
final Chunk targetChunk = patch.getDeltas().get(index).getTarget();
final Chunk<String> targetChunk = patch.getDeltas().get(index).getTarget();
List<Integer> addList = targetChunk.getChangePosition();
assertEquals(realAddList.size(), addList.size());
for (Integer ele: realAddList) {

2
java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
View File

@@ -46,7 +46,7 @@ public class UnifiedDiffWriterTest {
UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes()));
StringWriter writer = new StringWriter();
UnifiedDiffWriter.write(diff, f -> Collections.EMPTY_LIST, writer, 5);
UnifiedDiffWriter.write(diff, f -> Collections.emptyList(), writer, 5);
System.out.println(writer.toString());
}