Changeset 10615 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler
- Timestamp:
- 2016-07-23T20:04:31+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
r10453 r10615 33 33 @Override 34 34 protected void handleRequest() { 35 GuiHelper.runInEDTAndWait(new Runnable() { 36 @Override public void run() { 37 addNode(args); 38 } 39 }); 35 GuiHelper.runInEDTAndWait(() -> addNode(args)); 40 36 } 41 37 -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
r10453 r10615 73 73 @Override 74 74 protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException { 75 GuiHelper.runInEDTAndWait(new Runnable() { 76 @Override public void run() { 77 way = addWay(); 78 } 79 }); 75 GuiHelper.runInEDTAndWait(() -> way = addWay()); 80 76 // parse parameter addtags=tag1=value1|tag2=value2 81 77 AddTagsDialog.addTags(args, sender, Collections.singleton(way)); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
r10436 r10615 14 14 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 15 15 import org.openstreetmap.josm.tools.Utils; 16 import org.openstreetmap.josm.tools.Utils.Function; 16 17 17 18 /** … … 102 103 } 103 104 } 104 GuiHelper.runInEDT(new Runnable() { 105 @Override 106 public void run() { 107 try { 108 Main.getLayerManager().addLayer(ImageryLayer.create(imgInfo)); 109 } catch (IllegalArgumentException e) { 110 Main.error(e, false); 111 } 105 GuiHelper.runInEDT(() -> { 106 try { 107 Main.getLayerManager().addLayer(ImageryLayer.create(imgInfo)); 108 } catch (IllegalArgumentException e) { 109 Main.error(e, false); 112 110 } 113 111 }); … … 134 132 public String[] getUsageExamples() { 135 133 final String types = Utils.join("|", Utils.transform(Arrays.asList(ImageryInfo.ImageryType.values()), 136 new Utils.Function<ImageryInfo.ImageryType, String>() { 137 @Override 138 public String apply(ImageryInfo.ImageryType x) { 139 return x.getTypeString(); 140 } 141 })); 134 (Function<ImageryType, String>) x -> x.getTypeString())); 142 135 return new String[] { 143 136 "/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
r10446 r10615 155 155 */ 156 156 if (args.containsKey("addtags")) { 157 GuiHelper.executeByMainWorkerInEDT(new Runnable() { 158 @Override 159 public void run() { 160 DataSet ds = Main.getLayerManager().getEditDataSet(); 161 if (ds == null) // e.g. download failed 162 return; 163 ds.clearSelection(); 164 } 157 GuiHelper.executeByMainWorkerInEDT(() -> { 158 DataSet ds = Main.getLayerManager().getEditDataSet(); 159 if (ds == null) // e.g. download failed 160 return; 161 ds.clearSelection(); 165 162 }); 166 163 } … … 170 167 if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) { 171 168 // select objects after downloading, zoom to selection. 172 GuiHelper.executeByMainWorkerInEDT(new Runnable() { 173 @Override 174 public void run() { 175 Set<OsmPrimitive> newSel = new HashSet<>(); 176 DataSet ds = Main.getLayerManager().getEditDataSet(); 177 if (ds == null) // e.g. download failed 178 return; 179 for (SimplePrimitiveId id : toSelect) { 180 final OsmPrimitive p = ds.getPrimitiveById(id); 181 if (p != null) { 182 newSel.add(p); 183 forTagAdd.add(p); 184 } 185 } 186 toSelect.clear(); 187 ds.setSelected(newSel); 188 zoom(newSel, bbox); 189 if (Main.isDisplayingMapView() && Main.map.relationListDialog != null) { 190 Main.map.relationListDialog.selectRelations(null); // unselect all relations to fix #7342 191 Main.map.relationListDialog.dataChanged(null); 192 Main.map.relationListDialog.selectRelations(Utils.filteredCollection(newSel, Relation.class)); 193 } 169 GuiHelper.executeByMainWorkerInEDT(() -> { 170 Set<OsmPrimitive> newSel = new HashSet<>(); 171 DataSet ds = Main.getLayerManager().getEditDataSet(); 172 if (ds == null) // e.g. download failed 173 return; 174 for (SimplePrimitiveId id : toSelect) { 175 final OsmPrimitive p = ds.getPrimitiveById(id); 176 if (p != null) { 177 newSel.add(p); 178 forTagAdd.add(p); 179 } 180 } 181 toSelect.clear(); 182 ds.setSelected(newSel); 183 zoom(newSel, bbox); 184 if (Main.isDisplayingMapView() && Main.map.relationListDialog != null) { 185 Main.map.relationListDialog.selectRelations(null); // unselect all relations to fix #7342 186 Main.map.relationListDialog.dataChanged(null); 187 Main.map.relationListDialog.selectRelations(Utils.filteredCollection(newSel, Relation.class)); 194 188 } 195 189 }); … … 197 191 try { 198 192 final SearchCompiler.Match search = SearchCompiler.compile(args.get("search")); 199 Main.worker.submit(new Runnable() { 200 @Override 201 public void run() { 202 final DataSet ds = Main.getLayerManager().getEditDataSet(); 203 final Collection<OsmPrimitive> filteredPrimitives = Utils.filter(ds.allPrimitives(), search); 204 ds.setSelected(filteredPrimitives); 205 forTagAdd.addAll(filteredPrimitives); 206 zoom(filteredPrimitives, bbox); 207 } 193 Main.worker.submit(() -> { 194 final DataSet ds = Main.getLayerManager().getEditDataSet(); 195 final Collection<OsmPrimitive> filteredPrimitives = Utils.filter(ds.allPrimitives(), search); 196 ds.setSelected(filteredPrimitives); 197 forTagAdd.addAll(filteredPrimitives); 198 zoom(filteredPrimitives, bbox); 208 199 }); 209 200 } catch (SearchCompiler.ParseError ex) { … … 218 209 // add changeset tags after download if necessary 219 210 if (args.containsKey("changeset_comment") || args.containsKey("changeset_source")) { 220 Main.worker.submit(new Runnable() { 221 @Override 222 public void run() { 223 if (Main.getLayerManager().getEditDataSet() != null) { 224 if (args.containsKey("changeset_comment")) { 225 Main.getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment")); 226 } 227 if (args.containsKey("changeset_source")) { 228 Main.getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source")); 229 } 211 Main.worker.submit(() -> { 212 if (Main.getLayerManager().getEditDataSet() != null) { 213 if (args.containsKey("changeset_comment")) { 214 Main.getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment")); 215 } 216 if (args.containsKey("changeset_source")) { 217 Main.getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source")); 230 218 } 231 219 } … … 245 233 } else if (Main.isDisplayingMapView()) { 246 234 // make sure this isn't called unless there *is* a MapView 247 GuiHelper.executeByMainWorkerInEDT(new Runnable() { 248 @Override 249 public void run() { 250 BoundingXYVisitor bbox1 = new BoundingXYVisitor(); 251 bbox1.visit(bbox); 252 Main.map.mapView.zoomTo(bbox1); 253 } 235 GuiHelper.executeByMainWorkerInEDT(() -> { 236 BoundingXYVisitor bbox1 = new BoundingXYVisitor(); 237 bbox1.visit(bbox); 238 Main.map.mapView.zoomTo(bbox1); 254 239 }); 255 240 } … … 297 282 toSelect.add(SimplePrimitiveId.fromString(item)); 298 283 } catch (IllegalArgumentException ex) { 299 Main.warn( "RemoteControl: invalid selection '" + item + "' ignored");284 Main.warn(ex, "RemoteControl: invalid selection '" + item + "' ignored"); 300 285 } 301 286 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
r10446 r10615 68 68 newLayer, ps, referrers, relationMembers, args.get("layer_name"), null); 69 69 Main.worker.submit(task); 70 Main.worker.submit(new Runnable() { 71 @Override 72 public void run() { 73 final List<PrimitiveId> downloaded = task.getDownloadedId(); 74 final DataSet ds = Main.getLayerManager().getEditDataSet(); 75 if (downloaded != null) { 76 GuiHelper.runInEDT(new Runnable() { 77 @Override 78 public void run() { 79 ds.setSelected(downloaded); 80 } 81 }); 82 Collection<OsmPrimitive> downlPrim = new HashSet<>(); 83 for (PrimitiveId id : downloaded) { 84 downlPrim.add(ds.getPrimitiveById(id)); 85 } 86 AddTagsDialog.addTags(args, sender, downlPrim); 70 Main.worker.submit(() -> { 71 final List<PrimitiveId> downloaded = task.getDownloadedId(); 72 final DataSet ds = Main.getLayerManager().getEditDataSet(); 73 if (downloaded != null) { 74 GuiHelper.runInEDT(() -> ds.setSelected(downloaded)); 75 Collection<OsmPrimitive> downlPrim = new HashSet<>(); 76 for (PrimitiveId id : downloaded) { 77 downlPrim.add(ds.getPrimitiveById(id)); 87 78 } 88 ps.clear();79 AddTagsDialog.addTags(args, sender, downlPrim); 89 80 } 81 ps.clear(); 90 82 }); 91 83 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java
r8392 r10615 43 43 @Override 44 44 protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException { 45 GuiHelper.runInEDTAndWait(new Runnable() { 46 @Override public void run() { 47 OpenFileAction.openFiles(Arrays.asList(new File(args.get("filename")))); 48 } 49 }); 45 GuiHelper.runInEDTAndWait(() -> OpenFileAction.openFiles(Arrays.asList(new File(args.get("filename"))))); 50 46 } 51 47
Note:
See TracChangeset
for help on using the changeset viewer.