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

Timestamp:

2012-04-04T23:35:41+02:00 (13 years ago)

Author:

simon04

Message:

see #7552 - presets: make default work properly when using <list_entry>s

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -281 +281 @@
 
             final StringBuilder res = new StringBuilder("<b>");
-            final String displ = Utils.firstNonNull(locale_display_value, tr(display_value), tr(value));
-            res.append(displ);
+            res.append(getDisplayValue(true));
             res.append("</b>");
-            final String descr = Utils.firstNonNull(locale_short_description, tr(short_description));
-            if (descr != null) {
+            if (getShortDescription(true) != null) {
                 // wrap in table to restrict the text width
-                res.append("<div style=\"width:300px; padding:0 0 5px 5px\">").append(descr).append("</div>");
+                res.append("<div style=\"width:300px; padding:0 0 5px 5px\">");
+                res.append(getShortDescription(true));
+                res.append("</div>");
             }
             return res.toString();
@@ -301 +301 @@
         public PresetListEntry(String value) {
             this.value = value;
+        }
+
+        public String getDisplayValue(boolean translated) {
+            return translated
+                    ? Utils.firstNonNull(locale_display_value, tr(display_value), tr(value))
+                    : Utils.firstNonNull(display_value, value);
+        }
+
+        public String getShortDescription(boolean translated) {
+            return translated
+                    ? Utils.firstNonNull(locale_short_description, tr(short_description))
+                    : short_description;
         }
 
@@ -569 +581 @@
                 int i = 0;
                 for (PresetListEntry e : lhm.values()) {
-                    display_array[i++] = e.display_value;
+                    display_array[i++] = e.getDisplayValue(true);
                 }
             }
@@ -780 +792 @@
                 if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
                     // selected osm primitives are untagged or filling default feature is enabled
-                    combo.setSelectedItem(lhm.get(def).display_value);
+                    combo.setSelectedItem(lhm.get(def).getDisplayValue(true));
                 } else {
                     // selected osm primitives are tagged and filling default feature is disabled