Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
- Timestamp:
- 2020-05-17T14:18:22+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r13130 r16438 8 8 import java.util.Arrays; 9 9 import java.util.List; 10 import java.util.stream.Collectors; 10 11 11 12 import javax.swing.AbstractAction; … … 108 109 if (referrers.isEmpty()) 109 110 return tr("(none)"); 110 StringBuilder str = new StringBuilder("<html>"); 111 for (OsmPrimitive r: referrers) { 112 str.append(Utils.escapeReservedCharactersHTML(r.getDisplayName(DefaultNameFormatter.getInstance()))).append("<br>"); 113 } 114 str.append("</html>"); 115 return str.toString(); 111 return referrers.stream() 112 .map(r -> Utils.escapeReservedCharactersHTML(r.getDisplayName(DefaultNameFormatter.getInstance())) + "<br>") 113 .collect(Collectors.joining("", "<html>", "</html>")); 116 114 } 117 115
Note:
See TracChangeset
for help on using the changeset viewer.