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

Timestamp:

2015-10-19T20:25:49+02:00 (9 years ago)

Author:

Don-vip

Message:

add unit test for ConflictAddCommand

Location:

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

Files:

• ConflictAddCommand.java (modified) (2 diffs)
• ConflictResolveCommand.java (modified) (1 diff)
• CoordinateConflictResolveCommand.java (modified) (1 diff)
• DeletedStateConflictResolveCommand.java (modified) (1 diff)
• ModifiedConflictResolveCommand.java (modified) (1 diff)
• TagConflictResolveCommand.java (modified) (1 diff)
• VersionConflictResolveCommand.java (modified) (1 diff)
• WayNodesConflictResolverCommand.java (modified) (1 diff)

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

@@ -22 +22 @@
  */
 public class ConflictAddCommand extends Command {
-    private Conflict<? extends OsmPrimitive> conflict;
+    private final Conflict<? extends OsmPrimitive> conflict;
 
     /**
@@ -61 +61 @@
     @Override
     public void undoCommand() {
-        if (!Main.map.mapView.hasLayer(getLayer())) {
+        if (Main.map != null && !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

@@ -20 +20 @@
 public abstract class ConflictResolveCommand extends Command {
     /** the list of resolved conflicts */
-    private ConflictCollection resolvedConflicts;
+    private final ConflictCollection resolvedConflicts;
 
     /**

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

@@ -21 +21 @@
 
     /** the conflict to resolve */
-    private Conflict<? extends OsmPrimitive> conflict;
+    private final Conflict<? extends OsmPrimitive> conflict;
 
     /** the merge decision */

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

@@ -21 +21 @@
 
     /** the conflict to resolve */
-    private Conflict<? extends OsmPrimitive> conflict;
+    private final Conflict<? extends OsmPrimitive> conflict;
 
     /** the merge decision */

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

@@ -22 +22 @@
 
     /** the conflict to resolve */
-    private Conflict<? extends OsmPrimitive> conflict;
+    private final Conflict<? extends OsmPrimitive> conflict;
 
     /**

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

@@ -22 +22 @@
 public class TagConflictResolveCommand extends ConflictResolveCommand {
     /** the conflict to resolve */
-    private Conflict<? extends OsmPrimitive> conflict;
+    private final Conflict<? extends OsmPrimitive> conflict;
 
     /** the list of merge decisions, represented as {@link TagMergeItem}s */

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

@@ -22 +22 @@
 
     /** the conflict to resolve */
-    private Conflict<? extends OsmPrimitive> conflict;
+    private final Conflict<? extends OsmPrimitive> conflict;
 
     /**

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

@@ -22 +22 @@
 public class WayNodesConflictResolverCommand extends ConflictResolveCommand {
     /** the conflict to resolve */
-    private Conflict<Way> conflict;
+    private final Conflict<Way> conflict;
 
     /** the list of merged nodes. This becomes the list of news of my way after the