Skip to content

Commit 18c35bb

Browse files
authored
Merge pull request #109 from maximilian-glumann/delete-deprecated-preliminary-package
Delete deprecated preliminary package
2 parents 1dc6e52 + 3bcb654 commit 18c35bb

31 files changed

+1
-2257
lines changed

src/main/java/org/variantsync/diffdetective/diff/git/GitDiffer.java

-33
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.variantsync.diffdetective.diff.result.CommitDiffResult;
1919
import org.variantsync.diffdetective.diff.result.DiffError;
2020
import org.variantsync.diffdetective.diff.result.DiffParseException;
21-
import org.variantsync.diffdetective.preliminary.GitDiff;
2221
import org.variantsync.diffdetective.util.Assert;
2322
import org.variantsync.diffdetective.util.StringUtils;
2423
import org.variantsync.diffdetective.variation.DiffLinesLabel;
@@ -71,38 +70,6 @@ public GitDiffer(final Repository repository) {
7170
this.parseOptions = repository.getParseOptions();
7271
}
7372

74-
/**
75-
* Creates a GitDiff object.
76-
* For this, each commit is iterated to create CommitDiffs
77-
*
78-
* @return The GitDiff object created from the Git object of this GitDiffer
79-
*/
80-
@Deprecated
81-
public GitDiff createGitDiff() {
82-
final GitDiff gitDiff = new GitDiff();
83-
84-
final Iterable<RevCommit> commitsIterable;
85-
try {
86-
commitsIterable = git.log().call();
87-
} catch (GitAPIException e) {
88-
Logger.warn("Could not get log for git repository {}", git.toString());
89-
return null;
90-
}
91-
92-
// we specifically count the commits here because the amount of unfiltered commits is
93-
// otherwise lost
94-
final int[] commitAmount = {0};
95-
final Iterator<RevCommit> commitIterator = new SideEffectIterator<>(
96-
commitsIterable.iterator(),
97-
r -> ++commitAmount[0]);
98-
for (CommitDiffResult commitDiff : yieldAllValidIn(commitIterator).map(this::createCommitDiff)) {
99-
commitDiff.diff().ifPresent(gitDiff::addCommitDiff);
100-
}
101-
gitDiff.setCommitAmount(commitAmount[0]);
102-
103-
return gitDiff;
104-
}
105-
10673
/**
10774
* Returns all commits in the repository's history.
10875
*/

src/main/java/org/variantsync/diffdetective/editclass/EditClass.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.variantsync.diffdetective.editclass;
22

3-
import org.variantsync.diffdetective.preliminary.pattern.Pattern;
43
import org.variantsync.diffdetective.variation.diff.DiffNode;
54
import org.variantsync.diffdetective.variation.diff.VariationDiff;
65
import org.variantsync.diffdetective.variation.diff.DiffType;

src/main/java/org/variantsync/diffdetective/preliminary/pattern/Pattern.java renamed to src/main/java/org/variantsync/diffdetective/editclass/Pattern.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.variantsync.diffdetective.preliminary.pattern;
1+
package org.variantsync.diffdetective.editclass;
22

33
/**
44
* Abstract class for edit patterns.

src/main/java/org/variantsync/diffdetective/preliminary/GitDiff.java

-79
This file was deleted.

src/main/java/org/variantsync/diffdetective/preliminary/Main.java

-182
This file was deleted.

src/main/java/org/variantsync/diffdetective/preliminary/analysis/GDAnalysisUtils.java

-73
This file was deleted.

0 commit comments

Comments
 (0)