motiejus
/
jgit
1
Fork 0
Code Releases Activity

Stop using deprecated Constants.CHARACTER_ENCODING 

Change-Id: I105b8a05bc64f249879a0795a059958553cc60c6
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2019-08-09 12:11:41 +09:00
parent 5a88815b1c
commit ad02a7cbad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java
View File

@ -302,7 +302,7 @@ private String merge(String commonBase, String ours, String theirs) throws IOExc
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);
fmt.formatMerge(bo, r, "B", "O", "T", UTF_8.name());
return new String(bo.toByteArray(), UTF_8);
}

4
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -46,11 +46,11 @@
*/
package org.eclipse.jgit.merge;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.time.Instant.EPOCH;
import static org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm.HISTOGRAM;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DIFF_SECTION;
import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_ALGORITHM;
import static org.eclipse.jgit.lib.Constants.CHARACTER_ENCODING;
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
import java.io.BufferedOutputStream;
@ -1029,7 +1029,7 @@ private TemporaryBuffer doMerge(MergeResult<RawText> result)
db != null ? nonNullRepo().getDirectory() : null, inCoreLimit);
try {
new MergeFormatter().formatMerge(buf, result,
Arrays.asList(commitNames), CHARACTER_ENCODING);
Arrays.asList(commitNames), UTF_8.name());
buf.close();
} catch (IOException e) {
buf.destroy();