Changeset 6644 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-01-06T18:22:54+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9542 - handle BOM in UTF-8 tagchecker config files

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (5 diffs)

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.event.ActionEvent;
@@ -13 +11 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -37 +33 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -57 +50 @@
 import org.openstreetmap.josm.gui.widgets.EditableList;
 import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -173 +167 @@
             try {
                 MirroredInputStream s = new MirroredInputStream(source);
-                reader = new BufferedReader(new InputStreamReader(s, Utils.UTF_8));
+                reader = new BufferedReader(UTFInputStreamReader.create(s, "UTF-8"));
 
                 String okValue = null;