Changeset 7870 in josm for trunk

Timestamp:

2014-12-21T16:23:21+01:00 (10 years ago)

Author:

Don-vip

Message:

cleanup of NoteImporter

File:

• trunk/src/org/openstreetmap/josm/io/NoteImporter.java (modified) (5 diffs)

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

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -16 +15 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
 /**
  * File importer that reads note dump files (*.osn and .osn.bz2)
+ * @since 7538
  */
 public class NoteImporter extends FileImporter {
@@ -33 +32 @@
 
     @Override
-    public void importData(File file, ProgressMonitor progressMonitor) throws IOException {
-        Main.debug("importing notes file " + file.getAbsolutePath());
-        final String fileName = file.getName();
-        InputStream is;
-        if(fileName.endsWith(".bz2")) {
-            is = Utils.getBZip2InputStream(new FileInputStream(file));
-        } else {
-            is = new FileInputStream(file);
+    public void importData(final File file, ProgressMonitor progressMonitor) throws IOException {
+        if (Main.isDebugEnabled()) {
+            Main.debug("importing notes file " + file.getAbsolutePath());
         }
-        NoteReader reader = new NoteReader(is);
-        try {
-            final List<Note> fileNotes = reader.parse();
+        try (InputStream is = Compression.getUncompressedFileInputStream(file)) {
+            final List<Note> fileNotes = new NoteReader(is).parse();
 
             List<NoteLayer> noteLayers = null;
@@ -50 +43 @@
                 noteLayers = Main.map.mapView.getLayersOfType(NoteLayer.class);
             }
-            if (noteLayers != null && noteLayers.size() > 0) {
-                NoteLayer layer = noteLayers.get(0);
-                layer.getNoteData().addNotes(fileNotes);
+            if (noteLayers != null && !noteLayers.isEmpty()) {
+                noteLayers.get(0).getNoteData().addNotes(fileNotes);
             } else {
                 GuiHelper.runInEDT(new Runnable() {
                     @Override
                     public void run() {
-                        NoteLayer layer = new NoteLayer(fileNotes, fileName);
-                        Main.main.addLayer(layer);
+                        Main.main.addLayer(new NoteLayer(fileNotes, file.getName()));
                     }
                 });
@@ -67 +58 @@
             throw new IOException(e.getMessage(), e);
         }
-        finally {
-            Utils.close(is);
-        }
     }
-
 }