Changeset 11385 in josm for trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

Timestamp:

2016-12-13T01:57:37+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1066 - Collapsible "if" statements should be merged

File:

• trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

@@ -91 +91 @@
         if (!isEnabled())
             return;
-        if (editLayer.isUploadDiscouraged()) {
-            if (UploadAction.warnUploadDiscouraged(editLayer)) {
-                return;
-            }
+        if (editLayer.isUploadDiscouraged() && UploadAction.warnUploadDiscouraged(editLayer)) {
+            return;
         }
         Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(editLayer.data.getAllSelected());