Changeset 13437 in josm for trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

Timestamp:

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

Author:

Don-vip

Message:

fix #15967 - proper loading of notes layers

File:

• trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (modified) (1 diff)

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);
+        }
     }