Changeset 10453 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2016-06-22T00:48:51+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
r10446 r10453 316 316 @Override 317 317 public void actionPerformed(ActionEvent e) { 318 if ( !Main.main.hasEditLayer())318 if (Main.getLayerManager().getEditLayer() == null) 319 319 return; 320 320 ChangesetListModel model = getCurrentChangesetListModel(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
r10413 r10453 39 39 import org.openstreetmap.josm.command.Command; 40 40 import org.openstreetmap.josm.command.PseudoCommand; 41 import org.openstreetmap.josm.data.osm.DataSet; 41 42 import org.openstreetmap.josm.data.osm.OsmPrimitive; 42 43 import org.openstreetmap.josm.gui.SideButton; … … 268 269 private void buildTrees() { 269 270 setTitle(tr("Command Stack")); 270 if ( !Main.main.hasEditLayer())271 if (Main.getLayerManager().getEditLayer() == null) 271 272 return; 272 273 … … 389 390 throw new IllegalStateException(); 390 391 391 OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();392 if ( editLayer== null) return;393 editLayer.data.setSelected(getAffectedPrimitives(path));392 DataSet dataSet = Main.getLayerManager().getEditDataSet(); 393 if (dataSet == null) return; 394 dataSet.setSelected(getAffectedPrimitives(path)); 394 395 } 395 396 … … 417 418 public void actionPerformed(ActionEvent e) { 418 419 super.actionPerformed(e); 419 if (!Main.main.hasEditLayer()) return;420 420 AutoScaleAction.autoScale("selection"); 421 421 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r10446 r10453 339 339 @Override 340 340 public void mouseClicked(MouseEvent e) { 341 if ( !Main.main.hasEditLayer()) return;341 if (Main.getLayerManager().getEditLayer() == null) return; 342 342 if (isDoubleClick(e)) { 343 343 if (e.isControlDown()) { … … 371 371 372 372 protected void updateEnabledState() { 373 setEnabled(Main. main != null && Main.main.hasEditLayer());373 setEnabled(Main.getLayerManager().getEditLayer() != null); 374 374 } 375 375 -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r10446 r10453 310 310 311 311 protected void updateEnabledState() { 312 setEnabled(Main. main != null && Main.main.hasEditLayer());312 setEnabled(Main.getLayerManager().getEditLayer() != null); 313 313 } 314 314 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
r10438 r10453 333 333 334 334 protected Set<OsmPrimitive> getTarget() { 335 if (!isEnabled() || Main.main == null || !Main.main.hasEditLayer()) {335 if (!isEnabled()) { 336 336 return null; 337 337 } 338 338 OsmDataLayer layer = Main.getLayerManager().getEditLayer(); 339 if (layer == null) { 340 return null; 341 } 339 342 Set<OsmPrimitive> target = new HashSet<>(); 340 343 for (HistoryOsmPrimitive p : model.getSelectedPrimitives()) { … … 348 351 349 352 public final void updateEnabledState() { 350 if (Main.main == null || !Main.main.hasEditLayer()) { 351 setEnabled(false); 352 return; 353 } 354 setEnabled(model.hasSelectedPrimitives()); 353 setEnabled(Main.getLayerManager().getEditLayer() != null && model.hasSelectedPrimitives()); 355 354 } 356 355 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
r10438 r10453 347 347 if (!isEnabled()) 348 348 return; 349 if (Main.main == null || !Main.main.hasEditLayer()) return;350 349 OsmDataLayer layer = Main.getLayerManager().getEditLayer(); 350 if (layer == null) { 351 return; 352 } 351 353 Set<OsmPrimitive> target = new HashSet<>(); 352 354 for (OsmPrimitive p: layer.data.allPrimitives()) { … … 363 365 364 366 public void updateEnabledState() { 365 if (Main.main == null || !Main.main.hasEditLayer()) { 366 setEnabled(false); 367 return; 368 } 369 setEnabled(currentChangeset != null); 367 setEnabled(Main.getLayerManager().getEditLayer() != null && currentChangeset != null); 370 368 } 371 369 … … 408 406 if (!isEnabled()) 409 407 return; 410 if (Main.main == null || !Main.main.hasEditLayer()) return;411 408 OsmDataLayer layer = Main.getLayerManager().getEditLayer(); 409 if (layer == null) { 410 return; 411 } 412 412 Set<OsmPrimitive> target = new HashSet<>(); 413 413 for (OsmPrimitive p: layer.data.allPrimitives()) { … … 425 425 426 426 public void updateEnabledState() { 427 if (Main.main == null || !Main.main.hasEditLayer()) { 428 setEnabled(false); 429 return; 430 } 431 setEnabled(currentChangeset != null); 427 setEnabled(Main.getLayerManager().getEditLayer() != null && currentChangeset != null); 432 428 } 433 429 -
trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
r10413 r10453 266 266 267 267 public void updateEnabledState() { 268 if (!Main.main.hasEditLayer()) { 269 setEnabled(false); 270 return; 271 } 272 setEnabled(getPrimitiveToZoom() != null); 268 setEnabled(Main.getLayerManager().getEditLayer() != null && getPrimitiveToZoom() != null); 273 269 } 274 270 } -
trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
r10436 r10453 163 163 @Override 164 164 public void layerRemoving(LayerRemoveEvent e) { 165 if (e.getRemovedLayer() instanceof OsmDataLayer && Main.isDisplayingMapView() && !Main.main.hasEditLayer()) { 165 // Removed layer is still in that list. 166 if (e.getRemovedLayer() instanceof OsmDataLayer && e.getSource().getLayersOfType(OsmDataLayer.class).size() <= 1) { 166 167 Main.getLayerManager().removeLayer(this); 167 168 } else if (e.getRemovedLayer() == this) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
r10428 r10453 66 66 @Override 67 67 public void updateEnabledState() { 68 setEnabled(Main.isDisplayingMapView() && (Main. main.hasEditLayer()|| mapHasGpxorMarkerLayer()));68 setEnabled(Main.isDisplayingMapView() && (Main.getLayerManager().getEditLayer() != null || mapHasGpxorMarkerLayer())); 69 69 } 70 70 -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchAction.java
r8863 r10453 30 30 public void actionPerformed(ActionEvent e) { 31 31 32 if ( !Main.main.hasEditLayer())32 if (Main.getLayerManager().getEditLayer() == null) 33 33 return; 34 34 -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java
r10446 r10453 45 45 @Override 46 46 public void actionPerformed(ActionEvent e) { 47 if (Main. main.hasEditLayer()) {47 if (Main.getLayerManager().getEditLayer() != null) { 48 48 TaggingPresetSearchPrimitiveDialog.getInstance().showDialog(); 49 49 }
Note:
See TracChangeset
for help on using the changeset viewer.