Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 15925)
+++ trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 15926)
@@ -79,5 +79,5 @@
                         // Pending upstream patch: https://issues.apache.org/jira/projects/JCS/issues/JCS-200
                         // Pending upstream patch: https://issues.apache.org/jira/projects/JCS/issues/JCS-201
-                        if (msg.equals("No configuration settings found.  Using hardcoded default values for all pools.")
+                        if ("No configuration settings found.  Using hardcoded default values for all pools.".equals(msg)
                                 || (msg.startsWith("Region") && msg.endsWith("Resetting cache"))) { // "Region [TMS_BLOCK_v2] Resetting cache"
                             Logging.debug(msg);
Index: trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java	(revision 15925)
+++ trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java	(revision 15926)
@@ -137,5 +137,5 @@
             });
         }
-        return PROP_AUTO_FILTER_DEFAULTS.get() ? defaultValueSupplier.apply(osm) : IntStream.empty();
+        return Boolean.TRUE.equals(PROP_AUTO_FILTER_DEFAULTS.get()) ? defaultValueSupplier.apply(osm) : IntStream.empty();
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 15925)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 15926)
@@ -352,4 +352,5 @@
             return tab.selectSubTab(sub);
         } catch (NoSuchElementException ignore) {
+            Logging.trace(ignore);
             return false;
         }
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 15925)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 15926)
@@ -95,34 +95,34 @@
         PresetClassification(TaggingPreset preset) {
             this.preset = preset;
-            Set<String> groups = new HashSet<>();
-            Set<String> names = new HashSet<>();
-            Set<String> tags = new HashSet<>();
+            Set<String> groupSet = new HashSet<>();
+            Set<String> nameSet = new HashSet<>();
+            Set<String> tagSet = new HashSet<>();
             TaggingPreset group = preset.group;
             while (group != null) {
-                addLocaleNames(groups, group);
+                addLocaleNames(groupSet, group);
                 group = group.group;
             }
-            addLocaleNames(names, preset);
+            addLocaleNames(nameSet, preset);
             for (TaggingPresetItem item: preset.data) {
                 if (item instanceof KeyedItem) {
-                    tags.add(((KeyedItem) item).key);
+                    tagSet.add(((KeyedItem) item).key);
                     if (item instanceof ComboMultiSelect) {
                         final ComboMultiSelect cms = (ComboMultiSelect) item;
                         if (Boolean.parseBoolean(cms.values_searchable)) {
-                            tags.addAll(cms.getDisplayValues());
+                            tagSet.addAll(cms.getDisplayValues());
                         }
                     }
                     if (item instanceof Key && ((Key) item).value != null) {
-                        tags.add(((Key) item).value);
+                        tagSet.add(((Key) item).value);
                     }
                 } else if (item instanceof Roles) {
                     for (Role role : ((Roles) item).roles) {
-                        tags.add(role.key);
-                    }
-                }
-            }
-            this.groups = Utils.toUnmodifiableList(groups);
-            this.names = Utils.toUnmodifiableList(names);
-            this.tags = Utils.toUnmodifiableList(tags);
+                        tagSet.add(role.key);
+                    }
+                }
+            }
+            this.groups = Utils.toUnmodifiableList(groupSet);
+            this.names = Utils.toUnmodifiableList(nameSet);
+            this.tags = Utils.toUnmodifiableList(tagSet);
         }
 
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 15925)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 15926)
@@ -1517,4 +1517,6 @@
 
     /**
+     * Returns an {@link ImageIcon} for the given OSM object, at the specified size.
+     * This is a slow operation.
      * @param primitive Object for which an icon shall be fetched. The icon is chosen based on tags.
      * @param iconSize Target size of icon. Icon is padded if required.
@@ -1527,4 +1529,6 @@
 
     /**
+     * Returns an {@link ImageIcon} for the given OSM object, at the specified size.
+     * This is a slow operation.
      * @param primitive Object for which an icon shall be fetched. The icon is chosen based on tags.
      * @param iconSize Target size of icon. Icon is padded if required.