Changeset 12726 in josm for trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

Timestamp:

2017-09-04T23:45:49+02:00 (9 years ago)

Author:

Don-vip

Message:

see #13036 - deprecate Command() default constructor, fix unit tests and java warnings

File:

• trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (modified) (1 diff)

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

@@ -79 +79 @@
     public void undoCommand() {
         DataSet ds = getAffectedDataSet();
-        if (!Main.main.containsDataSet(ds)) {
+        if (Main.main != null && !Main.main.containsDataSet(ds)) {
             Logging.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
                     ds.getName(),