Changeset 7071 in josm for trunk

Timestamp:

2014-05-07T11:58:07+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9990 - Fix session writing regression

Location:

trunk/src/org/openstreetmap/josm/io/session

Files:

• GpxTracksSessionExporter.java (modified) (1 diff)
• MarkerSessionExporter.java (modified) (1 diff)
• OsmDataSessionExporter.java (modified) (1 diff)

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

@@ -179 +179 @@
     }
 
-    protected void addDataFile(OutputStream out) throws IOException {
-        try (
-            Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
-            GpxWriter w = new GpxWriter(new PrintWriter(writer))
-        ) {
-            w.write(layer.data);
-            w.flush();
-        }
+    @SuppressWarnings("resource")
+    protected void addDataFile(OutputStream out) {
+        Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
+        GpxWriter w = new GpxWriter(new PrintWriter(writer));
+        w.write(layer.data);
+        w.flush();
     }
 }

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

@@ -84 +84 @@
     }
 
-    protected void addDataFile(OutputStream out) throws IOException {
-        try (
-            Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
-            MarkerWriter w = new MarkerWriter(new PrintWriter(writer))
-        ) {
-            w.write(layer);
-            w.flush();
-        }
+    @SuppressWarnings("resource")
+    protected void addDataFile(OutputStream out) {
+        Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
+        MarkerWriter w = new MarkerWriter(new PrintWriter(writer));
+        w.write(layer);
+        w.flush();
     }
 

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

@@ -209 +209 @@
     }
 
-    protected void addDataFile(OutputStream out) throws IOException {
-        try (
-            Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
-            OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, layer.data.getVersion())
-        ) {
-            layer.data.getReadLock().lock();
-            try {
-                w.writeLayer(layer);
-                w.flush();
-            } finally {
-                layer.data.getReadLock().unlock();
-            }
+    protected void addDataFile(OutputStream out) {
+        Writer writer = new OutputStreamWriter(out, Utils.UTF_8);
+        OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, layer.data.getVersion());
+        layer.data.getReadLock().lock();
+        try {
+            w.writeLayer(layer);
+            w.flush();
+        } finally {
+            layer.data.getReadLock().unlock();
         }
     }
 }
-