Index: src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 7859) +++ src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (working copy) @@ -226,7 +226,7 @@ } String toolTipText = userName + " @ " + sdf.format(note.getCreatedAt()); JLabel jlabel = (JLabel)comp; - jlabel.setText(text); + jlabel.setText(note.getId() + ": " +text); ImageIcon icon; if (note.getId() < 0) { icon = ICON_NEW_SMALL; Index: src/org/openstreetmap/josm/gui/layer/NoteLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 7859) +++ src/org/openstreetmap/josm/gui/layer/NoteLayer.java (working copy) @@ -110,14 +110,15 @@ } if (noteData.getSelectedNote() != null) { StringBuilder sb = new StringBuilder(""); + sb.append(tr("Note")); + sb.append(" " + noteData.getSelectedNote().getId()); List comments = noteData.getSelectedNote().getComments(); - String sep = ""; SimpleDateFormat dayFormat = new SimpleDateFormat("MMM d, yyyy"); for (NoteComment comment : comments) { String commentText = comment.getText(); //closing a note creates an empty comment that we don't want to show if (commentText != null && commentText.trim().length() > 0) { - sb.append(sep); + sb.append("
"); String userName = XmlWriter.encode(comment.getUser().getName()); if (userName == null || userName.trim().length() == 0) { userName = "<Anonymous>"; @@ -130,7 +131,6 @@ htmlText = htmlText.replace(" ", "
"); //encode method leaves us with entity instead of \n sb.append(htmlText); } - sep = "
"; } sb.append(""); JToolTip toolTip = new JToolTip();