Changeset 11401 in josm

Timestamp:

2016-12-15T07:22:11+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (2 diffs)

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

@@ -260 +260 @@
 
         for (SourceEntry entry : sourceEntries) {
-            StyleSource source = fromSourceEntry(entry);
-            if (source != null) {
-                styles.add(source);
-            }
+            styles.add(fromSourceEntry(entry));
         }
         for (StyleSource source : styles.getStyleSources()) {
@@ -420 +417 @@
     public static StyleSource addStyle(SourceEntry entry) {
         StyleSource source = fromSourceEntry(entry);
-        if (source != null) {
-            styles.add(source);
-            loadStyleForFirstTime(source);
-            MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
-            fireMapPaintSylesUpdated();
-            styles.clearCached();
-            if (Main.isDisplayingMapView()) {
-                Main.map.mapView.repaint();
-            }
+        styles.add(source);
+        loadStyleForFirstTime(source);
+        MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
+        fireMapPaintSylesUpdated();
+        styles.clearCached();
+        if (Main.isDisplayingMapView()) {
+            Main.map.mapView.repaint();
         }
         return source;