Commitfe89a49

committed

renamed class

1 parent134f80f commitfe89a49Copy full SHA for fe89a49

File tree

+11

-12

lines changed

+11

-12

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`importjava.util.Objects;`
`25`	`25`	`importorg.eclipse.jgit.diff.Edit;`
`26`	`26`	`importorg.eclipse.jgit.diff.EditList;`
`27`		`-importorg.eclipse.jgit.diff.HistogramDiff;`
`28`	`27`	`importorg.eclipse.jgit.diff.Sequence;`
`29`	`28`	`importorg.eclipse.jgit.diff.SequenceComparator;`
`30`	`29`
`@@ -34,14 +33,14 @@`
`34`	`33`	`*`
`35`	`34`	`* @author toben`
`36`	`35`	`*/`
`37`		`-publicclassJGitDiff<T>implementsDiffAlgorithm<T> {`
	`36`	`+publicclassHistogramDiff<T>implementsDiffAlgorithm<T> {`
`38`	`37`
`39`	`38`	`@Override`
`40`	`39`	`publicList<Change>diff(List<T>original,List<T>revised)throwsDiffException {`
`41`	`40`	`Objects.requireNonNull(original,"original list must not be null");`
`42`	`41`	`Objects.requireNonNull(revised,"revised list must not be null");`
`43`	`42`	`EditListdiffList =newEditList();`
`44`		`-diffList.addAll(newHistogramDiff().diff(newDataListComparator<>(),newDataList<>(original),newDataList<>(revised)));`
	`43`	`+diffList.addAll(neworg.eclipse.jgit.diff.HistogramDiff().diff(newDataListComparator<>(),newDataList<>(original),newDataList<>(revised)));`
`45`	`44`	`List<Change>patch =newArrayList<>();`
`46`	`45`	`for (Editedit :diffList) {`
`47`	`46`	`DeltaTypetype =DeltaType.EQUAL;`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`packagecom.github.difflib.algorithm.jgit;`
`17`	`17`
`18`		`-importcom.github.difflib.algorithm.jgit.JGitDiff;`
	`18`	`+importcom.github.difflib.algorithm.jgit.HistogramDiff;`
`19`	`19`	`importstaticcom.github.difflib.DiffUtilsTest.readStringListFromInputStream;`
`20`	`20`	`importcom.github.difflib.TestConstants;`
`21`	`21`	`importcom.github.difflib.algorithm.DiffException;`
`@@ -36,9 +36,9 @@`
`36`	`36`	`*`
`37`	`37`	`* @author toben`
`38`	`38`	`*/`
`39`		`-publicclassJGitDiffTest {`
	`39`	`+publicclassHistogramDiffTest {`
`40`	`40`
`41`		`-publicJGitDiffTest() {`
	`41`	`+publicHistogramDiffTest() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@BeforeClass`
`@@ -58,13 +58,13 @@ public void tearDown() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
`61`		`- * Test of diff method, of classJGitDiff.`
	`61`	`+ * Test of diff method, of classHistogramDiff.`
`62`	`62`	`*/`
`63`	`63`	`@Test`
`64`	`64`	`publicvoidtestDiff()throwsDiffException,PatchFailedException {`
`65`	`65`	`List<String>orgList =Arrays.asList("A","B","C","A","B","B","A");`
`66`	`66`	`List<String>revList =Arrays.asList("C","B","A","B","A","C");`
`67`		`-finalPatch<String>patch =Patch.generate(orgList,revList,newJGitDiff().diff(orgList,revList));`
	`67`	`+finalPatch<String>patch =Patch.generate(orgList,revList,newHistogramDiff().diff(orgList,revList));`
`68`	`68`	`System.out.println(patch);`
`69`	`69`	`assertNotNull(patch);`
`70`	`70`	`assertEquals(3,patch.getDeltas().size());`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`packagecom.github.difflib.algorithm.jgit;`
`17`	`17`
`18`		`-importcom.github.difflib.algorithm.jgit.JGitDiff;`
	`18`	`+importcom.github.difflib.algorithm.jgit.HistogramDiff;`
`19`	`19`	`importstaticcom.github.difflib.DiffUtilsTest.readStringListFromInputStream;`
`20`	`20`	`importcom.github.difflib.TestConstants;`
`21`	`21`	`importcom.github.difflib.algorithm.DiffException;`
`@@ -36,9 +36,9 @@`
`36`	`36`	`*`
`37`	`37`	`* @author toben`
`38`	`38`	`*/`
`39`		`-publicclassLRJGitDiffTest {`
	`39`	`+publicclassLRHistogramDiffTest {`
`40`	`40`
`41`		`-publicLRJGitDiffTest() {`
	`41`	`+publicLRHistogramDiffTest() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@BeforeClass`
`@@ -64,7 +64,7 @@ public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOExcept`
`64`	`64`	`List<String>original =readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta")));`
`65`	`65`	`List<String>revised =readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));`
`66`	`66`
`67`		`-Patch<String>patch =Patch.generate(original,revised,newJGitDiff().diff(original,revised));`
	`67`	`+Patch<String>patch =Patch.generate(original,revised,newHistogramDiff().diff(original,revised));`
`68`	`68`
`69`	`69`	`assertEquals(34,patch.getDeltas().size());`
`70`	`70`

Comments

(0)