Movatterモバイル変換

Skip to content

java-diff-utils/java-diff-utilsPublic

NotificationsYou must be signed in to change notification settings
Fork209
Star1.5k

Commit6748451

wumpz

committed

Merge origin/master

2 parents445381b +ab76d72 commit6748451Copy full SHA for 6748451

File tree

11 files changed

+14

-14

lines changed

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
- test/java/com/github/difflib
  - DiffUtilsTest.java
  - GenerateUnifiedDiffTest.java
  - unifieddiff
    - UnifiedDiffWriterTest.java

11 files changed

+14

-14

lines changed

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public HistogramDiffTest() {`
`41`	`41`	`publicvoidtestDiff()throwsPatchFailedException {`
`42`	`42`	`List<String>orgList =Arrays.asList("A","B","C","A","B","B","A");`
`43`	`43`	`List<String>revList =Arrays.asList("C","B","A","B","A","C");`
`44`		`-finalPatch<String>patch =Patch.generate(orgList,revList,newHistogramDiff().computeDiff(orgList,revList,null));`
	`44`	`+finalPatch<String>patch =Patch.generate(orgList,revList,newHistogramDiff<String>().computeDiff(orgList,revList,null));`
`45`	`45`	`System.out.println(patch);`
`46`	`46`	`assertNotNull(patch);`
`47`	`47`	`assertEquals(3,patch.getDeltas().size());`
`@@ -57,7 +57,7 @@ public void testDiffWithListener() throws PatchFailedException {`
`57`	`57`	`List<String>revList =Arrays.asList("C","B","A","B","A","C");`
`58`	`58`
`59`	`59`	`List<String>logdata =newArrayList<>();`
`60`		`-finalPatch<String>patch =Patch.generate(orgList,revList,newHistogramDiff().computeDiff(orgList,revList,newDiffAlgorithmListener() {`
	`60`	`+finalPatch<String>patch =Patch.generate(orgList,revList,newHistogramDiff<String>().computeDiff(orgList,revList,newDiffAlgorithmListener() {`
`61`	`61`	`@Override`
`62`	`62`	`publicvoiddiffStart() {`
`63`	`63`	`logdata.add("start");`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOExcept`
`45`	`45`	`List<String>revised =readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));`
`46`	`46`
`47`	`47`	`List<String>logdata =newArrayList<>();`
`48`		`-Patch<String>patch =Patch.generate(original,revised,newHistogramDiff().computeDiff(original,revised,newDiffAlgorithmListener() {`
	`48`	`+Patch<String>patch =Patch.generate(original,revised,newHistogramDiff<String>().computeDiff(original,revised,newDiffAlgorithmListener() {`
`49`	`49`	`@Override`
`50`	`50`	`publicvoiddiffStart() {`
`51`	`51`	`logdata.add("start");`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,6 @@ public String toString() {`
`75`	`75`
`76`	`76`	`@Override`
`77`	`77`	`publicAbstractDelta<T>withChunks(Chunk<T>original,Chunk<T>revised) {`
`78`		`-returnnewChangeDelta(original,revised);`
	`78`	`+returnnewChangeDelta<T>(original,revised);`
`79`	`79`	`}`
`80`	`80`	`}`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public boolean equals(Object obj) {`
`156`	`156`	`if (getClass() !=obj.getClass()) {`
`157`	`157`	`returnfalse;`
`158`	`158`	`}`
`159`		`-Chunk<T>other = (Chunk)obj;`
	`159`	`+Chunk<?>other = (Chunk<?>)obj;`
`160`	`160`	`if (lines ==null) {`
`161`	`161`	`if (other.lines !=null) {`
`162`	`162`	`returnfalse;`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ public String toString() {`
`62`	`62`
`63`	`63`	`@Override`
`64`	`64`	`publicAbstractDelta<T>withChunks(Chunk<T>original,Chunk<T>revised) {`
`65`		`-returnnewDeleteDelta(original,revised);`
	`65`	`+returnnewDeleteDelta<T>(original,revised);`
`66`	`66`	`}`
`67`	`67`	`}`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ public String toString() {`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`publicAbstractDelta<T>withChunks(Chunk<T>original,Chunk<T>revised) {`
`47`		`-returnnewEqualDelta(original,revised);`
	`47`	`+returnnewEqualDelta<T>(original,revised);`
`48`	`48`	`}`
`49`	`49`	`}`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ public String toString() {`
`62`	`62`
`63`	`63`	`@Override`
`64`	`64`	`publicAbstractDelta<T>withChunks(Chunk<T>original,Chunk<T>revised) {`
`65`		`-returnnewInsertDelta(original,revised);`
	`65`	`+returnnewInsertDelta<T>(original,revised);`
`66`	`66`	`}`
`67`	`67`	`}`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan`
`125`	`125`	`for (Changechange :changes) {`
`126`	`126`
`127`	`127`	`if (includeEquals &&startOriginal <change.startOriginal) {`
`128`		`-patch.addDelta(newEqualDelta(`
	`128`	`+patch.addDelta(newEqualDelta<T>(`
`129`	`129`	`buildChunk(startOriginal,change.startOriginal,original),`
`130`	`130`	`buildChunk(startRevised,change.startRevised,revised)));`
`131`	`131`	`}`
`@@ -150,7 +150,7 @@ public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Chan`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`if (includeEquals &&startOriginal <original.size()) {`
`153`		`-patch.addDelta(newEqualDelta(`
	`153`	`+patch.addDelta(newEqualDelta<T>(`
`154`	`154`	`buildChunk(startOriginal,original.size(),original),`
`155`	`155`	`buildChunk(startRevised,revised.size(),revised)));`
`156`	`156`	`}`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void testDiffIntegerList() {`
`112`	`112`
`113`	`113`	`finalPatch<Integer>patch =DiffUtils.diff(original,revised);`
`114`	`114`
`115`		`-for (AbstractDeltadelta :patch.getDeltas()) {`
	`115`	`+for (AbstractDelta<Integer>delta :patch.getDeltas()) {`
`116`	`116`	`System.out.println(delta);`
`117`	`117`	`}`
`118`	`118`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public void testChagngePosition() throws IOException {`
`147`	`147`
`148`	`148`	`privatevoidvalidateChangePosition(Patch<String>patch,intindex,List<Integer>realRemoveList,`
`149`	`149`	`List<Integer>realAddList ) {`
`150`		`-finalChunkoriginChunk =patch.getDeltas().get(index).getSource();`
	`150`	`+finalChunk<String>originChunk =patch.getDeltas().get(index).getSource();`
`151`	`151`	`List<Integer>removeList =originChunk.getChangePosition();`
`152`	`152`	`assertEquals(realRemoveList.size(),removeList.size());`
`153`	`153`	`for (Integerele:realRemoveList) {`
`@@ -156,7 +156,7 @@ private void validateChangePosition(Patch<String> patch, int index, List<Integer`
`156`	`156`	`for (Integerele:removeList) {`
`157`	`157`	`assertTrue(realAddList.contains(ele));`
`158`	`158`	`}`
`159`		`-finalChunktargetChunk =patch.getDeltas().get(index).getTarget();`
	`159`	`+finalChunk<String>targetChunk =patch.getDeltas().get(index).getTarget();`
`160`	`160`	`List<Integer>addList =targetChunk.getChangePosition();`
`161`	`161`	`assertEquals(realAddList.size(),addList.size());`
`162`	`162`	`for (Integerele:realAddList) {`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp