Index: /trunk/src/org/openstreetmap/josm/data/vector/VectorDataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/vector/VectorDataSet.java	(revision 18051)
+++ /trunk/src/org/openstreetmap/josm/data/vector/VectorDataSet.java	(revision 18052)
@@ -1,23 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.vector;
-
-import org.openstreetmap.josm.data.DataSource;
-import org.openstreetmap.josm.data.imagery.vectortile.mapbox.MVTTile;
-import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.data.osm.DataSelectionListener;
-import org.openstreetmap.josm.data.osm.DownloadPolicy;
-import org.openstreetmap.josm.data.osm.HighlightUpdateListener;
-import org.openstreetmap.josm.data.osm.IPrimitive;
-import org.openstreetmap.josm.data.osm.OsmData;
-import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.Storage;
-import org.openstreetmap.josm.data.osm.UploadPolicy;
-import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.event.IDataSelectionEventSource;
-import org.openstreetmap.josm.data.osm.event.IDataSelectionListener;
-import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.tools.ListenerList;
-import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 import java.util.ArrayList;
@@ -41,4 +22,23 @@
 import java.util.stream.Stream;
 
+import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.imagery.vectortile.mapbox.MVTTile;
+import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
+import org.openstreetmap.josm.data.osm.DownloadPolicy;
+import org.openstreetmap.josm.data.osm.HighlightUpdateListener;
+import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.OsmData;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.Storage;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
+import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.event.IDataSelectionEventSource;
+import org.openstreetmap.josm.data.osm.event.IDataSelectionListener;
+import org.openstreetmap.josm.gui.mappaint.ElemStyles;
+import org.openstreetmap.josm.tools.ListenerList;
+import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+
 /**
  * A data class for Vector Data
@@ -243,6 +243,6 @@
     public Stream<VectorPrimitive> getPrimitivesById(PrimitiveId... primitiveIds) {
         final Storage<MVTTile> dataStore = this.getBestZoomDataStore().orElse(null);
-        final Stream<VectorDataStore> dataStoreStream = dataStore != null ? dataStore.stream().map(MVTTile::getData) : Stream.empty();
-        return Stream.concat(dataStoreStream, Stream.of(this.customDataStore)).map(VectorDataStore::getPrimitivesMap)
+        return Stream.concat(dataStore != null ? dataStore.stream().map(MVTTile::getData) : Stream.empty(),
+                Stream.of(this.customDataStore)).map(VectorDataStore::getPrimitivesMap)
                 .flatMap(m -> Stream.of(primitiveIds).map(m::get)).filter(Objects::nonNull);
     }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java	(revision 18051)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java	(revision 18052)
@@ -78,6 +78,6 @@
      * The real content, just to add a border
      */
-    protected final JPanel content = new JPanel();
-    protected final List<VisibilityMenuEntry> sliders = new ArrayList<>();
+    final JPanel content = new JPanel();
+    final List<VisibilityMenuEntry> sliders = new ArrayList<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java	(revision 18051)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java	(revision 18052)
@@ -46,9 +46,13 @@
 
         if (selected) {
-            s.selectedStyle = (s.selectedStyle == null ? new DividedScale<StyleElementList>() : s.selectedStyle).put(o, r);
+            s.selectedStyle = scale(s.selectedStyle).put(o, r);
         } else {
-            s.plainStyle = (s.plainStyle == null ? new DividedScale<StyleElementList>() : s.plainStyle).put(o, r);
+            s.plainStyle = scale(s.plainStyle).put(o, r);
         }
         return s.intern();
+    }
+
+    private static DividedScale<StyleElementList> scale(DividedScale<StyleElementList> scale) {
+        return scale == null ? new DividedScale<>() : scale;
     }