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

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/gui

Files:

• DefaultNameFormatter.java (modified) (1 diff)
• mappaint/ElemStyle.java (modified) (1 diff)
• mappaint/mapcss/Condition.java (modified) (2 diffs)
• mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -94 +94 @@
      * 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"};
 

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

@@ -20 +20 @@
     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;

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -119 +119 @@
         CONTAINS;
 
-        public static final Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);
+        protected static final Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);
 
         /**
@@ -283 +283 @@
 
         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) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

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