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

Timestamp:

2009-09-03T15:13:20+02:00 (16 years ago)

Author:

Gubaer

Message:

applied #3377: patch by xeen: Less warnings for JOSM

File:

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

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

@@ -69 +69 @@
             }
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
-            if (conflict.getTheir().deleted) {
+            if (conflict.getTheir().isDeleted()) {
                 layer.data.unlinkReferencesToPrimitive(conflict.getMy());
                 conflict.getMy().delete(true);
             } else {
-                conflict.getMy().deleted = conflict.getTheir().deleted;
+                conflict.getMy().delete(conflict.getTheir().isDeleted());
             }
         } else