Changeset 11893 in josm for trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

Timestamp:

2017-04-13T01:08:58+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1126 - Return of boolean expressions should not be wrapped into an "if-then-else" statement

File:

• trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -295 +295 @@
         if (this == obj)
             return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
+        if (obj == null || getClass() != obj.getClass())
             return false;
         TileSourceDisplaySettings other = (TileSourceDisplaySettings) obj;
-        if (autoLoad != other.autoLoad)
-            return false;
-        if (autoZoom != other.autoZoom)
-            return false;
-        if (showErrors != other.showErrors)
-            return false;
-        return true;
+        return autoLoad == other.autoLoad
+            && autoZoom == other.autoZoom
+            && showErrors == other.showErrors;
     }