Changeset 7847 in josm for trunk/src


Ignore:
Timestamp:
2014-12-20T02:21:22+01:00 (5 years ago)
Author:
bastiK
Message:

fixed #10872 - handle BOM for preset files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java

    r7516 r7847  
    2626import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
    2727import org.openstreetmap.josm.io.CachedFile;
     28import org.openstreetmap.josm.io.UTFInputStreamReader;
    2829import org.openstreetmap.josm.tools.XmlObjectParser;
    2930import org.xml.sax.SAXException;
     
    238239                zipIcons = cf.getFile();
    239240            }
    240             try (InputStreamReader r = new InputStreamReader(zip == null ? cf.getInputStream() : zip, StandardCharsets.UTF_8)) {
     241            try (InputStreamReader r = UTFInputStreamReader.create(zip == null ? cf.getInputStream() : zip)) {
    241242                tp = readAll(new BufferedReader(r), validate);
    242243            }
Note: See TracChangeset for help on using the changeset viewer.