Changeset 13437 in josm for trunk

Timestamp:

2018-02-18T16:51:54+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15967 - proper loading of notes layers

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SessionLoadAction.java (modified) (1 diff)
• actions/UploadNotesAction.java (modified) (3 diffs)
• actions/downloadtasks/DownloadNotesTask.java (modified) (1 diff)
• data/osm/NoteData.java (modified) (1 diff)
• gui/io/importexport/NoteImporter.java (modified) (1 diff)
• gui/layer/MainLayerManager.java (modified) (1 diff)
• gui/layer/NoteLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java

@@ -138 +138 @@
                     if (canceled)
                         return;
-                    MainApplication.getLayerManager().addLayer(l);
+                    // NoteImporter directly loads notes into current note layer
+                    if (!MainApplication.getLayerManager().containsLayer(l)) {
+                        MainApplication.getLayerManager().addLayer(l);
+                    }
                 }
                 if (active != null) {

trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
-import java.util.List;
 
 import org.openstreetmap.josm.actions.upload.UploadNotesTask;
@@ -18 +17 @@
  * On click, it finds the note layer and fires off an upload task
  * with the note data contained in the layer.
- *
+ * @since 7699
  */
 public class UploadNotesAction extends JosmAction {
@@ -31 +30 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        List<NoteLayer> noteLayers = getLayerManager().getLayersOfType(NoteLayer.class);
-        NoteLayer layer;
-        if (!noteLayers.isEmpty()) {
-            layer = noteLayers.get(0);
-        } else {
+        NoteLayer layer = getLayerManager().getNoteLayer();
+        if (layer == null) {
             Logging.error("No note layer found");
             return;

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java

@@ -134 +134 @@
 
             noteLayer = new NoteLayer(notesData, tr("Notes"));
-            List<NoteLayer> noteLayers = MainApplication.getLayerManager().getLayersOfType(NoteLayer.class);
-            if (!noteLayers.isEmpty()) {
-                noteLayers.get(0).getNoteData().addNotes(notesData);
+            NoteLayer l = MainApplication.getLayerManager().getNoteLayer();
+            if (l != null) {
+                l.mergeFrom(noteLayer);
                 MapFrame map = MainApplication.getMap();
                 if (map != null && zoomAfterDownload) {

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -119 +119 @@
         }
         return false;
+    }
+
+    /**
+     * Merge notes from an existing note data.
+     * @param from existing note data
+     * @since 13437
+     */
+    public synchronized void mergeFrom(NoteData from) {
+        if (this != from) {
+            addNotes(from.noteList);
+        }
     }
 

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

@@ -68 +68 @@
             throws SAXException, IOException {
         final List<Note> fileNotes = new NoteReader(in).parse();
-        List<NoteLayer> noteLayers = null;
-        if (MainApplication.getMap() != null) {
-            noteLayers = MainApplication.getLayerManager().getLayersOfType(NoteLayer.class);
-        }
-        final NoteLayer layer;
-        if (noteLayers != null && !noteLayers.isEmpty()) {
-            layer = noteLayers.get(0);
+        NoteLayer layer = MainApplication.getLayerManager().getNoteLayer();
+        if (layer != null) {
             layer.getNoteData().addNotes(fileNotes);
         } else {

trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

@@ -421 +421 @@
             return null;
         }
+    }
+
+    /**
+     * Returns the unique note layer, if present.
+     * @return the unique note layer, or null
+     * @since 13437
+     */
+    public NoteLayer getNoteLayer() {
+        List<NoteLayer> col = getLayersOfType(NoteLayer.class);
+        return col.isEmpty() ? null : col.get(0);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -349 +349 @@
     @Override
     public String getToolTipText() {
-        return trn("{0} note", "{0} notes", noteData.getNotes().size(), noteData.getNotes().size());
+        int size = noteData.getNotes().size();
+        return trn("{0} note", "{0} notes", size, size);
     }
 
     @Override
     public void mergeFrom(Layer from) {
-        throw new UnsupportedOperationException("Notes layer does not support merging yet");
+        if (from instanceof NoteLayer && this != from) {
+            noteData.mergeFrom(((NoteLayer) from).noteData);
+        }
     }