Bug 491847 - Start using StandardCharsets Y20160421-1000I20160419-0800I20160417-1112

For bundles that are at Java 1.7+ level we can start using
StandardCharsets to eliminate the need to handle
UnsupportedEncodingExceoption, reduce risk of mistyping encoding, mark
the strings as non-nls and etc.

Change-Id: I57b45096b934ef4f1a99fad4bb88a8a9ce019005
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

2 files changed, 4 insertions, 2 deletions

diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java
index 7038662aa..236faa61f 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/dynamic/DynamicXHTMLProcessorTest.java
@@ -15,6 +15,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerConfigurationException;
@@ -54,7 +55,7 @@ public class DynamicXHTMLProcessorTest {
 	}
 
 	private String readStream(InputStream is) throws Exception {
-		try (InputStreamReader inputStreamReader = new InputStreamReader(is, "UTF-8")) {
+		try (InputStreamReader inputStreamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
 			StringBuffer buffer = new StringBuffer();
 			char[] cbuf = new char[256];
 			int len;
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemoteTestUtils.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemoteTestUtils.java
index bbf79b072..288d85bb8 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemoteTestUtils.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemoteTestUtils.java
@@ -16,6 +16,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
@@ -56,7 +57,7 @@ public class RemoteTestUtils {
 	public static String readFromURL(URL url) throws IOException,
 			UnsupportedEncodingException {
 		try (InputStream is = url.openStream();
-				InputStreamReader inputStreamReader = new InputStreamReader(is, "UTF-8")) {
+				InputStreamReader inputStreamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
 			StringBuffer buffer = new StringBuffer();
 			char[] cbuf = new char[256];
 			int len;