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

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

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Files:

• AddNodeHandler.java (modified) (1 diff)
• AddWayHandler.java (modified) (1 diff)
• ImageryHandler.java (modified) (3 diffs)
• LoadAndZoomHandler.java (modified) (6 diffs)
• LoadObjectHandler.java (modified) (1 diff)
• OpenFileHandler.java (modified) (1 diff)

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

@@ -33 +33 @@
     @Override
     protected void handleRequest() {
-        GuiHelper.runInEDTAndWait(new Runnable() {
-            @Override public void run() {
-                 addNode(args);
-            }
-        });
+        GuiHelper.runInEDTAndWait(() -> addNode(args));
     }
 

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

@@ -73 +73 @@
     @Override
     protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException {
-        GuiHelper.runInEDTAndWait(new Runnable() {
-            @Override public void run() {
-                way = addWay();
-            }
-        });
+        GuiHelper.runInEDTAndWait(() -> way = addWay());
         // parse parameter addtags=tag1=value1|tag2=value2
         AddTagsDialog.addTags(args, sender, Collections.singleton(way));

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

@@ -14 +14 @@
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.Utils.Function;
 
 /**
@@ -102 +103 @@
             }
         }
-        GuiHelper.runInEDT(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Main.getLayerManager().addLayer(ImageryLayer.create(imgInfo));
-                } catch (IllegalArgumentException e) {
-                    Main.error(e, false);
-                }
+        GuiHelper.runInEDT(() -> {
+            try {
+                Main.getLayerManager().addLayer(ImageryLayer.create(imgInfo));
+            } catch (IllegalArgumentException e) {
+                Main.error(e, false);
             }
         });
@@ -134 +132 @@
     public String[] getUsageExamples() {
         final String types = Utils.join("|", Utils.transform(Arrays.asList(ImageryInfo.ImageryType.values()),
-                new Utils.Function<ImageryInfo.ImageryType, String>() {
-            @Override
-            public String apply(ImageryInfo.ImageryType x) {
-                return x.getTypeString();
-            }
-        }));
+                (Function<ImageryType, String>) x -> x.getTypeString()));
         return new String[] {
             "/imagery?title=osm&type=tms&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",

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");
                 }
             }

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

@@ -68 +68 @@
                     newLayer, ps, referrers, relationMembers, args.get("layer_name"), null);
             Main.worker.submit(task);
-            Main.worker.submit(new Runnable() {
-                @Override
-                public void run() {
-                    final List<PrimitiveId> downloaded = task.getDownloadedId();
-                    final DataSet ds = Main.getLayerManager().getEditDataSet();
-                    if (downloaded != null) {
-                        GuiHelper.runInEDT(new Runnable() {
-                            @Override
-                            public void run() {
-                                ds.setSelected(downloaded);
-                            }
-                        });
-                        Collection<OsmPrimitive> downlPrim = new HashSet<>();
-                        for (PrimitiveId id : downloaded) {
-                            downlPrim.add(ds.getPrimitiveById(id));
-                        }
-                        AddTagsDialog.addTags(args, sender, downlPrim);
+            Main.worker.submit(() -> {
+                final List<PrimitiveId> downloaded = task.getDownloadedId();
+                final DataSet ds = Main.getLayerManager().getEditDataSet();
+                if (downloaded != null) {
+                    GuiHelper.runInEDT(() -> ds.setSelected(downloaded));
+                    Collection<OsmPrimitive> downlPrim = new HashSet<>();
+                    for (PrimitiveId id : downloaded) {
+                        downlPrim.add(ds.getPrimitiveById(id));
                     }
-                    ps.clear();
+                    AddTagsDialog.addTags(args, sender, downlPrim);
                 }
+                ps.clear();
             });
         }

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

@@ -43 +43 @@
     @Override
     protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException {
-        GuiHelper.runInEDTAndWait(new Runnable() {
-            @Override public void run() {
-                OpenFileAction.openFiles(Arrays.asList(new File(args.get("filename"))));
-            }
-        });
+        GuiHelper.runInEDTAndWait(() -> OpenFileAction.openFiles(Arrays.asList(new File(args.get("filename")))));
     }