diff options
| author | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-03-15 18:04:16 +0100 |
|---|---|---|
| committer | Chris Aniszczyk <zx@twitter.com> | 2012-05-10 18:23:56 -0700 |
| commit | ef98c3ec8671f8ba8f0b942c41e305893b3c08f7 (patch) | |
| tree | 7351491dafe9aad3d179dad5567623a4594341bd | |
| parent | c394d05a47405d3fffc7c5e4df7ca9f649d0cc69 (diff) | |
| download | jgit-ef98c3ec8671f8ba8f0b942c41e305893b3c08f7.tar.gz jgit-ef98c3ec8671f8ba8f0b942c41e305893b3c08f7.zip | |
Cleanup MergeResult constructors
'mergeStrategy' should be 5th argument, after 'mergeStatus'. Pass
'description' if available.
Change-Id: I97cebfe5d7db6247fe899075d917b82955906f85
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java index fcc3bb65e6..c1733f5b7d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java @@ -170,17 +170,19 @@ public class MergeResult { * all the commits which have been merged together * @param mergeStatus * the status the merge resulted in + * @param mergeStrategy + * the used {@link MergeStrategy} * @param lowLevelResults * merge results as returned by * {@link ResolveMerger#getMergeResults()} - * @param mergeStrategy - * the used {@link MergeStrategy} + * @since 2.0 */ public MergeResult(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeStatus mergeStatus, - Map<String, org.eclipse.jgit.merge.MergeResult<?>> lowLevelResults, - MergeStrategy mergeStrategy) { - this(newHead, base, mergedCommits, mergeStatus, mergeStrategy, lowLevelResults, null); + MergeStrategy mergeStrategy, + Map<String, org.eclipse.jgit.merge.MergeResult<?>> lowLevelResults) { + this(newHead, base, mergedCommits, mergeStatus, mergeStrategy, + lowLevelResults, null); } /** @@ -207,7 +209,7 @@ public class MergeResult { Map<String, org.eclipse.jgit.merge.MergeResult<?>> lowLevelResults, String description) { this(newHead, base, mergedCommits, mergeStatus, mergeStrategy, - lowLevelResults, null, null); + lowLevelResults, null, description); } /** |