Changeset 11461 in josm for trunk

Timestamp:

2017-01-12T02:36:14+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:SPP_USE_CONTAINSKEY - Style - Method calls keySet() just to call contains, use containsKey instead

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• data/osm/visitor/MergeSourceBuildingVisitor.java (modified) (1 diff)
• data/preferences/MapListSetting.java (modified) (1 diff)
• gui/dialogs/relation/RelationDialogManager.java (modified) (1 diff)
• gui/history/HistoryBrowserDialogManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1584 +1584 @@
         if (setting instanceof MapListSetting) {
             List<Map<String, String>> l = new ArrayList<>(((MapListSetting) setting).getValue());
-            if (l.stream().noneMatch(x -> x.values().contains(url))) {
+            if (l.stream().noneMatch(x -> x.containsValue(url))) {
                 RulePrefHelper helper = ValidatorTagCheckerRulesPreference.RulePrefHelper.INSTANCE;
                 Optional<ExtendedSourceEntry> val = helper.getDefault().stream().filter(x -> url.equals(x.url)).findFirst();

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

@@ -55 +55 @@
 
     protected boolean isAlreadyRemembered(OsmPrimitive primitive) {
-        return mappedPrimitives.keySet().contains(primitive);
+        return mappedPrimitives.containsKey(primitive);
     }
 

trunk/src/org/openstreetmap/josm/data/preferences/MapListSetting.java

@@ -41 +41 @@
             throw new IllegalArgumentException("Error: Null as list element in preference setting");
         for (Map<String, String> map : value) {
-            if (map.keySet().contains(null))
+            if (map.containsKey(null))
                 throw new IllegalArgumentException("Error: Null as map key in preference setting");
-            if (map.values().contains(null))
+            if (map.containsValue(null))
                 throw new IllegalArgumentException("Error: Null as map value in preference setting");
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java

@@ -150 +150 @@
         if (relation == null) return false;
         DialogContext context = new DialogContext(layer, relation);
-        return openDialogs.keySet().contains(context);
-
+        return openDialogs.containsKey(context);
     }
 

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -88 +88 @@
 
     private void show(long id, HistoryBrowserDialog dialog) {
-        if (dialogs.values().contains(dialog)) {
+        if (dialogs.containsValue(dialog)) {
             show(id);
         } else {
@@ -98 +98 @@
 
     private void show(long id) {
-        if (dialogs.keySet().contains(id)) {
+        if (dialogs.containsKey(id)) {
             dialogs.get(id).toFront();
         }