Changeset 13437 in josm for trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java

Timestamp:

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

Author:

Don-vip

Message:

fix #15967 - proper loading of notes layers

File:

• trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java (modified) (3 diffs)

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;