Ticket #6157: 6157.patch

File 6157.patch, 1.4 KB (added by simon04, 14 years ago)

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

    diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
index e355546..bf31db1 100644
    a b public class TaggingPreset extends AbstractAction implements MapView.LayerChange  
    634634
    635635            combo = new JComboBox(lhm.values().toArray());
    636636            component = combo;
    637             combo.setRenderer(getListCellRenderer());
    638637            combo.setEditable(editable);
    639638            combo.setMaximumRowCount(13);
    640639            AutoCompletingTextField tf = new AutoCompletingTextField();
    … … public class TaggingPreset extends AbstractAction implements MapView.LayerChange  
    646645                // all items have the same value (and there were no unset items)
    647646                originalValue = lhm.get(usage.getFirst());
    648647                combo.setSelectedItem(originalValue);
    649             } else if (def != null && usage.unused()) {
     648            } else if (def != null && !def.isEmpty() && usage.unused()) {
    650649                // default is set and all items were unset
    651650                if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
    652651                    // selected osm primitives are untagged or filling default feature is enabled