Changeset 7082 in josm for trunk/src/org/openstreetmap/josm/gui/help

Timestamp:

2014-05-09T05:32:37+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - replace Utils.UTF_8 by StandardCharsets.UTF_8, new in Java 7

Location:

trunk/src/org/openstreetmap/josm/gui/help

Files:

• HelpBrowser.java (modified) (3 diffs)
• HelpContentReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -16 +16 @@
 import java.io.InputStreamReader;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.Observable;
@@ -52 +53 @@
 import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -138 +138 @@
         try (BufferedReader reader = new BufferedReader(
                 new InputStreamReader(
-                        getClass().getResourceAsStream("/data/help-browser.css"), Utils.UTF_8
+                        getClass().getResourceAsStream("/data/help-browser.css"), StandardCharsets.UTF_8
                 )
         )) {

trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java

@@ -8 +8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 import org.openstreetmap.josm.tools.Utils;
@@ -49 +50 @@
             con = Utils.openHttpConnection(u);
             con.connect();
-            try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), Utils.UTF_8))) {
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8))) {
                 return prepareHelpContent(in, dotest, u);
             }