Changeset 11384 in josm for trunk


Ignore:
Timestamp:
2016-12-13T01:38:24+01:00 (3 years ago)
Author:
Don-vip
Message:

findbugs - EQ_DOESNT_OVERRIDE_EQUALS, MS_MUTABLE_COLLECTION_PKGPROTECT

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

    r11129 r11384  
    3333
    3434    /** Values for {@code power} key interpreted as power lines */
    35     protected static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
     35    static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
    3636    /** Values for {@code power} key interpreted as power towers */
    37     protected static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
     37    static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
    3838    /** Values for {@code power} key interpreted as power stations */
    39     protected static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
     39    static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
    4040    /** Values for {@code building} key interpreted as power stations */
    41     protected static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
     41    static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
    4242    /** Values for {@code power} key interpreted as allowed power items */
    43     protected static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
     43    static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
    4444            "portal", "terminal", "insulator");
    4545
  • trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java

    r11129 r11384  
    4545
    4646    /** Ways that must have a name */
    47     protected static final Set<String> NAMED_WAYS = new HashSet<>();
     47    static final Set<String> NAMED_WAYS = new HashSet<>();
    4848    static {
    4949        NAMED_WAYS.add("motorway");
     
    5757
    5858    /** Whitelist of roles allowed to reference an untagged way */
    59     protected static final Set<String> WHITELIST = new HashSet<>();
     59    static final Set<String> WHITELIST = new HashSet<>();
    6060    static {
    6161        WHITELIST.add("outer");
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

    r11383 r11384  
    102102     * Set of all supported MapCSS keys.
    103103     */
    104     protected static final Set<String> SUPPORTED_KEYS = new HashSet<>();
     104    static final Set<String> SUPPORTED_KEYS = new HashSet<>();
    105105    static {
    106106        Field[] declaredFields = StyleKeys.class.getDeclaredFields();
  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

    r10689 r11384  
    115115     * the same as tagCache but for the preset keys and values can be accessed directly
    116116     */
    117     protected static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
     117    static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
    118118
    119119    /**
    120120     * Cache for tags that have been entered by the user.
    121121     */
    122     protected static final Set<UserInputTag> USER_INPUT_TAG_CACHE = new LinkedHashSet<>();
     122    static final Set<UserInputTag> USER_INPUT_TAG_CACHE = new LinkedHashSet<>();
    123123
    124124    /**
     
    132132     * the same as roleCache but for the preset roles can be accessed directly
    133133     */
    134     protected static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
     134    static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
    135135
    136136    /**
  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java

    r10591 r11384  
    2828
    2929    /** Last value of each key used in presets, used for prefilling corresponding fields */
    30     protected static final Map<String, String> LAST_VALUES = new HashMap<>();
     30    static final Map<String, String> LAST_VALUES = new HashMap<>();
    3131
    3232    /** This specifies the property key that will be modified by the item. */
  • trunk/tools/findbugs/josm-filter.xml

    r11380 r11384  
    11<FindBugsFilter>
    22
     3        <Match>
     4                <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS" />
     5        </Match>
    36        <Match>
    47                <Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" />
Note: See TracChangeset for help on using the changeset viewer.