From 03689063533ec7cffa1258eec7c2bb5295541611 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 15 Feb 2019 16:46:37 +0900 Subject: [PATCH] CommitBuilder: Deprecate setEncoding(String) Deprecate the method in favor of setEncoding(Charset). Update the only caller in the code base that was still using the deprecated variant. Change-Id: I6357f2d0c727007013c72e9d5b7c72a3f5f3f2b1 Signed-off-by: David Pursehouse --- .../org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java | 2 +- org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java index 96caa01a9..c6138495f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java @@ -538,7 +538,7 @@ public void test024_createCommitNonAscii() throws IOException { 4294967295000L, 60)); commit.setCommitter(new PersonIdent("Joe Hacker", "joe2@example.com", 4294967295000L, 60)); - commit.setEncoding("ISO-8859-1"); + commit.setEncoding(ISO_8859_1); commit.setMessage("\u00dcbergeeks"); ObjectId cid = insertCommit(commit); assertEquals("2979b39d385014b33287054b87f77bcb3ecb5ebf", cid.name()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java index cac97ede4..6cbddec54 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java @@ -295,7 +295,9 @@ public void setMessage(String newMessage) { * @param encodingName * the encoding name. See * {@link java.nio.charset.Charset#forName(String)}. + * @deprecated use {@link #setEncoding(Charset)} instead. */ + @Deprecated public void setEncoding(String encodingName) { encoding = Charset.forName(encodingName); }