Changeset 11461 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2017-01-12T02:36:14+01:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r11452 r11461 1584 1584 if (setting instanceof MapListSetting) { 1585 1585 List<Map<String, String>> l = new ArrayList<>(((MapListSetting) setting).getValue()); 1586 if (l.stream().noneMatch(x -> x. values().contains(url))) {1586 if (l.stream().noneMatch(x -> x.containsValue(url))) { 1587 1587 RulePrefHelper helper = ValidatorTagCheckerRulesPreference.RulePrefHelper.INSTANCE; 1588 1588 Optional<ExtendedSourceEntry> val = helper.getDefault().stream().filter(x -> url.equals(x.url)).findFirst(); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
r10134 r11461 55 55 56 56 protected boolean isAlreadyRemembered(OsmPrimitive primitive) { 57 return mappedPrimitives. keySet().contains(primitive);57 return mappedPrimitives.containsKey(primitive); 58 58 } 59 59 -
trunk/src/org/openstreetmap/josm/data/preferences/MapListSetting.java
r11394 r11461 41 41 throw new IllegalArgumentException("Error: Null as list element in preference setting"); 42 42 for (Map<String, String> map : value) { 43 if (map. keySet().contains(null))43 if (map.containsKey(null)) 44 44 throw new IllegalArgumentException("Error: Null as map key in preference setting"); 45 if (map. values().contains(null))45 if (map.containsValue(null)) 46 46 throw new IllegalArgumentException("Error: Null as map value in preference setting"); 47 47 }
Note:
See TracChangeset
for help on using the changeset viewer.