motiejus
/
jgit
1
Fork 0
Code Releases Activity

Rename method to ResolveMerger.setWorkingTreeIterator() 

renamed an ugly methodname

Change-Id: I26bda06ef64b8644fd3a555dc55dff43cdb56a71
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
This commit is contained in:
Christian Halstrick 2010-10-13 11:11:12 +02:00
parent 5c135a5856
commit fb1e500adc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
View File

@ -176,7 +176,7 @@ public MergeResult call() throws NoHeadException,
ResolveMerger resolveMerger = (ResolveMerger) merger;
resolveMerger.setCommitNames(new String[] {
"BASE", "HEAD", ref.getName() });
resolveMerger.setWorkingTreeIt(new FileTreeIterator(repo));
resolveMerger.setWorkingTreeIterator(new FileTreeIterator(repo));
noProblems = merger.merge(headCommit, srcCommit);
lowLevelResults = resolveMerger
.getMergeResults();

14
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -132,7 +132,7 @@ public enum MergeFailureReason {
private DirCache dircache;
private WorkingTreeIterator workingTreeIt;
private WorkingTreeIterator workingTreeIterator;
/**
@ -176,8 +176,8 @@ protected boolean mergeImpl() throws IOException {
tw.addTree(sourceTrees[0]);
tw.addTree(sourceTrees[1]);
tw.addTree(buildIt);
if (workingTreeIt != null)
tw.addTree(workingTreeIt);
if (workingTreeIterator != null)
tw.addTree(workingTreeIterator);
while (tw.next()) {
if (!processEntry(
@ -185,7 +185,7 @@ protected boolean mergeImpl() throws IOException {
tw.getTree(T_OURS, CanonicalTreeParser.class),
tw.getTree(T_THEIRS, CanonicalTreeParser.class),
tw.getTree(T_INDEX, DirCacheBuildIterator.class),
(workingTreeIt == null) ? null : tw.getTree(T_FILE, WorkingTreeIterator.class))) {
(workingTreeIterator == null) ? null : tw.getTree(T_FILE, WorkingTreeIterator.class))) {
cleanUp();
return false;
}
@ -612,10 +612,10 @@ public void setDirCache(DirCache dc) {
* TODO: enhance WorkingTreeIterator to support write operations. Then this
* merger will be able to merge with a different working tree abstraction.
*
* @param workingTreeIt
* @param workingTreeIterator
* the workingTreeIt to set
*/
public void setWorkingTreeIt(WorkingTreeIterator workingTreeIt) {
this.workingTreeIt = workingTreeIt;
public void setWorkingTreeIterator(WorkingTreeIterator workingTreeIterator) {
this.workingTreeIterator = workingTreeIterator;
}
}