GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Merge origin/master · monkeyfx/java-diff-utils@6748451

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit
    • HistogramDiffTest.java
    • LRHistogramDiffTest.java
  • java-diff-utils/src
    • main/java/com/github/difflib/patch
      • ChangeDelta.java
      • Chunk.java
      • DeleteDelta.java
      • EqualDelta.java
      • InsertDelta.java
      • Patch.java
    • test/java/com/github/difflib
      • DiffUtilsTest.java
      • GenerateUnifiedDiffTest.java
      • unifieddiff
        • UnifiedDiffWriterTest.java
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java‎

Copy file name to clipboardExpand all lines: java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public HistogramDiffTest() {
4141
public void testDiff() throws PatchFailedException {
4242
List<String> orgList = Arrays.asList("A", "B", "C", "A", "B", "B", "A");
4343
List<String> revList = Arrays.asList("C", "B", "A", "B", "A", "C");
44-
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, null));
44+
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff<String>().computeDiff(orgList, revList, null));
4545
System.out.println(patch);
4646
assertNotNull(patch);
4747
assertEquals(3, patch.getDeltas().size());
@@ -57,7 +57,7 @@ public void testDiffWithListener() throws PatchFailedException {
5757
List<String> revList = Arrays.asList("C", "B", "A", "B", "A", "C");
5858

5959
List<String> logdata = new ArrayList<>();
60-
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff().computeDiff(orgList, revList, new DiffAlgorithmListener() {
60+
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff<String>().computeDiff(orgList, revList, new DiffAlgorithmListener() {
6161
@Override
6262
public void diffStart() {
6363
logdata.add("start");
Collapse file

‎java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java‎

Copy file name to clipboardExpand all lines: java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOExcept
4545
List<String> revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));
4646

4747
List<String> logdata = new ArrayList<>();
48-
Patch<String> patch = Patch.generate(original, revised, new HistogramDiff().computeDiff(original, revised, new DiffAlgorithmListener() {
48+
Patch<String> patch = Patch.generate(original, revised, new HistogramDiff<String>().computeDiff(original, revised, new DiffAlgorithmListener() {
4949
@Override
5050
public void diffStart() {
5151
logdata.add("start");
Collapse file

‎java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ public String toString() {
7575

7676
@Override
7777
public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
78-
return new ChangeDelta(original, revised);
78+
return new ChangeDelta<T>(original, revised);
7979
}
8080
}
Collapse file

‎java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public boolean equals(Object obj) {
156156
if (getClass() != obj.getClass()) {
157157
return false;
158158
}
159-
Chunk<T> other = (Chunk) obj;
159+
Chunk<?> other = (Chunk<?>) obj;
160160
if (lines == null) {
161161
if (other.lines != null) {
162162
return false;
Collapse file

‎java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ public String toString() {
6262

6363
@Override
6464
public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
65-
return new DeleteDelta(original, revised);
65+
return new DeleteDelta<T>(original, revised);
6666
}
6767
}
Collapse file

‎java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ public String toString() {
4444

4545
@Override
4646
public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
47-
return new EqualDelta(original, revised);
47+
return new EqualDelta<T>(original, revised);
4848
}
4949
}
Collapse file

‎java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ public String toString() {
6262

6363
@Override
6464
public AbstractDelta<T> withChunks(Chunk<T> original, Chunk<T> revised) {
65-
return new InsertDelta(original, revised);
65+
return new InsertDelta<T>(original, revised);
6666
}
6767
}
Collapse file

‎java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan
125125
for (Change change : changes) {
126126

127127
if (includeEquals && startOriginal < change.startOriginal) {
128-
patch.addDelta(new EqualDelta(
128+
patch.addDelta(new EqualDelta<T>(
129129
buildChunk(startOriginal, change.startOriginal, original),
130130
buildChunk(startRevised, change.startRevised, revised)));
131131
}
@@ -150,7 +150,7 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan
150150
}
151151

152152
if (includeEquals && startOriginal < original.size()) {
153-
patch.addDelta(new EqualDelta(
153+
patch.addDelta(new EqualDelta<T>(
154154
buildChunk(startOriginal, original.size(), original),
155155
buildChunk(startRevised, revised.size(), revised)));
156156
}
Collapse file

‎java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void testDiffIntegerList() {
112112

113113
final Patch<Integer> patch = DiffUtils.diff(original, revised);
114114

115-
for (AbstractDelta delta : patch.getDeltas()) {
115+
for (AbstractDelta<Integer> delta : patch.getDeltas()) {
116116
System.out.println(delta);
117117
}
118118

Collapse file

‎java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java‎

Copy file name to clipboardExpand all lines: java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void testChagngePosition() throws IOException {
147147

148148
private void validateChangePosition(Patch<String> patch, int index, List<Integer> realRemoveList,
149149
List<Integer> realAddList ) {
150-
final Chunk originChunk = patch.getDeltas().get(index).getSource();
150+
final Chunk<String> originChunk = patch.getDeltas().get(index).getSource();
151151
List<Integer> removeList = originChunk.getChangePosition();
152152
assertEquals(realRemoveList.size(), removeList.size());
153153
for (Integer ele: realRemoveList) {
@@ -156,7 +156,7 @@ private void validateChangePosition(Patch<String> patch, int index, List<Integer
156156
for (Integer ele: removeList) {
157157
assertTrue(realAddList.contains(ele));
158158
}
159-
final Chunk targetChunk = patch.getDeltas().get(index).getTarget();
159+
final Chunk<String> targetChunk = patch.getDeltas().get(index).getTarget();
160160
List<Integer> addList = targetChunk.getChangePosition();
161161
assertEquals(realAddList.size(), addList.size());
162162
for (Integer ele: realAddList) {

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.