Changeset 11042 in josm
- Timestamp:
- 2016-09-22T23:08:23+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/projection/Projections.java
r10469 r11042 4 4 import java.io.BufferedReader; 5 5 import java.io.IOException; 6 import java.io.InputStream;7 import java.io.InputStreamReader;8 import java.nio.charset.StandardCharsets;9 6 import java.util.ArrayList; 10 7 import java.util.Collection; … … 272 269 try ( 273 270 CachedFile cf = new CachedFile(path); 274 InputStream in = cf.getInputStream(); 275 BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)); 271 BufferedReader r = cf.getContentReader() 276 272 ) { 277 273 return loadProjectionDefinitions(r); -
trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
r10978 r11042 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import java.io.InputStreamReader;7 6 import java.io.Reader; 8 import java.nio.charset.StandardCharsets;9 7 import java.util.ArrayList; 10 8 import java.util.Arrays; … … 54 52 if (ENGINE != null) { 55 53 try (CachedFile cf = new CachedFile("resource://data/validator/opening_hours.js"); 56 Reader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {54 Reader reader = cf.getContentReader()) { 57 55 ENGINE.eval(reader); 58 56 ENGINE.eval("var opening_hours = require('opening_hours');"); -
trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
r10632 r11042 9 9 import java.io.BufferedReader; 10 10 import java.io.IOException; 11 import java.io.InputStream;12 11 import java.text.MessageFormat; 13 12 import java.util.ArrayList; … … 53 52 import org.openstreetmap.josm.gui.widgets.EditableList; 54 53 import org.openstreetmap.josm.io.CachedFile; 55 import org.openstreetmap.josm.io.UTFInputStreamReader;56 54 import org.openstreetmap.josm.tools.GBC; 57 55 import org.openstreetmap.josm.tools.MultiMap; … … 169 167 try ( 170 168 CachedFile cf = new CachedFile(source); 171 InputStream s = cf.getInputStream(); 172 BufferedReader reader = new BufferedReader(UTFInputStreamReader.create(s)); 169 BufferedReader reader = cf.getContentReader() 173 170 ) { 174 171 String okValue = null; -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
r10927 r11042 6 6 import java.io.File; 7 7 import java.io.IOException; 8 import java.io.InputStreamReader; 9 import java.nio.charset.StandardCharsets; 8 import java.io.Reader; 10 9 import java.util.ArrayList; 11 10 import java.util.Arrays; … … 314 313 if (Utils.hasExtension(entry.url, "mapcss")) 315 314 return new MapCSSStyleSource(entry); 316 try ( InputStreamReader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {315 try (Reader reader = cf.getContentReader()) { 317 316 WHILE: while (true) { 318 317 int c = reader.read();
Note:
See TracChangeset
for help on using the changeset viewer.