Index: /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 8882)
@@ -81,5 +81,5 @@
     public static double griddetail;
 
-    public static final Collection<String> ignoredErrors = new TreeSet<>();
+    private static final Collection<String> ignoredErrors = new TreeSet<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java	(revision 8882)
@@ -37,11 +37,11 @@
 
     /** Values for {@code power} key interpreted as power lines */
-    public static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
+    protected static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
     /** Values for {@code power} key interpreted as power towers */
-    public static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
+    protected static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
     /** Values for {@code power} key interpreted as power stations */
-    public static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
+    protected static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
     /** Values for {@code power} key interpreted as allowed power items */
-    public static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear");
+    protected static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear");
 
     private final Map<Way, String> towerPoleTagMap = new HashMap<>();
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java	(revision 8882)
@@ -42,5 +42,5 @@
 
     /** Ways that must have a name */
-    public static final Set<String> NAMED_WAYS = new HashSet<>();
+    protected static final Set<String> NAMED_WAYS = new HashSet<>();
     static {
         NAMED_WAYS.add("motorway");
@@ -54,5 +54,5 @@
 
     /** Whitelist of roles allowed to reference an untagged way */
-    public static final Set<String> WHITELIST = new HashSet<>();
+    protected static final Set<String> WHITELIST = new HashSet<>();
     static {
         WHITELIST.add("outer");
Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 8882)
@@ -94,5 +94,5 @@
      * A ? prefix indicates a boolean value, for which the key (instead of the value) is used.
      */
-    public static final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
+    protected static final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
         "public_transport", ":LocationCode", "note", "?building"};
 
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 8882)
@@ -20,6 +20,7 @@
     protected static final int ICON_OFFSET_X_IDX = 4;
     protected static final int ICON_OFFSET_Y_IDX = 5;
-    public static final String[] ICON_KEYS = {ICON_IMAGE, ICON_WIDTH, ICON_HEIGHT, ICON_OPACITY, ICON_OFFSET_X, ICON_OFFSET_Y};
-    public static final String[] REPEAT_IMAGE_KEYS = {REPEAT_IMAGE, REPEAT_IMAGE_WIDTH, REPEAT_IMAGE_HEIGHT, REPEAT_IMAGE_OPACITY, null, null};
+    protected static final String[] ICON_KEYS = {ICON_IMAGE, ICON_WIDTH, ICON_HEIGHT, ICON_OPACITY, ICON_OFFSET_X, ICON_OFFSET_Y};
+    protected static final String[] REPEAT_IMAGE_KEYS = {REPEAT_IMAGE, REPEAT_IMAGE_WIDTH, REPEAT_IMAGE_HEIGHT, REPEAT_IMAGE_OPACITY,
+            null, null};
 
     public float majorZIndex;
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java	(revision 8882)
@@ -119,5 +119,5 @@
         CONTAINS;
 
-        public static final Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);
+        protected static final Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);
 
         /**
@@ -283,5 +283,5 @@
 
         public final Pattern pattern;
-        public static final Set<Op> SUPPORTED_OPS = EnumSet.of(Op.REGEX, Op.NREGEX);
+        protected static final Set<Op> SUPPORTED_OPS = EnumSet.of(Op.REGEX, Op.NREGEX);
 
         public KeyValueRegexpCondition(String k, String v, Op op, boolean considerValAsKey) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8882)
@@ -100,5 +100,5 @@
      * Set of all supported MapCSS keys.
      */
-    public static final Set<String> SUPPORTED_KEYS = new HashSet<>();
+    protected static final Set<String> SUPPORTED_KEYS = new HashSet<>();
     static {
         Field[] declaredFields = StyleKeys.class.getDeclaredFields();
Index: /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java	(revision 8882)
@@ -22,7 +22,7 @@
     private Reader reader;
 
-    public static boolean firstWarning = true;
+    private static boolean firstWarning = true;
 
-    public static final boolean[] INVALID_CHARS;
+    private static final boolean[] INVALID_CHARS;
 
     static {
Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 8882)
@@ -79,5 +79,5 @@
      * Deprecated plugins that are removed on start
      */
-    public static final Collection<DeprecatedPlugin> DEPRECATED_PLUGINS;
+    protected static final Collection<DeprecatedPlugin> DEPRECATED_PLUGINS;
     static {
         String IN_CORE = tr("integrated into main program");
Index: /trunk/src/org/openstreetmap/josm/tools/FontsManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/FontsManager.java	(revision 8881)
+++ /trunk/src/org/openstreetmap/josm/tools/FontsManager.java	(revision 8882)
@@ -22,5 +22,5 @@
      * List of fonts embedded into JOSM jar.
      */
-    public static final Collection<String> INCLUDED_FONTS = Arrays.asList(
+    private static final Collection<String> INCLUDED_FONTS = Arrays.asList(
             "DroidSans.ttf",
             "DroidSans-Bold.ttf"