Index: /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 8263) +++ /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 8264) @@ -2,8 +2,7 @@ package org.openstreetmap.josm.gui.layer; -import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.Color; +import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; @@ -18,8 +17,7 @@ import javax.swing.Action; -import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.ImageIcon; -import javax.swing.JTextArea; +import javax.swing.JToolTip; import org.openstreetmap.josm.Main; @@ -31,5 +29,4 @@ import org.openstreetmap.josm.data.osm.NoteData; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; -import org.openstreetmap.josm.data.preferences.ColorProperty; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; @@ -37,4 +34,5 @@ import org.openstreetmap.josm.gui.dialogs.NotesDialog; import org.openstreetmap.josm.io.NoteExporter; +import org.openstreetmap.josm.io.XmlWriter; import org.openstreetmap.josm.tools.ColorHelper; import org.openstreetmap.josm.tools.date.DateUtils; @@ -46,10 +44,4 @@ private final NoteData noteData; - - /** - * Property for note comment background - */ - public static final ColorProperty PROP_BACKGROUND_COLOR = new ColorProperty( - marktr("Note comment background"), Color.decode("#b8cfe5")); /** @@ -102,5 +94,5 @@ @Override - public void paint(Graphics2D g, final MapView mv, Bounds box) { + public void paint(Graphics2D g, MapView mv, Bounds box) { for (Note note : noteData.getNotes()) { Point p = mv.getPoint(note.getLatLon()); @@ -119,5 +111,5 @@ } if (noteData.getSelectedNote() != null) { - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder(""); sb.append(tr("Note")); sb.append(" ").append(noteData.getSelectedNote().getId()); @@ -126,25 +118,22 @@ //closing a note creates an empty comment that we don't want to show if (commentText != null && commentText.trim().length() > 0) { - sb.append("\n\n"); - String userName = comment.getUser().getName().trim(); - sb.append(userName.isEmpty() ? "" : userName); + sb.append("
"); + String userName = XmlWriter.encode(comment.getUser().getName()); + if (userName == null || userName.trim().length() == 0) { + userName = "<Anonymous>"; + } + sb.append(userName); sb.append(" on "); sb.append(DateUtils.getDateFormat(DateFormat.MEDIUM).format(comment.getCommentTimestamp())); - sb.append(":\n"); - sb.append(comment.getText().trim()); + sb.append(":
"); + String htmlText = XmlWriter.encode(comment.getText(), true); + htmlText = htmlText.replace(" ", "
"); //encode method leaves us with entity instead of \n + htmlText = htmlText.replace("/", "/\u200b"); //zero width space to wrap long URLs (see #10864) + sb.append(htmlText); } } - JTextArea toolTip = new JTextArea() { - { - setColumns(Math.min(480, mv.getWidth() / 2) / getColumnWidth()); - setSize(getPreferredSize().width + 6, getPreferredSize().height + 6); // +6 for border - } - }; - toolTip.setText(sb.toString()); - toolTip.setLineWrap(true); - toolTip.setWrapStyleWord(true); - toolTip.setBackground(PROP_BACKGROUND_COLOR.get()); - toolTip.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3)); - + sb.append(""); + JToolTip toolTip = new JToolTip(); + toolTip.setTipText(sb.toString()); Point p = mv.getPoint(noteData.getSelectedNote().getLatLon()); @@ -155,5 +144,21 @@ int ty = p.y - NotesDialog.ICON_SMALL_SIZE - 1; g.translate(tx, ty); - toolTip.paint(g); + + //Carried over from the OSB plugin. Not entirely sure why it is needed + //but without it, the tooltip doesn't get sized correctly + for (int x = 0; x < 2; x++) { + Dimension d = toolTip.getUI().getPreferredSize(toolTip); + d.width = Math.min(d.width, (mv.getWidth() / 2)); + if (d.width > 0 && d.height > 0) { + toolTip.setSize(d); + try { + toolTip.paint(g); + } catch (IllegalArgumentException e) { + // See #11123 - https://bugs.openjdk.java.net/browse/JDK-6719550 + // Ignore the exception, as Netbeans does: http://hg.netbeans.org/main-silver/rev/c96f4d5fbd20 + Main.error(e, false); + } + } + } g.translate(-tx, -ty); }