Changeset 17639 in josm for trunk/src/org

Timestamp:

2021-03-22T23:25:18+01:00 (4 years ago)

Author:

simon04

Message:

see #18949 - Tagging presets: trigger value_template="..." from <combo> and <multiselect> changes

Location:

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items

Files:

• Combo.java (modified) (4 diffs)
• ComboMultiSelect.java (modified) (4 diffs)
• MultiSelect.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -47 +48 @@
 
     @Override
-    protected void addToPanelAnchor(JPanel p, String def, boolean presetInitiallyMatches) {
+    protected void addToPanelAnchor(JPanel p, String def, TaggingPresetItemGuiSupport support) {
         if (!usage.unused()) {
             for (String s : usage.values) {
@@ -77 +78 @@
         }
         combobox.setEditor(tf);
-        combobox.setSelectedItem(getItemToSelect(def, presetInitiallyMatches, false));
+        combobox.setSelectedItem(getItemToSelect(def, support, false));
 
         if (key != null && ("colour".equals(key) || key.startsWith("colour:") || key.endsWith(":colour"))) {
@@ -92 +93 @@
             p.add(combobox, GBC.eol().fill(GBC.HORIZONTAL));
         }
+        combobox.addActionListener(l -> support.fireItemValueModified(this, key, getSelectedValue()));
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -188 +188 @@
     protected abstract Object getSelectedItem();
 
-    protected abstract void addToPanelAnchor(JPanel p, String def, boolean presetInitiallyMatches);
+    protected abstract void addToPanelAnchor(JPanel p, String def, TaggingPresetItemGuiSupport support);
 
     @Override
@@ -220 +220 @@
         label.setComponentPopupMenu(getPopupMenu());
         p.add(label, GBC.std().insets(0, 0, 10, 0));
-        addToPanelAnchor(p, default_, support.isPresetInitiallyMatches());
+        addToPanelAnchor(p, default_, support);
         label.setLabelFor(component);
         component.setToolTipText(getKeyTooltipText());
@@ -343 +343 @@
     }
 
-    protected Object getItemToSelect(String def, boolean presetInitiallyMatches, boolean multi) {
+    protected Object getItemToSelect(String def, TaggingPresetItemGuiSupport support, boolean multi) {
         final Object itemToSelect;
         if (usage.hasUniqueValue()) {
@@ -367 +367 @@
             // all items were unset (and so is default)
             originalValue = multi ? null : getListEntry("");
-            if (LAST_VALUES.containsKey(key) && isUseLastAsDefault() && (!presetInitiallyMatches || isForceUseLastAsDefault())) {
+            if (LAST_VALUES.containsKey(key) && isUseLastAsDefault() && (!support.isPresetInitiallyMatches() || isForceUseLastAsDefault())) {
                 itemToSelect = getListEntry(LAST_VALUES.get(key));
             } else {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java

@@ -15 +15 @@
 
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -30 +31 @@
 
     @Override
-    protected void addToPanelAnchor(JPanel p, String def, boolean presetInitiallyMatches) {
+    protected void addToPanelAnchor(JPanel p, String def, TaggingPresetItemGuiSupport support) {
         list = new ConcatenatingJList(delimiter, presetListEntries.toArray(new PresetListEntry[0]));
         component = list;
         ListCellRenderer<PresetListEntry> renderer = getListCellRenderer();
         list.setCellRenderer(renderer);
-        list.setSelectedItem(getItemToSelect(def, presetInitiallyMatches, true));
+        list.setSelectedItem(getItemToSelect(def, support, true));
         JScrollPane sp = new JScrollPane(list);
         // if a number of rows has been specified in the preset,
@@ -44 +45 @@
             sp.setPreferredSize(new Dimension((int) sp.getPreferredSize().getWidth(), (int) height));
         }
+        list.addListSelectionListener(l -> support.fireItemValueModified(this, key, getSelectedValue()));
         p.add(sp, GBC.eol().fill(GBC.HORIZONTAL));
     }