Changeset 9966 in josm for trunk/src/org

Timestamp:

2016-03-12T11:24:38+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - remove redundant null-checks

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• gui/mappaint/StyleSetting.java (modified) (1 diff)

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

@@ -1437 +1437 @@
         if (loadedVersion < 9715) {
             Setting<?> setting = settingsMap.get("imagery.entries");
-            if (setting != null && setting instanceof MapListSetting) {
+            if (setting instanceof MapListSetting) {
                 List<Map<String, String>> l = new LinkedList<>();
                 boolean modified = false;
@@ -1462 +1462 @@
         if (loadedVersion < 9965) {
             Setting<?> setting = settingsMap.get("mappaint.style.entries");
-            if (setting != null && setting instanceof MapListSetting) {
+            if (setting instanceof MapListSetting) {
                 List<Map<String, String>> l = new LinkedList<>();
                 boolean modified = false;

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

@@ -92 +92 @@
 
         public void setValue(Object o) {
-            if (o == null || !(o instanceof Boolean)) {
+            if (!(o instanceof Boolean)) {
                 throw new IllegalArgumentException();
             }