Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java	(revision 17609)
@@ -6,6 +6,4 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -13,5 +11,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 
 /**
@@ -36,5 +34,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertFalse(cg.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(cg.addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java	(revision 17609)
@@ -5,11 +5,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -35,5 +33,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new Check().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertTrue(new Check().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java	(revision 17609)
@@ -6,6 +6,4 @@
 
 import java.awt.Color;
-import java.util.Arrays;
-import java.util.Collections;
 
 import javax.swing.JPanel;
@@ -15,4 +13,5 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -38,5 +37,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new Combo().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertTrue(new Combo().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
@@ -55,11 +54,11 @@
         OsmPrimitive waySI = OsmUtils.createPrimitive("way addr:country=SI");
 
-        combo.addToPanel(new JPanel(), Collections.singleton(way), false);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, way));
         assertEquals("", combo.getSelectedValue());
 
         combo.default_ = "SI";
-        combo.addToPanel(new JPanel(), Collections.singleton(way), false);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, way));
         assertEquals("SI", combo.getSelectedValue());
-        combo.addToPanel(new JPanel(), Collections.singleton(wayAT), false);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, wayAT));
         assertEquals("AT", combo.getSelectedValue());
         combo.default_ = null;
@@ -67,16 +66,16 @@
         KeyedItem.LAST_VALUES.clear();
         KeyedItem.LAST_VALUES.put("addr:country", "AT");
-        combo.addToPanel(new JPanel(), Collections.singleton(way), false);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false, way));
         assertEquals("AT", combo.getSelectedValue());
-        combo.addToPanel(new JPanel(), Collections.singleton(wayAT), true);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(true, wayAT));
         assertEquals("AT", combo.getSelectedValue());
-        combo.addToPanel(new JPanel(), Collections.singleton(way), true);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(true));
         assertEquals("", combo.getSelectedValue());
         combo.use_last_as_default = 2; // "force"
-        combo.addToPanel(new JPanel(), Collections.singleton(way), true);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(true));
         assertEquals("AT", combo.getSelectedValue());
         KeyedItem.LAST_VALUES.clear();
 
-        combo.addToPanel(new JPanel(), Arrays.asList(wayAT, waySI), true);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(true, wayAT, waySI));
         assertEquals(Combo.DIFFERENT, combo.getSelectedValue());
     }
@@ -89,5 +88,5 @@
         combo.values_context = "color";
         combo.delimiter = ';';
-        combo.addToPanel(new JPanel(), Collections.<OsmPrimitive>emptyList(), false);
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false));
         assertEquals(5, combo.combobox.getItemCount());
         combo.presetListEntries.stream().filter(e -> "red".equals(e.value)).findFirst().ifPresent(combo.combobox::setSelectedItem);
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java	(revision 17609)
@@ -6,6 +6,4 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -13,5 +11,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 
 /**
@@ -35,5 +33,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertFalse(new ItemSeparator().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(new ItemSeparator().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java	(revision 17609)
@@ -5,6 +5,4 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -12,5 +10,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 
 /**
@@ -34,5 +32,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertFalse(new Key().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(new Key().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertEquals(0, p.getComponentCount());
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java	(revision 17609)
@@ -5,6 +5,4 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -12,5 +10,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 
 /**
@@ -34,5 +32,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new Label().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertTrue(new Label().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java	(revision 17609)
@@ -6,6 +6,4 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -13,5 +11,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 import org.openstreetmap.josm.spi.preferences.Config;
 
@@ -37,13 +35,13 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertFalse(l.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(l.addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertEquals(0, p.getComponentCount());
 
         l.href = Config.getUrls().getJOSMWebsite();
-        assertFalse(l.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(l.addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
 
         l.locale_href = Config.getUrls().getJOSMWebsite();
-        assertFalse(l.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(l.addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java	(revision 17609)
@@ -5,6 +5,4 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -12,5 +10,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 
 /**
@@ -34,5 +32,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new MultiSelect().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertTrue(new MultiSelect().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java	(revision 17609)
@@ -6,6 +6,4 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -13,5 +11,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 
 /**
@@ -35,5 +33,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertFalse(new Optional().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(new Optional().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetLinkTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetLinkTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetLinkTest.java	(revision 17609)
@@ -6,11 +6,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -38,5 +36,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertFalse(l.addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(l.addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java	(revision 17609)
@@ -6,6 +6,4 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -13,5 +11,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 
 /**
@@ -35,5 +33,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertFalse(new Roles().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(new Roles().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java	(revision 17609)
@@ -6,6 +6,4 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
@@ -13,5 +11,5 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 
 /**
@@ -35,5 +33,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertFalse(new Space().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertFalse(new Space().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java	(revision 17604)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java	(revision 17609)
@@ -5,11 +5,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Collections;
-
 import javax.swing.JPanel;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -35,5 +33,5 @@
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new Text().addToPanel(p, Collections.<OsmPrimitive>emptyList(), false));
+        assertTrue(new Text().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }