Changeset 7082 in josm for trunk/src/org/openstreetmap/josm/data/projection
- Timestamp:
- 2014-05-09T05:32:37+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/projection
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/projection/Projections.java
r7048 r7082 6 6 import java.io.InputStream; 7 7 import java.io.InputStreamReader; 8 import java.nio.charset.StandardCharsets; 8 9 import java.util.Collection; 9 10 import java.util.Collections; … … 33 34 import org.openstreetmap.josm.io.MirroredInputStream; 34 35 import org.openstreetmap.josm.tools.Pair; 35 import org.openstreetmap.josm.tools.Utils;36 36 37 37 /** … … 134 134 try ( 135 135 InputStream in = new MirroredInputStream("resource://data/projection/epsg"); 136 BufferedReader r = new BufferedReader(new InputStreamReader(in, Utils.UTF_8));136 BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)); 137 137 ) { 138 138 String line, lastline = ""; -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
r7037 r7082 23 23 import java.io.InputStream; 24 24 import java.io.Serializable; 25 import java.nio.charset.StandardCharsets; 25 26 import java.util.ArrayList; 26 27 import java.util.HashMap; 27 28 import java.util.List; 28 29 import org.openstreetmap.josm.tools.Utils;30 29 31 30 /** … … 104 103 topLevelSubGrid = null; 105 104 in.read(b8); 106 String overviewHeaderCountId = new String(b8, Utils.UTF_8);105 String overviewHeaderCountId = new String(b8, StandardCharsets.UTF_8); 107 106 if (!"NUM_OREC".equals(overviewHeaderCountId)) 108 107 throw new IllegalArgumentException("Input file is not an NTv2 grid shift file"); … … 127 126 in.read(b8); 128 127 in.read(b8); 129 shiftType = new String(b8, Utils.UTF_8);128 shiftType = new String(b8, StandardCharsets.UTF_8); 130 129 in.read(b8); 131 130 in.read(b8); -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
r7025 r7082 23 23 import java.io.InputStream; 24 24 import java.io.Serializable; 25 import java.nio.charset.StandardCharsets; 25 26 26 27 import org.openstreetmap.josm.Main; … … 75 76 in.read(b8); 76 77 in.read(b8); 77 subGridName = new String(b8, Utils.UTF_8).trim();78 in.read(b8); 79 in.read(b8); 80 parentSubGridName = new String(b8, Utils.UTF_8).trim();81 in.read(b8); 82 in.read(b8); 83 created = new String(b8, Utils.UTF_8);84 in.read(b8); 85 in.read(b8); 86 updated = new String(b8, Utils.UTF_8);78 subGridName = new String(b8, StandardCharsets.UTF_8).trim(); 79 in.read(b8); 80 in.read(b8); 81 parentSubGridName = new String(b8, StandardCharsets.UTF_8).trim(); 82 in.read(b8); 83 in.read(b8); 84 created = new String(b8, StandardCharsets.UTF_8); 85 in.read(b8); 86 in.read(b8); 87 updated = new String(b8, StandardCharsets.UTF_8); 87 88 in.read(b8); 88 89 in.read(b8);
Note:
See TracChangeset
for help on using the changeset viewer.