Changeset 10615 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

Timestamp:

2016-07-23T20:04:31+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes containing only one method should become lambdas

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -155 +155 @@
          */
         if (args.containsKey("addtags")) {
-            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
-                @Override
-                public void run() {
-                    DataSet ds = Main.getLayerManager().getEditDataSet();
-                    if (ds == null) // e.g. download failed
-                        return;
-                    ds.clearSelection();
-                }
+            GuiHelper.executeByMainWorkerInEDT(() -> {
+                DataSet ds = Main.getLayerManager().getEditDataSet();
+                if (ds == null) // e.g. download failed
+                    return;
+                ds.clearSelection();
             });
         }
@@ -170 +167 @@
         if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) {
             // select objects after downloading, zoom to selection.
-            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
-                @Override
-                public void run() {
-                    Set<OsmPrimitive> newSel = new HashSet<>();
-                    DataSet ds = Main.getLayerManager().getEditDataSet();
-                    if (ds == null) // e.g. download failed
-                        return;
-                    for (SimplePrimitiveId id : toSelect) {
-                        final OsmPrimitive p = ds.getPrimitiveById(id);
-                        if (p != null) {
-                            newSel.add(p);
-                            forTagAdd.add(p);
-                        }
-                    }
-                    toSelect.clear();
-                    ds.setSelected(newSel);
-                    zoom(newSel, bbox);
-                    if (Main.isDisplayingMapView() && Main.map.relationListDialog != null) {
-                        Main.map.relationListDialog.selectRelations(null); // unselect all relations to fix #7342
-                        Main.map.relationListDialog.dataChanged(null);
-                        Main.map.relationListDialog.selectRelations(Utils.filteredCollection(newSel, Relation.class));
-                    }
+            GuiHelper.executeByMainWorkerInEDT(() -> {
+                Set<OsmPrimitive> newSel = new HashSet<>();
+                DataSet ds = Main.getLayerManager().getEditDataSet();
+                if (ds == null) // e.g. download failed
+                    return;
+                for (SimplePrimitiveId id : toSelect) {
+                    final OsmPrimitive p = ds.getPrimitiveById(id);
+                    if (p != null) {
+                        newSel.add(p);
+                        forTagAdd.add(p);
+                    }
+                }
+                toSelect.clear();
+                ds.setSelected(newSel);
+                zoom(newSel, bbox);
+                if (Main.isDisplayingMapView() && Main.map.relationListDialog != null) {
+                    Main.map.relationListDialog.selectRelations(null); // unselect all relations to fix #7342
+                    Main.map.relationListDialog.dataChanged(null);
+                    Main.map.relationListDialog.selectRelations(Utils.filteredCollection(newSel, Relation.class));
                 }
             });
@@ -197 +191 @@
             try {
                 final SearchCompiler.Match search = SearchCompiler.compile(args.get("search"));
-                Main.worker.submit(new Runnable() {
-                    @Override
-                    public void run() {
-                        final DataSet ds = Main.getLayerManager().getEditDataSet();
-                        final Collection<OsmPrimitive> filteredPrimitives = Utils.filter(ds.allPrimitives(), search);
-                        ds.setSelected(filteredPrimitives);
-                        forTagAdd.addAll(filteredPrimitives);
-                        zoom(filteredPrimitives, bbox);
-                    }
+                Main.worker.submit(() -> {
+                    final DataSet ds = Main.getLayerManager().getEditDataSet();
+                    final Collection<OsmPrimitive> filteredPrimitives = Utils.filter(ds.allPrimitives(), search);
+                    ds.setSelected(filteredPrimitives);
+                    forTagAdd.addAll(filteredPrimitives);
+                    zoom(filteredPrimitives, bbox);
                 });
             } catch (SearchCompiler.ParseError ex) {
@@ -218 +209 @@
         // add changeset tags after download if necessary
         if (args.containsKey("changeset_comment") || args.containsKey("changeset_source")) {
-            Main.worker.submit(new Runnable() {
-                @Override
-                public void run() {
-                    if (Main.getLayerManager().getEditDataSet() != null) {
-                        if (args.containsKey("changeset_comment")) {
-                            Main.getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment"));
-                        }
-                        if (args.containsKey("changeset_source")) {
-                            Main.getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source"));
-                        }
+            Main.worker.submit(() -> {
+                if (Main.getLayerManager().getEditDataSet() != null) {
+                    if (args.containsKey("changeset_comment")) {
+                        Main.getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment"));
+                    }
+                    if (args.containsKey("changeset_source")) {
+                        Main.getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source"));
                     }
                 }
@@ -245 +233 @@
         } else if (Main.isDisplayingMapView()) {
             // make sure this isn't called unless there *is* a MapView
-            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
-                @Override
-                public void run() {
-                    BoundingXYVisitor bbox1 = new BoundingXYVisitor();
-                    bbox1.visit(bbox);
-                    Main.map.mapView.zoomTo(bbox1);
-                }
+            GuiHelper.executeByMainWorkerInEDT(() -> {
+                BoundingXYVisitor bbox1 = new BoundingXYVisitor();
+                bbox1.visit(bbox);
+                Main.map.mapView.zoomTo(bbox1);
             });
         }
@@ -297 +282 @@
                     toSelect.add(SimplePrimitiveId.fromString(item));
                 } catch (IllegalArgumentException ex) {
-                    Main.warn("RemoteControl: invalid selection '" + item + "' ignored");
+                    Main.warn(ex, "RemoteControl: invalid selection '" + item + "' ignored");
                 }
             }