Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2017-08-24T22:53:50+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/Command.java
r12348 r12636 25 25 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor; 26 26 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; 27 import org.openstreetmap.josm.gui.MainApplication; 27 28 import org.openstreetmap.josm.gui.layer.Layer; 28 29 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 144 145 */ 145 146 public Command() { 146 this.layer = Main .getLayerManager().getEditLayer();147 this.layer = MainApplication.getLayerManager().getEditLayer(); 147 148 this.data = layer != null ? layer.data : null; 148 149 } -
trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java
r12630 r12636 65 65 @Override 66 66 public void undoCommand() { 67 if (MainApplication.isDisplayingMapView() && !Main .getLayerManager().containsLayer(getLayer())) {67 if (MainApplication.isDisplayingMapView() && !MainApplication.getLayerManager().containsLayer(getLayer())) { 68 68 Logging.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.", 69 69 getLayer().getName(), -
trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java
r12630 r12636 6 6 import java.util.Objects; 7 7 8 import org.openstreetmap.josm.Main;9 8 import org.openstreetmap.josm.command.Command; 10 9 import org.openstreetmap.josm.data.conflict.Conflict; … … 73 72 74 73 if (MainApplication.isDisplayingMapView()) { 75 if (!Main .getLayerManager().containsLayer(getLayer())) {74 if (!MainApplication.getLayerManager().containsLayer(getLayer())) { 76 75 Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", 77 76 this.toString(), … … 81 80 } 82 81 83 Main .getLayerManager().setActiveLayer(getLayer());82 MainApplication.getLayerManager().setActiveLayer(getLayer()); 84 83 } 85 84 reconstituteConflicts(); -
trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
r12620 r12636 10 10 import javax.swing.Icon; 11 11 12 import org.openstreetmap.josm.Main;13 12 import org.openstreetmap.josm.data.conflict.Conflict; 14 13 import org.openstreetmap.josm.data.osm.OsmPrimitive; 15 14 import org.openstreetmap.josm.data.osm.Relation; 16 15 import org.openstreetmap.josm.data.osm.RelationMember; 16 import org.openstreetmap.josm.gui.MainApplication; 17 17 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 18 18 import org.openstreetmap.josm.tools.ImageProvider; … … 72 72 public void undoCommand() { 73 73 OsmDataLayer layer = getLayer(); 74 if (!Main .getLayerManager().containsLayer(layer)) {74 if (!MainApplication.getLayerManager().containsLayer(layer)) { 75 75 Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", 76 76 this.toString(), … … 80 80 } 81 81 82 Main .getLayerManager().setActiveLayer(layer);83 OsmDataLayer editLayer = Main .getLayerManager().getEditLayer();82 MainApplication.getLayerManager().setActiveLayer(layer); 83 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer(); 84 84 85 85 // restore the former state
Note:
See TracChangeset
for help on using the changeset viewer.