Changeset 10162 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2016-04-28T18:30:07+02:00 (8 years ago)

Author:

bastiK

Message:

fixed #12799 - Error mousing over the editing area after loading a notes layer

File:

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

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

@@ -37 +37 @@
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.notes.Note.State;
+import org.openstreetmap.josm.data.notes.NoteComment;
 import org.openstreetmap.josm.data.osm.NoteData;
 import org.openstreetmap.josm.gui.MapView;
@@ -238 +239 @@
             Component comp = defaultListCellRenderer.getListCellRendererComponent(list, note, index, isSelected, cellHasFocus);
             if (note != null && comp instanceof JLabel) {
-                String text = note.getFirstComment().getText();
-                String userName = note.getFirstComment().getUser().getName();
-                if (userName == null || userName.isEmpty()) {
-                    userName = "<Anonymous>";
+                NoteComment fstComment = note.getFirstComment();
+                JLabel jlabel = (JLabel) comp;
+                if (fstComment != null) {
+                    String text = note.getFirstComment().getText();
+                    String userName = note.getFirstComment().getUser().getName();
+                    if (userName == null || userName.isEmpty()) {
+                        userName = "<Anonymous>";
+                    }
+                    String toolTipText = userName + " @ " + dateFormat.format(note.getCreatedAt());
+                    jlabel.setToolTipText(toolTipText);
+                    jlabel.setText(note.getId() + ": " +text);
+                } else {
+                    jlabel.setToolTipText(null);
+                    jlabel.setText(Long.toString(note.getId()));
                 }
-                String toolTipText = userName + " @ " + dateFormat.format(note.getCreatedAt());
-                JLabel jlabel = (JLabel) comp;
-                jlabel.setText(note.getId() + ": " +text);
                 ImageIcon icon;
                 if (note.getId() < 0) {
@@ -255 +263 @@
                 }
                 jlabel.setIcon(icon);
-                jlabel.setToolTipText(toolTipText);
             }
             return comp;