Changeset 18009 in josm for trunk/src/org

Timestamp:

2021-07-13T00:27:59+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20860 - make sure to not try to close a note when none is selected

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/NoteData.java (modified) (1 diff)
• gui/dialogs/NotesDialog.java (modified) (1 diff)

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

@@ -224 +224 @@
             Logging.debug("closing note {0} with comment: {1}", note.getId(), text);
         }
-        NoteComment comment = new NoteComment(Instant.now(), getCurrentUser(), text, NoteComment.Action.CLOSED, true);
-        note.addComment(comment);
+        Instant now = Instant.now();
+        note.addComment(new NoteComment(now, getCurrentUser(), text, NoteComment.Action.CLOSED, true));
         note.setState(State.CLOSED);
-        note.setClosedAt(Instant.now());
+        note.setClosedAt(now);
         dataUpdated();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -404 +404 @@
             }
             Note note = displayList.getSelectedValue();
-            int selectedIndex = displayList.getSelectedIndex();
-            noteData.closeNote(note, dialog.getInputText());
-            noteData.setSelectedNote(model.getElementAt(selectedIndex));
+            if (note != null) {
+                int selectedIndex = displayList.getSelectedIndex();
+                noteData.closeNote(note, dialog.getInputText());
+                noteData.setSelectedNote(model.getElementAt(selectedIndex));
+            }
         }
     }