Changeset 7562 in josm for trunk/src/org

Timestamp:

2014-09-19T01:13:02+02:00 (10 years ago)

Author:

Don-vip

Message:

see #9704 - more code refactorization

File:

• trunk/src/org/openstreetmap/josm/io/OsmExporter.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/OsmExporter.java

@@ -23 +23 @@
 
 /**
- * Exports data to an .Osm file.
+ * Exports data to an .osm file.
  * @since 1949
  */
@@ -68 +68 @@
     }
 
-    protected static final void checkOsmDataLayer(Layer layer) throws IllegalArgumentException {
+    protected static void checkOsmDataLayer(Layer layer) throws IllegalArgumentException {
         if (!(layer instanceof OsmDataLayer)) {
             throw new IllegalArgumentException(MessageFormat.format("Expected instance of OsmDataLayer. Got ''{0}''.", layer
@@ -90 +90 @@
             }
 
-            // create outputstream and wrap it with gzip or bzip, if necessary
-            try (
-                OutputStream out = getOutputStream(file);
-                Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);
-                OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, layer.data.getVersion());
-            ) {
-                layer.data.getReadLock().lock();
-                try {
-                    w.writeLayer(layer);
-                } finally {
-                    layer.data.getReadLock().unlock();
-                }
-            }
+            doSave(file, layer);
             if (noBackup || !Main.pref.getBoolean("save.keepbackup", false)) {
                 if (tmpFile != null) {
@@ -135 +123 @@
         }
     }
+
+    protected void doSave(File file, OsmDataLayer layer) throws IOException, FileNotFoundException {
+        // create outputstream and wrap it with gzip or bzip, if necessary
+        try (
+            OutputStream out = getOutputStream(file);
+            Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);
+            OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, layer.data.getVersion());
+        ) {
+            layer.data.getReadLock().lock();
+            try {
+                w.writeLayer(layer);
+            } finally {
+                layer.data.getReadLock().unlock();
+            }
+        }
+    }
 }