Changeset 8882 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-10-15T01:02:36+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S2386 - Mutable fields should not be "public static"

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• OsmValidator.java (modified) (1 diff)
• tests/PowerLines.java (modified) (1 diff)
• tests/UntaggedWay.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -81 +81 @@
     public static double griddetail;
 
-    public static final Collection<String> ignoredErrors = new TreeSet<>();
+    private static final Collection<String> ignoredErrors = new TreeSet<>();
 
     /**

trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

@@ -37 +37 @@
 
     /** 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<>();

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java

@@ -42 +42 @@
 
     /** 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 +54 @@
 
     /** 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");