Changeset 10453 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2016-06-22T00:48:51+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
r10446 r10453 74 74 */ 75 75 public static void zoomToSelection() { 76 if (Main.main == null || !Main.main.hasEditLayer()) 76 DataSet dataSet = Main.getLayerManager().getEditDataSet(); 77 if (dataSet == null) { 77 78 return; 78 Collection<OsmPrimitive> sel = Main.getLayerManager().getEditLayer().data.getSelected(); 79 } 80 Collection<OsmPrimitive> sel = dataSet.getSelected(); 79 81 if (sel.isEmpty()) { 80 82 JOptionPane.showMessageDialog( … … 279 281 Collection<OsmPrimitive> sel = new HashSet<>(); 280 282 if ("selection".equals(mode)) { 281 sel = getLayerManager().getEditDataSet().getSelected(); 283 DataSet dataSet = getLayerManager().getEditDataSet(); 284 if (dataSet != null) { 285 sel = dataSet.getSelected(); 286 } 282 287 } else { 283 288 Conflict<? extends OsmPrimitive> c = Main.map.conflictDialog.getSelectedConflict(); -
trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
r10448 r10453 135 135 @Override 136 136 public void actionPerformed(ActionEvent e) { 137 if (!Main.main.hasEditLayer()) { 137 DataSet dataSet = Main.getLayerManager().getEditDataSet(); 138 if (dataSet == null) { 138 139 new Notification( 139 140 tr("No data loaded.")) … … 144 145 } 145 146 146 final Collection<Way> selectedWays = Main.getLayerManager().getEditDataSet().getSelectedWays();147 final Collection<Way> selectedWays = dataSet.getSelectedWays(); 147 148 148 149 if (selectedWays.isEmpty()) { … … 157 158 } 158 159 159 final Collection<Relation> selectedRelations = Main.getLayerManager().getEditDataSet().getSelectedRelations();160 final Collection<Relation> selectedRelations = dataSet.getSelectedRelations(); 160 161 final Relation multipolygonRelation = update 161 162 ? getSelectedMultipolygonRelation(selectedWays, selectedRelations) -
trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
r7937 r10453 42 42 @Override 43 43 protected void updateEnabledState() { 44 setEnabled(Main. main.hasEditLayer());44 setEnabled(Main.getLayerManager().getEditDataSet() != null); 45 45 } 46 46 } -
trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java
r8510 r10453 37 37 @Override 38 38 protected void updateEnabledState() { 39 setEnabled(Main. main.hasEditLayer());39 setEnabled(Main.getLayerManager().getEditLayer() != null); 40 40 } 41 41 -
trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java
r10428 r10453 10 10 import org.openstreetmap.josm.actions.mapmode.DeleteAction; 11 11 import org.openstreetmap.josm.data.osm.Relation; 12 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 12 13 import org.openstreetmap.josm.tools.ImageProvider; 13 14 … … 28 29 29 30 protected void deleteRelation(Collection<Relation> toDelete) { 30 if (toDelete == null) 31 OsmDataLayer layer = Main.getLayerManager().getEditLayer(); 32 if (toDelete == null || layer == null) 31 33 return; 32 DeleteAction.deleteRelations(Main.getLayerManager().getEditLayer(), toDelete); 34 35 DeleteAction.deleteRelations(layer, toDelete); 33 36 // clear selection after deletion 34 37 if (Main.map.relationListDialog != null) … … 38 41 @Override 39 42 public void actionPerformed(ActionEvent e) { 40 if (!isEnabled() || !Main.main.hasEditLayer())43 if (!isEnabled()) 41 44 return; 42 45 deleteRelation(relations);
Note:
See TracChangeset
for help on using the changeset viewer.