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:
parent
7d19b18c7d
commit
1f4ab45166
|
@ -83,7 +83,7 @@ public class MergeFormatter {
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public void formatMerge(OutputStream out, MergeResult<RawText> res,
|
public void formatMerge(OutputStream out, MergeResult<RawText> res,
|
||||||
List<String> seqName, String charsetName) throws IOException {
|
List<String> seqName, String charsetName) throws IOException {
|
||||||
new MergeFormatterPass(out, res, seqName, charsetName).formatMerge();
|
formatMerge(out, res, seqName, Charset.forName(charsetName));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -68,31 +68,6 @@ class MergeFormatterPass {
|
||||||
// a conflict
|
// 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 "<<<<<<<
|
|
||||||
* " or ">>>>>>> " 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
|
* @param out
|
||||||
* the {@link java.io.OutputStream} where to write the textual
|
* the {@link java.io.OutputStream} where to write the textual
|
||||||
* presentation
|
* presentation
|
||||||
|
|
Loading…
Reference in New Issue