Changeset 4802 in josm for trunk/src

Timestamp:

2012-01-16T19:00:24+01:00 (12 years ago)

Author:

simon04

Message:

see #7271 - reuse existing UTFInputStreamReader for handling BOM from GetCapabilities response

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java

@@ -18 +18 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.net.MalformedURLException;
@@ -60 +59 @@
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
+import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.GBC;
 import org.w3c.dom.Document;
@@ -344 +344 @@
             URLConnection openConnection = getCapabilitiesUrl.openConnection();
             InputStream inputStream = openConnection.getInputStream();
-            BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+            BufferedReader br = new BufferedReader(UTFInputStreamReader.create(inputStream, "UTF-8"));
             String line;
             StringBuilder ba = new StringBuilder();
-            boolean isFirstLine = true;
             while ((line = br.readLine()) != null) {
-                // fix #7271
-                // see http://www.rgagnon.com/javadetails/java-handle-utf8-file-with-bom.html
-                final String UTF8_BOM = "\uFEFF";
-                if (isFirstLine && line.startsWith(UTF8_BOM)) {
-                    System.out.println("Removing UTF8_BOM (0xFEFF) from GetCapabilities response");
-                    line = line.substring(1);
-                    isFirstLine = false;
-                }
                 ba.append(line);
                 ba.append("\n");