Changeset 15096 in josm

Timestamp:

2019-05-19T23:43:25+02:00 (6 years ago)

Author:

Don-vip

Message:

make sure we don't get null style sources

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (4 diffs)

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

@@ -10 +10 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 
@@ -499 +500 @@
      */
     void add(StyleSource style) {
-        styleSources.add(style);
+        styleSources.add(Objects.requireNonNull(style));
     }
 
@@ -508 +509 @@
      */
     boolean remove(StyleSource style) {
-        return styleSources.remove(style);
+        return styleSources.remove(Objects.requireNonNull(style));
     }
 
@@ -517 +518 @@
     void setStyleSources(Collection<StyleSource> sources) {
         styleSources.clear();
-        styleSources.addAll(sources);
+        sources.forEach(this::add);
     }