Changeset 12281 in josm for trunk

Timestamp:

2017-05-31T02:09:03+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1602 - Lamdbas containing only one statement should not nest this statement in a block

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1065 +1065 @@
 
         ConflictCollection conflictsCol = getConflicts();
-        return conflictsCol == null || conflictsCol.isEmpty() || 1 == GuiHelper.runInEDTAndWaitAndReturn(() -> {
-            return new ExtendedDialog(
+        return conflictsCol == null || conflictsCol.isEmpty() || 1 == GuiHelper.runInEDTAndWaitAndReturn(() ->
+            new ExtendedDialog(
                     Main.parent,
                     /* I18N: Display title of the window showing conflicts */
@@ -1074 +1074 @@
                     tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"))
                 .setButtonIcons("save", "cancel")
-                .showDialog().getValue();
-        });
+                .showDialog().getValue()
+        );
     }