Changeset 7082 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2014-05-09T05:32:37+02:00 (9 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/plugins

Files:

• PluginListParser.java (modified) (3 diffs)
• ReadRemotePluginInformationTask.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java

@@ -9 +9 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -37 +37 @@
         try {
             return new PluginInformation(
-                    new ByteArrayInputStream(manifest.getBytes(Utils.UTF_8)),
+                    new ByteArrayInputStream(manifest.getBytes(StandardCharsets.UTF_8)),
                     name.substring(0, name.length() - 4),
                     url
@@ -61 +61 @@
         BufferedReader r = null;
         try {
-            r = new BufferedReader(new InputStreamReader(in, Utils.UTF_8));
+            r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
             String name = null;
             String url = null;

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -20 +20 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -172 +173 @@
                 connection.setRequestProperty("Accept-Charset", "utf-8");
             }
-            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8))) {
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
                 StringBuilder sb = new StringBuilder();
                 String line;
@@ -204 +205 @@
         try (InputStream errStream = connection.getErrorStream()) {
             if (errStream != null) {
-                try (BufferedReader err = new BufferedReader(new InputStreamReader(errStream, Utils.UTF_8))) {
+                try (BufferedReader err = new BufferedReader(new InputStreamReader(errStream, StandardCharsets.UTF_8))) {
                     String line;
                     while ((line = err.readLine()) != null) {
@@ -323 +324 @@
         File cacheFile = createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST);
         getProgressMonitor().subTask(tr("Writing plugin list to local cache ''{0}''", cacheFile.toString()));
-        try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), Utils.UTF_8))) {
+        try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), StandardCharsets.UTF_8))) {
             writer.write(list);
             writer.flush();
@@ -363 +364 @@
         try {
             getProgressMonitor().subTask(tr("Parsing plugin list from site ''{0}''", site));
-            InputStream in = new ByteArrayInputStream(doc.getBytes(Utils.UTF_8));
+            InputStream in = new ByteArrayInputStream(doc.getBytes(StandardCharsets.UTF_8));
             List<PluginInformation> pis = new PluginListParser().parse(in);
             availablePlugins.addAll(filterDeprecatedPlugins(pis));