Changeset 17269 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-10-26T18:20:09+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #19993 - handle multiline note comments in notes dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.KeyEvent;
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -51 +51 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.date.DateUtils;
-import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -229 +229 @@
     }
 
-    private static class NoteRenderer implements ListCellRenderer<Note> {
+    static class NoteRenderer implements ListCellRenderer<Note> {
 
         private final DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
@@ -242 +242 @@
                 JLabel jlabel = (JLabel) comp;
                 if (fstComment != null) {
-                    String text = note.getFirstComment().getText();
-                    String userName = note.getFirstComment().getUser().getName();
+                    String text = fstComment.getText();
+                    String userName = fstComment.getUser().getName();
                     if (userName == null || userName.isEmpty()) {
                         userName = "<Anonymous>";
@@ -249 +249 @@
                     String toolTipText = userName + " @ " + dateFormat.format(note.getCreatedAt());
                     jlabel.setToolTipText(toolTipText);
-                    jlabel.setText(note.getId() + ": " +text);
+                    jlabel.setText(note.getId() + ": " +text.replace("\n\n", "\n").replace("\n", "; ").replace(":; ", ": "));
                 } else {
                     jlabel.setToolTipText(null);