Changeset 11848 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
- Timestamp:
- 2017-04-07T00:18:07+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r10210 r11848 29 29 import org.openstreetmap.josm.gui.history.VersionInfoPanel; 30 30 import org.openstreetmap.josm.tools.ImageProvider; 31 import org.openstreetmap.josm.tools.Utils; 31 32 32 33 /** … … 315 316 StringBuilder str = new StringBuilder("<html>"); 316 317 for (OsmPrimitive r: referrers) { 317 str.append( r.getDisplayName(DefaultNameFormatter.getInstance())).append("<br>");318 str.append(Utils.escapeReservedCharactersHTML(r.getDisplayName(DefaultNameFormatter.getInstance()))).append("<br>"); 318 319 } 319 320 str.append("</html>");
Note:
See TracChangeset
for help on using the changeset viewer.