Changeset 14746 in josm for trunk/src/org

Timestamp:

2019-01-27T22:26:35+01:00 (6 years ago)

Author:

simon04

Message:

Refactoring: use StandardCharsets

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (2 diffs)
• data/imagery/CachedAttributionBingAerialTileSource.java (modified) (2 diffs)
• gui/layer/AutosaveTask.java (modified) (3 diffs)
• gui/mappaint/mapcss/MapCSSParser.jj (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (3 diffs)
• tools/bugreport/BugReportSender.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -20 +20 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Map.Entry;
 
@@ -236 +237 @@
             displayErrorMessage(ta, tr("Failed to locate resource ''{0}''.", filePath));
         } else {
-            try (InputStreamReader reader = new InputStreamReader(is, "UTF-8");
-                 BufferedReader br = new BufferedReader(reader)) {
+            try (BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
                 String line;
                 while ((line = br.readLine()) != null) {

trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java

@@ -6 +6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -58 +59 @@
             final String r = HttpClient.create(u).connect().fetchContent();
             Logging.info("Successfully loaded Bing attribution data.");
-            return r.getBytes("UTF-8");
+            return r.getBytes(StandardCharsets.UTF_8);
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java

@@ -10 +10 @@
 import java.io.FileFilter;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.lang.management.ManagementFactory;
 import java.nio.charset.StandardCharsets;
@@ -16 +15 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Deque;
@@ -223 +223 @@
     private static void createNewPidFile(File autosaveDir, String filename) {
         File pidFile = new File(autosaveDir, filename+".pid");
-        try (PrintStream ps = new PrintStream(pidFile, "UTF-8")) {
-            ps.println(ManagementFactory.getRuntimeMXBean().getName());
+        try {
+            final String content = ManagementFactory.getRuntimeMXBean().getName();
+            Files.write(pidFile.toPath(), Collections.singleton(content), StandardCharsets.UTF_8);
         } catch (IOException | SecurityException t) {
             Logging.error(t);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -89 +89 @@
      * @param initState initial state
      */
+    @Deprecated
     public MapCSSParser(InputStream in, String encoding, LexicalState initState) {
         this(createTokenManager(in, encoding, initState));
@@ -94 +95 @@
     }
 
+    @Deprecated
     protected static MapCSSParserTokenManager createTokenManager(InputStream in, String encoding, LexicalState initState) {
         SimpleCharStream scs;

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -5 +5 @@
 
 import java.awt.Color;
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Reader;
+import java.io.StringReader;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
@@ -62 +65 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.LineElement;
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.I18n;
@@ -426 +430 @@
             canvasRules.clear();
             try (InputStream in = getSourceInputStream()) {
-                try {
+                try (Reader reader = new BufferedReader(UTFInputStreamReader.create(in))) {
                     // evaluate @media { ... } blocks
-                    MapCSSParser preprocessor = new MapCSSParser(in, "UTF-8", MapCSSParser.LexicalState.PREPROCESSOR);
+                    MapCSSParser preprocessor = new MapCSSParser(reader, MapCSSParser.LexicalState.PREPROCESSOR);
                     String mapcss = preprocessor.pp_root(this);
 
                     // do the actual mapcss parsing
-                    InputStream in2 = new ByteArrayInputStream(mapcss.getBytes(StandardCharsets.UTF_8));
-                    MapCSSParser parser = new MapCSSParser(in2, "UTF-8", MapCSSParser.LexicalState.DEFAULT);
+                    Reader in2 = new StringReader(mapcss);
+                    MapCSSParser parser = new MapCSSParser(in2, MapCSSParser.LexicalState.DEFAULT);
                     parser.sheet(this);
 

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

@@ -5 +5 @@
 import java.io.InputStream;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -116 +115 @@
             String text = Utils.strip(statusText);
             String pdata = Base64.getEncoder().encodeToString(text.getBytes(StandardCharsets.UTF_8));
-            String postQuery = "pdata=" + URLEncoder.encode(pdata, "UTF-8");
+            String postQuery = "pdata=" + Utils.encodeUrl(pdata);
             HttpClient client = HttpClient.create(new URL(getJOSMTicketURL()), "POST")
                     .setHeader("Content-Type", "application/x-www-form-urlencoded")