Index: trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java	(revision 11383)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java	(revision 11384)
@@ -33,13 +33,13 @@
 
     /** Values for {@code power} key interpreted as power lines */
-    protected static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
+    static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
     /** Values for {@code power} key interpreted as power towers */
-    protected static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
+    static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
     /** Values for {@code power} key interpreted as power stations */
-    protected static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
+    static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
     /** Values for {@code building} key interpreted as power stations */
-    protected static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
+    static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
     /** Values for {@code power} key interpreted as allowed power items */
-    protected static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
+    static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
             "portal", "terminal", "insulator");
 
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java	(revision 11383)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java	(revision 11384)
@@ -45,5 +45,5 @@
 
     /** Ways that must have a name */
-    protected static final Set<String> NAMED_WAYS = new HashSet<>();
+    static final Set<String> NAMED_WAYS = new HashSet<>();
     static {
         NAMED_WAYS.add("motorway");
@@ -57,5 +57,5 @@
 
     /** Whitelist of roles allowed to reference an untagged way */
-    protected static final Set<String> WHITELIST = new HashSet<>();
+    static final Set<String> WHITELIST = new HashSet<>();
     static {
         WHITELIST.add("outer");
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 11383)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 11384)
@@ -102,5 +102,5 @@
      * Set of all supported MapCSS keys.
      */
-    protected static final Set<String> SUPPORTED_KEYS = new HashSet<>();
+    static final Set<String> SUPPORTED_KEYS = new HashSet<>();
     static {
         Field[] declaredFields = StyleKeys.class.getDeclaredFields();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java	(revision 11383)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java	(revision 11384)
@@ -115,10 +115,10 @@
      * the same as tagCache but for the preset keys and values can be accessed directly
      */
-    protected static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
+    static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
 
     /**
      * Cache for tags that have been entered by the user.
      */
-    protected static final Set<UserInputTag> USER_INPUT_TAG_CACHE = new LinkedHashSet<>();
+    static final Set<UserInputTag> USER_INPUT_TAG_CACHE = new LinkedHashSet<>();
 
     /**
@@ -132,5 +132,5 @@
      * the same as roleCache but for the preset roles can be accessed directly
      */
-    protected static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
+    static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java	(revision 11383)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java	(revision 11384)
@@ -28,5 +28,5 @@
 
     /** Last value of each key used in presets, used for prefilling corresponding fields */
-    protected static final Map<String, String> LAST_VALUES = new HashMap<>();
+    static final Map<String, String> LAST_VALUES = new HashMap<>();
 
     /** This specifies the property key that will be modified by the item. */