Changeset 10762 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
- Timestamp:
- 2016-08-07T17:57:24+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r10638 r10762 597 597 String values = normalizedTags.getValues(key) 598 598 .stream() 599 .map(x -> ( (x == null || x.isEmpty()) ? tr("<i>missing</i>") : x))599 .map(x -> (x == null || x.isEmpty()) ? tr("<i>missing</i>") : x) 600 600 .collect(Collectors.joining(tr(", "))); 601 601 return tr("{0} ({1})", key, values);
Note:
See TracChangeset
for help on using the changeset viewer.