Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 11104)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 11105)
@@ -108,5 +108,5 @@
     // For easy access when inherited
     protected transient Insets contentInsets = new Insets(10, 5, 0, 5);
-    protected List<JButton> buttons = new ArrayList<>();
+    protected transient List<JButton> buttons = new ArrayList<>();
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java	(revision 11104)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java	(revision 11105)
@@ -13,7 +13,7 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -206,5 +206,6 @@
                     .collect(Collectors.joining(", "));
             tfId.tryToPasteFrom(parsedText);
-            final Set<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(Collectors.toSet());
+            final EnumSet<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(
+                    Collectors.toCollection(() -> EnumSet.noneOf(OsmPrimitiveType.class)));
             if (types.size() == 1) {
                 // select corresponding type
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java	(revision 11104)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java	(revision 11105)
@@ -55,5 +55,5 @@
 
     @Test
-    public void updateGetRemoveCycle() {
+    public void testUpdateGetRemoveCycle() {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();
@@ -68,5 +68,5 @@
 
     @Test
-    public void updateTwice() {
+    public void testUpdateTwice() {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();
@@ -94,5 +94,5 @@
 
     @Test
-    public void contains() throws ReflectiveOperationException {
+    public void testContains() throws ReflectiveOperationException {
         ChangesetCache cache = ChangesetCache.getInstance();
         getListeners(cache).clear();
@@ -112,5 +112,5 @@
 
     @Test
-    public void fireingEventsAddAChangeset() throws ReflectiveOperationException {
+    public void testFireingEventsAddAChangeset() throws ReflectiveOperationException {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();
@@ -134,5 +134,5 @@
 
     @Test
-    public void fireingEventsUpdateChangeset() throws ReflectiveOperationException {
+    public void testFireingEventsUpdateChangeset() throws ReflectiveOperationException {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();
@@ -158,5 +158,5 @@
 
     @Test
-    public void fireingEventsRemoveChangeset() throws ReflectiveOperationException {
+    public void testFireingEventsRemoveChangeset() throws ReflectiveOperationException {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();