motiejus
/
jgit
1
Fork 0
Code Releases Activity

MergeFormatterPass: Remove constructor taking charset name as string 

Since this constructor is package-private, so instead of deprecating
it, we can remove it right away.

Change-Id: I84ba72e8c94fb09412bbf7ce73b7eec72f61e964
Signed-off-by: Jonathan Nieder <jrn@google.com>
This commit is contained in:
Jonathan Nieder 2018-09-30 17:08:32 -07:00
parent 7d19b18c7d
commit 1f4ab45166
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java
View File

@ -83,7 +83,7 @@ public class MergeFormatter {
@Deprecated
public void formatMerge(OutputStream out, MergeResult<RawText> res,
List<String> seqName, String charsetName) throws IOException {
new MergeFormatterPass(out, res, seqName, charsetName).formatMerge();
formatMerge(out, res, seqName, Charset.forName(charsetName));
}
/**

25
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatterPass.java
View File

@ -68,31 +68,6 @@ class MergeFormatterPass {
// a conflict
/**
* @deprecated use
* {@link #MergeFormatterPass(OutputStream, MergeResult, List, Charset)}
* instead.
* @param out
* the {@link java.io.OutputStream} where to write the textual
* presentation
* @param res
* the merge result which should be presented
* @param seqName
* When a conflict is reported each conflicting range will get a
* name. This name is following the "&lt;&lt;&lt;&lt;&lt;&lt;&lt;
* " or "&gt;&gt;&gt;&gt;&gt;&gt;&gt; " conflict markers. The
* names for the sequences are given in this list
* @param charsetName
* the name of the character set used when writing conflict
* metadata
*/
@Deprecated
MergeFormatterPass(OutputStream out, MergeResult<RawText> res, List<String> seqName,
String charsetName) {
this(out, res, seqName, Charset.forName(charsetName));
}
/**
*
* @param out
* the {@link java.io.OutputStream} where to write the textual
* presentation