From fb1e500adc011dfaad1a6e68b23a9b254a77bf43 Mon Sep 17 00:00:00 2001 From: Christian Halstrick Date: Wed, 13 Oct 2010 11:11:12 +0200 Subject: [PATCH] Rename method to ResolveMerger.setWorkingTreeIterator() renamed an ugly methodname Change-Id: I26bda06ef64b8644fd3a555dc55dff43cdb56a71 Signed-off-by: Christian Halstrick --- .../src/org/eclipse/jgit/api/MergeCommand.java | 2 +- .../src/org/eclipse/jgit/merge/ResolveMerger.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java index ae13c9640..9e31c47c3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -176,7 +176,7 @@ public class MergeCommand extends GitCommand { 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(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index ecec033fc..a8ab433fb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -132,7 +132,7 @@ public class ResolveMerger extends ThreeWayMerger { private DirCache dircache; - private WorkingTreeIterator workingTreeIt; + private WorkingTreeIterator workingTreeIterator; /** @@ -176,8 +176,8 @@ public class ResolveMerger extends ThreeWayMerger { 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 @@ public class ResolveMerger extends ThreeWayMerger { 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 class ResolveMerger extends ThreeWayMerger { * 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; } }