diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index 07cabc76a..8c4601232 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -34,6 +34,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Platform;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.StreamUtils;
import org.openstreetmap.josm.tools.Utils;
@@ -705,39 +706,38 @@ public class ImageryInfo extends
/**
* Returns a tool tip text for display.
- * @return The text
+ * @return The text, which is a plain-text string for the Mac and HTML for other platforms.
* @since 8065
*/
@Override
public String getToolTipText() {
StringBuilder res = new StringBuilder(getName());
- boolean html = false;
String dateStr = getDate();
if (dateStr != null && !dateStr.isEmpty()) {
res.append("
").append(tr("Date of imagery: {0}", dateStr));
- html = true;
}
if (category != null && category.getDescription() != null) {
res.append("
").append(tr("Imagery category: {0}", category.getDescription()));
- html = true;
}
if (bestMarked) {
res.append("
").append(tr("This imagery is marked as best in this region in other editors."));
- html = true;
}
if (overlay) {
res.append("
").append(tr("This imagery is an overlay."));
- html = true;
}
String desc = getDescription();
if (desc != null && !desc.isEmpty()) {
res.append("
").append(Utils.escapeReservedCharactersHTML(desc));
- html = true;
}
- if (html) {
- res.insert(0, "").append("");
+ if (Platform.OSX.equals(Platform.determinePlatform())) {
+ return res.toString().replaceAll("
", "\n");
+ } else {
+ if (res.length() > 0) {
+ return res.insert(0, "").append("").toString();
+ } else {
+ return null;
+ }
}
- return res.toString();
}
/**