Changeset 6552 in josm for trunk/src/org/openstreetmap/josm/io/session

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/io/session

Files:

• GpxTracksSessionExporter.java (modified) (3 diffs)
• MarkerSessionExporter.java (modified) (3 diffs)
• OsmDataSessionExporter.java (modified) (3 diffs)
• SessionWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java

@@ -17 +17 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.net.MalformedURLException;
@@ -39 +38 @@
 import org.openstreetmap.josm.io.session.SessionWriter.ExportSupport;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 
@@ -180 +180 @@
 
     protected void addDataFile(OutputStream out) throws IOException {
-        Writer writer = null;
-        try {
-            writer = new OutputStreamWriter(out, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
         GpxWriter w = new GpxWriter(new PrintWriter(writer));
         w.write(layer.data);

trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java

@@ -8 +8 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.util.Collection;
@@ -18 +17 @@
 import javax.swing.SwingConstants;
 
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 
@@ -86 +86 @@
 
     protected void addDataFile(OutputStream out) throws IOException {
-        Writer writer = null;
-        try {
-            writer = new OutputStreamWriter(out, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
         MarkerWriter w = new MarkerWriter(new PrintWriter(writer));
         w.write(layer);

trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

@@ -17 +17 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.net.MalformedURLException;
@@ -34 +33 @@
 import javax.swing.SwingConstants;
 
+import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 
@@ -214 +214 @@
 
     protected void addDataFile(OutputStream out) throws IOException {
-        Writer writer = null;
-        try {
-            writer = new OutputStreamWriter(out, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
         OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, layer.data.getVersion());
         layer.data.getReadLock().lock();

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -225 +225 @@
     public void writeJos(Document doc, OutputStream out) throws IOException {
         try {
-            OutputStreamWriter writer = new OutputStreamWriter(out, "utf-8");
+            OutputStreamWriter writer = new OutputStreamWriter(out, Utils.UTF_8);
             writer.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
             TransformerFactory transfac = TransformerFactory.newInstance();