Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/command/conflict

Timestamp:

2017-08-24T22:53:50+02:00 (8 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.getLayerManager(). Replacement: gui.MainApplication.getLayerManager()

Location:

trunk/src/org/openstreetmap/josm/command/conflict

Files:

• ConflictAddCommand.java (modified) (1 diff)
• ConflictResolveCommand.java (modified) (3 diffs)
• RelationMemberConflictResolverCommand.java (modified) (3 diffs)

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

@@ -65 +65 @@
     @Override
     public void undoCommand() {
-        if (MainApplication.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) {
+        if (MainApplication.isDisplayingMapView() && !MainApplication.getLayerManager().containsLayer(getLayer())) {
             Logging.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

@@ -6 +6 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -73 +72 @@
 
         if (MainApplication.isDisplayingMapView()) {
-            if (!Main.getLayerManager().containsLayer(getLayer())) {
+            if (!MainApplication.getLayerManager().containsLayer(getLayer())) {
                 Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                         this.toString(),
@@ -81 +80 @@
             }
 
-            Main.getLayerManager().setActiveLayer(getLayer());
+            MainApplication.getLayerManager().setActiveLayer(getLayer());
         }
         reconstituteConflicts();

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

@@ -10 +10 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -72 +72 @@
     public void undoCommand() {
         OsmDataLayer layer = getLayer();
-        if (!Main.getLayerManager().containsLayer(layer)) {
+        if (!MainApplication.getLayerManager().containsLayer(layer)) {
             Logging.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),
@@ -80 +80 @@
         }
 
-        Main.getLayerManager().setActiveLayer(layer);
-        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+        MainApplication.getLayerManager().setActiveLayer(layer);
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
 
         // restore the former state