Index: /trunk/src/org/openstreetmap/josm/data/notes/Note.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/notes/Note.java (revision 17836) +++ /trunk/src/org/openstreetmap/josm/data/notes/Note.java (revision 17837) @@ -53,13 +53,9 @@ /** Sorts notes by user, then creation date */ - public static final Comparator USER_COMPARATOR = (n1, n2) -> { - String n1User = n1.getFirstComment().getUser().getName(); - String n2User = n2.getFirstComment().getUser().getName(); - return n1User.equals(n2User) ? DATE_COMPARATOR.compare(n1, n2) : n1User.compareTo(n2User); - }; + public static final Comparator USER_COMPARATOR = + Comparator.comparing(Note::getUserName, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(DATE_COMPARATOR); /** Sorts notes by the last modified date */ - public static final Comparator LAST_ACTION_COMPARATOR = - (n1, n2) -> NoteComment.DATE_COMPARATOR.compare(n1.getLastComment(), n2.getLastComment()); + public static final Comparator LAST_ACTION_COMPARATOR = Comparator.comparing(Note::getLastComment, NoteComment.DATE_COMPARATOR); private long id; @@ -181,4 +177,8 @@ public NoteComment getFirstComment() { return comments.isEmpty() ? null : comments.get(0); + } + + private String getUserName() { + return getFirstComment() == null ? null : getFirstComment().getUser().getName(); } Index: /trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java (revision 17836) +++ /trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java (revision 17837) @@ -40,5 +40,5 @@ /** Sorts note comments strictly by creation date */ - public static final Comparator DATE_COMPARATOR = Comparator.comparing(n -> n.commentTimestamp); + public static final Comparator DATE_COMPARATOR = Comparator.nullsLast(Comparator.comparing(n -> n.commentTimestamp)); /** Index: /trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java (revision 17836) +++ /trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java (revision 17837) @@ -6,4 +6,5 @@ import java.time.Instant; +import java.util.List; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,4 +12,5 @@ import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.io.NoteReader; import org.openstreetmap.josm.testutils.JOSMTestRules; @@ -69,3 +71,54 @@ .verify(); } + + @Test + void testSorting() throws Exception { + List list = new NoteReader("" + + "\n" + + "\n" + + "\n"+ + " 4\n"+ + " http://api.openstreetmap.org/api/0.6/notes/4\n"+ + " http://api.openstreetmap.org/api/0.6/notes/4/reopen\n"+ + " 2013-04-24 08:07:02 UTC\n"+ + " closed\n"+ + " 2013-04-24 08:08:51 UTC\n"+ + " \n"+ + " \n"+ + " 2013-04-24 08:07:02 UTC\n"+ + " 1626\n"+ + " FredB\n"+ + " http://www.openstreetmap.org/user/FredB\n"+ + " opened\n"+ + " test\n"+ + " <p>test</p>\n"+ + " \n"+ + " \n"+ + " 2013-04-24 08:08:51 UTC\n"+ + " 1626\n"+ + " FredB\n"+ + " http://www.openstreetmap.org/user/FredB\n"+ + " closed\n"+ + " \n"+ + " <p></p>\n"+ + " \n"+ + " \n"+ + "\n"+ + "\n" + + " 1396945\n" + + " https://www.openstreetmap.org/api/0.6/notes/1396945\n" + + " https://www.openstreetmap.org/api/0.6/notes/1396945/comment\n" + + " https://www.openstreetmap.org/api/0.6/notes/1396945/close\n" + + " 2018-05-17 15:41:06 UTC\n" + + " open\n" + + " \n" + + " \n" + + "\n" + + "\n").parse(); + // Non-regression test for ticket #20824 + list.sort(Note.DATE_COMPARATOR); + list.sort(Note.DEFAULT_COMPARATOR); + list.sort(Note.LAST_ACTION_COMPARATOR); + list.sort(Note.USER_COMPARATOR); + } }