Skip to content

Commit fe89a49

Browse files
committed
renamed class
1 parent 134f80f commit fe89a49

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

src/main/java/com/github/difflib/algorithm/jgit/JGitDiff.java renamed to src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Objects;
2525
import org.eclipse.jgit.diff.Edit;
2626
import org.eclipse.jgit.diff.EditList;
27-
import org.eclipse.jgit.diff.HistogramDiff;
2827
import org.eclipse.jgit.diff.Sequence;
2928
import org.eclipse.jgit.diff.SequenceComparator;
3029

@@ -34,14 +33,14 @@
3433
*
3534
* @author toben
3635
*/
37-
public class JGitDiff<T> implements DiffAlgorithm<T> {
36+
public class HistogramDiff<T> implements DiffAlgorithm<T> {
3837

3938
@Override
4039
public List<Change> diff(List<T> original, List<T> revised) throws DiffException {
4140
Objects.requireNonNull(original, "original list must not be null");
4241
Objects.requireNonNull(revised, "revised list must not be null");
4342
EditList diffList = new EditList();
44-
diffList.addAll(new HistogramDiff().diff(new DataListComparator<>(), new DataList<>(original), new DataList<>(revised)));
43+
diffList.addAll(new org.eclipse.jgit.diff.HistogramDiff().diff(new DataListComparator<>(), new DataList<>(original), new DataList<>(revised)));
4544
List<Change> patch = new ArrayList<>();
4645
for (Edit edit : diffList) {
4746
DeltaType type = DeltaType.EQUAL;

src/test/java/com/github/difflib/algorithm/jgit/JGitDiffTest.java renamed to src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.github.difflib.algorithm.jgit;
1717

18-
import com.github.difflib.algorithm.jgit.JGitDiff;
18+
import com.github.difflib.algorithm.jgit.HistogramDiff;
1919
import static com.github.difflib.DiffUtilsTest.readStringListFromInputStream;
2020
import com.github.difflib.TestConstants;
2121
import com.github.difflib.algorithm.DiffException;
@@ -36,9 +36,9 @@
3636
*
3737
* @author toben
3838
*/
39-
public class JGitDiffTest {
39+
public class HistogramDiffTest {
4040

41-
public JGitDiffTest() {
41+
public HistogramDiffTest() {
4242
}
4343

4444
@BeforeClass
@@ -58,13 +58,13 @@ public void tearDown() {
5858
}
5959

6060
/**
61-
* Test of diff method, of class JGitDiff.
61+
* Test of diff method, of class HistogramDiff.
6262
*/
6363
@Test
6464
public void testDiff() throws DiffException, PatchFailedException {
6565
List<String> orgList = Arrays.asList("A","B","C","A","B","B","A");
6666
List<String> revList = Arrays.asList("C","B","A","B","A","C");
67-
final Patch<String> patch = Patch.generate(orgList, revList, new JGitDiff().diff(orgList, revList));
67+
final Patch<String> patch = Patch.generate(orgList, revList, new HistogramDiff().diff(orgList, revList));
6868
System.out.println(patch);
6969
assertNotNull(patch);
7070
assertEquals(3, patch.getDeltas().size());

src/test/java/com/github/difflib/algorithm/jgit/LRJGitDiffTest.java renamed to src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.github.difflib.algorithm.jgit;
1717

18-
import com.github.difflib.algorithm.jgit.JGitDiff;
18+
import com.github.difflib.algorithm.jgit.HistogramDiff;
1919
import static com.github.difflib.DiffUtilsTest.readStringListFromInputStream;
2020
import com.github.difflib.TestConstants;
2121
import com.github.difflib.algorithm.DiffException;
@@ -36,9 +36,9 @@
3636
*
3737
* @author toben
3838
*/
39-
public class LRJGitDiffTest {
39+
public class LRHistogramDiffTest {
4040

41-
public LRJGitDiffTest() {
41+
public LRHistogramDiffTest() {
4242
}
4343

4444
@BeforeClass
@@ -64,7 +64,7 @@ public void testPossibleDiffHangOnLargeDatasetDnaumenkoIssue26() throws IOExcept
6464
List<String> original = readStringListFromInputStream(zip.getInputStream(zip.getEntry("ta")));
6565
List<String> revised = readStringListFromInputStream(zip.getInputStream(zip.getEntry("tb")));
6666

67-
Patch<String> patch = Patch.generate(original, revised, new JGitDiff().diff(original, revised));
67+
Patch<String> patch = Patch.generate(original, revised, new HistogramDiff().diff(original, revised));
6868

6969
assertEquals(34, patch.getDeltas().size());
7070

0 commit comments

Comments
 (0)