diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2016-07-26 10:16:18 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2016-07-26 18:58:17 +0900 |
| commit | c15903ea3e69bee4a2fc99452e6cc4a9a7151da5 (patch) | |
| tree | 19ac242b0da9d49246dd0058e34f5a291e39f63a /org.eclipse.jgit | |
| parent | b8d861bfd5f7d63be0244e2339378533329ef964 (diff) | |
| download | jgit-c15903ea3e69bee4a2fc99452e6cc4a9a7151da5.tar.gz jgit-c15903ea3e69bee4a2fc99452e6cc4a9a7151da5.zip | |
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 <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 977f95341f..ee6095aa71 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 class MergeFormatter { * metadata * @throws IOException */ + @SuppressWarnings("unchecked") public void formatMerge(OutputStream out, MergeResult res, String baseName, String oursName, String theirsName, String charsetName) throws IOException { List<String> names = new ArrayList<String>(3); |