Changeset 11039 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-09-22T12:56:09+02:00 (8 years ago)

Author:

simon04

Message:

fix #13574 - Waypoint labelling "None" doesn't work

Store space character since Preferences#put(java.lang.String, java.lang.String) ignores empty strings.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -36 +36 @@
     private static final int WAYPOINT_LABEL_CUSTOM = 6;
     private static final String[] LABEL_PATTERN_TEMPLATE = new String[] {Marker.LABEL_PATTERN_AUTO, Marker.LABEL_PATTERN_NAME,
-        Marker.LABEL_PATTERN_DESC, "{special:everything}", "?{ '{name}' | '{desc}' | '{formattedWaypointOffset}' }", ""};
+        Marker.LABEL_PATTERN_DESC, "{special:everything}", "?{ '{name}' | '{desc}' | '{formattedWaypointOffset}' }", " "};
     private static final String[] LABEL_PATTERN_DESC = new String[] {tr("Auto"), /* gpx data field name */ trc("gpx_field", "Name"),
         /* gpx data field name */ trc("gpx_field", "Desc(ription)"), tr("Everything"), tr("Name or offset"), tr("None"), tr("Custom")};