Changeset 6552 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

2013-12-28T00:30:15+01:00 (10 years ago)

Author:

simon04

Message:

Refactoring: introduce Utils.UTF_8 charset to avoid handling of UnsupportedEncodingException

According to the Javadoc of Charset, every implementation of the Java
platform is required to support UTF-8.

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• BookmarkList.java (modified) (1 diff)
• PlaceSelection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -188 +188 @@
                     Main.info("Try loading obsolete bookmarks file");
                     BufferedReader in = new BufferedReader(new InputStreamReader(
-                            new FileInputStream(bookmarkFile), "utf-8"));
+                            new FileInputStream(bookmarkFile), Utils.UTF_8));
 
                     for (String line = in.readLine(); line != null; line = in.readLine()) {

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -370 +370 @@
                 connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
                 InputStream inputStream = connection.getInputStream();
-                InputSource inputSource = new InputSource(new InputStreamReader(inputStream, "UTF-8"));
+                InputSource inputSource = new InputSource(new InputStreamReader(inputStream, Utils.UTF_8));
                 NameFinderResultParser parser = new NameFinderResultParser();
                 SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser);