Changeset 14746 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

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

Author:

simon04

Message:

Refactoring: use StandardCharsets

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• MapCSSParser.jj (modified) (2 diffs)
• MapCSSStyleSource.java (modified) (3 diffs)

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);