Changeset 9746 in josm for trunk/src/org/openstreetmap/josm/io/NoteImporter.java

Timestamp:

2016-02-06T22:04:49+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12497 - add support for notes in session files

File:

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

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

@@ -37 +37 @@
         }
         try (InputStream is = Compression.getUncompressedFileInputStream(file)) {
-            final List<Note> fileNotes = new NoteReader(is).parse();
-
-            List<NoteLayer> noteLayers = null;
-            if (Main.map != null) {
-                noteLayers = Main.map.mapView.getLayersOfType(NoteLayer.class);
-            }
-            if (noteLayers != null && !noteLayers.isEmpty()) {
-                noteLayers.get(0).getNoteData().addNotes(fileNotes);
-            } else {
+            final NoteLayer layer = loadLayer(is, file, file.getName(), progressMonitor);
+            if (!Main.map.mapView.hasLayer(layer)) {
                 GuiHelper.runInEDT(new Runnable() {
                     @Override
                     public void run() {
-                        Main.main.addLayer(new NoteLayer(fileNotes, file.getName()));
+                        Main.main.addLayer(layer);
                     }
                 });
@@ -59 +52 @@
         }
     }
+
+    /**
+     * Load note layer from InputStream.
+     * @param in input stream
+     * @param associatedFile filename of data (can be <code>null</code> if the stream does not come from a file)
+     * @param layerName name of generated layer
+     * @param progressMonitor handler for progress monitoring and canceling
+     * @return note layer
+     * @throws IOException
+     * @throws SAXException
+     * @since 9746
+     */
+    public NoteLayer loadLayer(InputStream in, final File associatedFile, final String layerName, ProgressMonitor progressMonitor)
+            throws SAXException, IOException {
+        final List<Note> fileNotes = new NoteReader(in).parse();
+        List<NoteLayer> noteLayers = null;
+        if (Main.map != null) {
+            noteLayers = Main.map.mapView.getLayersOfType(NoteLayer.class);
+        }
+        final NoteLayer layer;
+        if (noteLayers != null && !noteLayers.isEmpty()) {
+            layer = noteLayers.get(0);
+            layer.getNoteData().addNotes(fileNotes);
+        } else {
+            layer = new NoteLayer(fileNotes, associatedFile != null ? associatedFile.getName() : tr("Notes"));
+        }
+        return layer;
+    }
 }