Changeset 31479 in osm for applications

Timestamp:

2015-08-11T11:25:05+02:00 (10 years ago)

Author:

nokutu

Message:

Fixed bug in the history dialog when moving first an image, and then a set containing that image.

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands

Files:

• CommandMoveImage.java (modified) (2 diffs)
• CommandTurnImage.java (modified) (2 diffs)
• MapillaryRecord.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandMoveImage.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -30 +31 @@
   public CommandMoveImage(List<MapillaryAbstractImage> images, double x,
       double y) {
-    this.images = images;
+    this.images = new ArrayList<MapillaryAbstractImage>(images);
     this.x = x;
     this.y = y;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/CommandTurnImage.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -26 +27 @@
    */
   public CommandTurnImage(List<MapillaryAbstractImage> images, double ca) {
-    this.images = images;
+    this.images = new ArrayList<MapillaryAbstractImage>(images);
     this.ca = ca;
   }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/commands/MapillaryRecord.java

@@ -75 +75 @@
         if (!command.images.contains(img))
           equalSets = false;
+      for (MapillaryAbstractImage img : command.images)
+        if (!this.commandList.get(this.position).images.contains(img))
+          equalSets = false;
       if (equalSets
           && this.commandList.get(this.position).getClass() == command