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>

4 files changed, 16 insertions, 8 deletions

diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java
index dac1f1c45..a62c5e85c 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java
@@ -10,12 +10,17 @@
  *******************************************************************************/
 package org.eclipse.help.internal.browser;
 
-import java.io.*;
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
+import java.io.BufferedWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
-import org.eclipse.help.internal.base.*;
+import org.eclipse.help.internal.base.HelpBasePlugin;
+
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.SimpleDateFormat;
 
 /**
  * Log for messages output by external browser processes.
@@ -59,7 +64,7 @@ public class BrowserLog {
 			return;
 		}
 		try (Writer outWriter = new BufferedWriter(
-				new OutputStreamWriter(new FileOutputStream(logFileName, true), "UTF-8"))) { //$NON-NLS-1$
+				new OutputStreamWriter(new FileOutputStream(logFileName, true), StandardCharsets.UTF_8))) {
 			if (newSession) {
 				newSession = false;
 				outWriter.write(LN + formatter.format(new Date())
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
index f9c5b1b5d..acdd67997 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/InfoCenter.java
@@ -12,6 +12,7 @@ package org.eclipse.help.internal.search;
 
 import java.io.*;
 import java.net.*;
+import java.nio.charset.StandardCharsets;
 import java.util.Hashtable;
 
 import javax.xml.parsers.*;
@@ -172,7 +173,7 @@ public final class InfoCenter implements ISearchEngine {
 			URLConnection connection = ProxyUtil.getConnection(url);
 			monitor.beginTask(HelpBaseResources.InfoCenter_connecting, 5);
 			is = connection.getInputStream();
-			try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, "utf-8"))) {//$NON-NLS-1$
+			try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
 				monitor.worked(1);
 				load(((Scope) scope).url, reader, collector, new SubProgressMonitor(monitor, 4));
 			}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
index 56edb4ac0..604006023 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSetManager.java
@@ -15,6 +15,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -205,7 +206,7 @@ public class WorkingSetManager implements IHelpWorkingSetManager {
 
 		if (stateFile.exists()) {
 			try (FileInputStream input = new FileInputStream(stateFile);
-					InputStreamReader reader = new InputStreamReader(input, "utf-8")) { //$NON-NLS-1$
+					InputStreamReader reader = new InputStreamReader(input, StandardCharsets.UTF_8)) {
 
 				InputSource inputSource = new InputSource(reader);
 				inputSource.setSystemId(stateFile.toString());
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
index 7ef2bbb2c..097400ab2 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
@@ -16,6 +16,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -728,7 +729,7 @@ public class HelpIndexBuilder {
 	private Document readXMLFile(File file) throws CoreException {
 		Document d = null;
 		try (InputStream stream = new FileInputStream(file);
-				InputStreamReader reader = new InputStreamReader(stream, "utf-8")) { //$NON-NLS-1$
+				InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
 			InputSource inputSource = new InputSource(reader);
 			inputSource.setSystemId(manifest.toString());