From 591e39bf9d26d6afc065a2dc8924b469743b60fd Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Mon, 15 Feb 2016 18:45:55 -0500 Subject: [PATCH] Revert "Fix warnings about unchecked conversion of MergeResult" This reverts commit 979fa19110df0906a82e92e32d7d3ccf7eca3712. Breaks API. Change-Id: I54af657898d49f64d6906fe3edfb6b08e996d901 --- .../tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java | 2 +- org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java index 284657c59..d4a3d62da 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java @@ -259,7 +259,7 @@ public class MergeAlgorithmTest { } private String merge(String commonBase, String ours, String theirs) throws IOException { - MergeResult r = new MergeAlgorithm().merge(RawTextComparator.DEFAULT, + MergeResult r = new MergeAlgorithm().merge(RawTextComparator.DEFAULT, T(commonBase), T(ours), T(theirs)); ByteArrayOutputStream bo=new ByteArrayOutputStream(50); fmt.formatMerge(bo, r, "B", "O", "T", Constants.CHARACTER_ENCODING); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java index a9a8231ee..977f95341 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java @@ -102,7 +102,7 @@ public class MergeFormatter { * metadata * @throws IOException */ - public void formatMerge(OutputStream out, MergeResult res, String baseName, + public void formatMerge(OutputStream out, MergeResult res, String baseName, String oursName, String theirsName, String charsetName) throws IOException { List names = new ArrayList(3); names.add(baseName);