Changeset 7082 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (5 diffs)

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

@@ -9 +9 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -53 +54 @@
     public final List<MapCSSRule> multipolygonRules = new ArrayList<>();
     public final List<MapCSSRule> canvasRules = new ArrayList<>();
-    
+
     private Color backgroundColorOverride;
     private String css = null;
@@ -93 +94 @@
                 MapCSSParser preprocessor = new MapCSSParser(in, "UTF-8", MapCSSParser.LexicalState.PREPROCESSOR);
                 String mapcss = preprocessor.pp_root(this);
-                
+
                 // do the actual mapcss parsing
-                InputStream in2 = new ByteArrayInputStream(mapcss.getBytes(Utils.UTF_8));
+                InputStream in2 = new ByteArrayInputStream(mapcss.getBytes(StandardCharsets.UTF_8));
                 MapCSSParser parser = new MapCSSParser(in2, "UTF-8", MapCSSParser.LexicalState.DEFAULT);
                 parser.sheet(this);
-                
+
                 loadMeta();
                 loadCanvas();
@@ -155 +156 @@
     public InputStream getSourceInputStream() throws IOException {
         if (css != null) {
-            return new ByteArrayInputStream(css.getBytes(Utils.UTF_8));
+            return new ByteArrayInputStream(css.getBytes(StandardCharsets.UTF_8));
         }
         MirroredInputStream in = getMirroredInputStream();
@@ -250 +251 @@
             }
         }
-        
+
         // the declaration indices are sorted, so it suffices to save the
         // last used index
         int lastDeclUsed = -1;
-        
+
         for (MapCSSRule r : matchingRules) {
             env.clearSelectorMatchingInformation();