Changeset 8914 in josm for trunk/src

Timestamp:

2015-10-19T23:49:11+02:00 (9 years ago)

Author:

Don-vip

Message:

improve unit tests

Location:

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

Files:

• ConflictAddCommand.java (modified) (1 diff)
• ConflictResolveCommand.java (modified) (1 diff)

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

@@ -61 +61 @@
     @Override
     public void undoCommand() {
-        if (Main.map != null && !Main.map.mapView.hasLayer(getLayer())) {
+        if (Main.isDisplayingMapView() && !Main.map.mapView.hasLayer(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

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