Changeset 10364 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2016-06-12T20:46:23+02:00 (8 years ago)

Author:

stoecker

Message:

gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• SelectCommand.java (modified) (1 diff)
• conflict/ConflictAddCommand.java (modified) (1 diff)
• conflict/ConflictResolveCommand.java (modified) (2 diffs)
• conflict/RelationMemberConflictResolverCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/SelectCommand.java

@@ -38 +38 @@
     @Override
     public void undoCommand() {
-        Main.map.mapView.getEditLayer().data.setSelected(oldSelection);
+        Main.getLayerManager().getEditLayer().data.setSelected(oldSelection);
     }
 
     @Override
     public boolean executeCommand() {
-        oldSelection = Main.map.mapView.getEditLayer().data.getSelected();
-        Main.map.mapView.getEditLayer().data.setSelected(newSelection);
+        oldSelection = Main.getLayerManager().getEditLayer().data.getSelected();
+        Main.getLayerManager().getEditLayer().data.setSelected(newSelection);
         return true;
     }

trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

@@ -62 +62 @@
     @Override
     public void undoCommand() {
-        if (Main.isDisplayingMapView() && !Main.map.mapView.hasLayer(getLayer())) {
+        if (Main.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) {
             Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
                     getLayer().getName(),

trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

@@ -71 +71 @@
 
         if (Main.isDisplayingMapView()) {
-            if (!Main.map.mapView.hasLayer(getLayer())) {
+            if (!Main.getLayerManager().containsLayer(getLayer())) {
                 Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                         this.toString(),
@@ -79 +79 @@
             }
 
-            Main.map.mapView.setActiveLayer(getLayer());
+            Main.getLayerManager().setActiveLayer(getLayer());
         }
         reconstituteConflicts();

trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

@@ -75 +75 @@
     public void undoCommand() {
         OsmDataLayer layer = getLayer();
-        if (!Main.map.mapView.hasLayer(layer)) {
+        if (!Main.getLayerManager().containsLayer(layer)) {
             Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),
@@ -83 +83 @@
         }
 
-        Main.map.mapView.setActiveLayer(layer);
+        Main.getLayerManager().setActiveLayer(layer);
         OsmDataLayer editLayer = Main.main.getEditLayer();