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>

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 fcc3bb65e6f2ab03c327e27e82baab8cac2997fc..c1733f5b7deb9b2feb8429cc7d7b992ebde7d468 100644 (file)
--- 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);
        }
 
        /**