Changeset 7847 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-12-20T02:21:22+01:00 (9 years ago)

Author:

bastiK

Message:

fixed #10872 - handle BOM for preset files

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
@@ -238 +239 @@
                 zipIcons = cf.getFile();
             }
-            try (InputStreamReader r = new InputStreamReader(zip == null ? cf.getInputStream() : zip, StandardCharsets.UTF_8)) {
+            try (InputStreamReader r = UTFInputStreamReader.create(zip == null ? cf.getInputStream() : zip)) {
                 tp = readAll(new BufferedReader(r), validate);
             }