Changeset 11042 in josm for trunk/src/org

Timestamp:

2016-09-22T23:08:23+02:00 (8 years ago)

Author:

simon04

Message:

Use CachedFile#getContentReader where possible

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/Projections.java (modified) (2 diffs)
• data/validation/tests/OpeningHourTest.java (modified) (2 diffs)
• data/validation/tests/TagChecker.java (modified) (3 diffs)
• gui/mappaint/MapPaintStyles.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -4 +4 @@
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -272 +269 @@
         try (
             CachedFile cf = new CachedFile(path);
-            InputStream in = cf.getInputStream();
-            BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+            BufferedReader r = cf.getContentReader()
         ) {
             return loadProjectionDefinitions(r);

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.InputStreamReader;
 import java.io.Reader;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54 +52 @@
         if (ENGINE != null) {
             try (CachedFile cf = new CachedFile("resource://data/validator/opening_hours.js");
-                 Reader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {
+                 Reader reader = cf.getContentReader()) {
                 ENGINE.eval(reader);
                 ENGINE.eval("var opening_hours = require('opening_hours');");

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -9 +9 @@
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -53 +52 @@
 import org.openstreetmap.josm.gui.widgets.EditableList;
 import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -169 +167 @@
             try (
                 CachedFile cf = new CachedFile(source);
-                InputStream s = cf.getInputStream();
-                BufferedReader reader = new BufferedReader(UTFInputStreamReader.create(s));
+                BufferedReader reader = cf.getContentReader()
             ) {
                 String okValue = null;

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -6 +6 @@
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -314 +313 @@
             if (Utils.hasExtension(entry.url, "mapcss"))
                 return new MapCSSStyleSource(entry);
-            try (InputStreamReader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {
+            try (Reader reader = cf.getContentReader()) {
                 WHILE: while (true) {
                     int c = reader.read();