From c15903ea3e69bee4a2fc99452e6cc4a9a7151da5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 26 Jul 2016 10:16:18 +0900 Subject: [PATCH] MergeFormatter: Suppress warning about unchecked conversion The warning can be fixed by adding a type to the argument, but doing so breaks the API and previous attempts to fix it in that way [1, 2] were reverted [3, 4]. [1] https://git.eclipse.org/r/#/c/45709/ [2] https://git.eclipse.org/r/#/c/66602/ [3] https://git.eclipse.org/r/#/c/49400/ [4] https://git.eclipse.org/r/#/c/66659/ Change-Id: I01dd52e09da24f70d408ffa96e21c129a79041ea Signed-off-by: David Pursehouse --- org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java | 1 + 1 file changed, 1 insertion(+) 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 977f95341..ee6095aa7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java @@ -102,6 +102,7 @@ public void formatMerge(OutputStream out, MergeResult res, * metadata * @throws IOException */ + @SuppressWarnings("unchecked") public void formatMerge(OutputStream out, MergeResult res, String baseName, String oursName, String theirsName, String charsetName) throws IOException { List names = new ArrayList(3);