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

Timestamp:

2009-06-07T23:22:54+02:00 (16 years ago)

Author:

Gubaer

Message:

added merge support for coordinate conflicts
added merge support for conflicts due to different deleted states

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• CoordinateConflictResolveCommand.java (added)
• DeletedStateConflictResolveCommand.java (added)
• TagConflictResolveCommand.java (modified) (2 diffs)
• VersionConflictResolveCommand.java (modified) (1 diff)
• WayNodesConflictResolverCommand.java (modified) (6 diffs)

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.tags.MergeDecisionType;
+import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
 import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -121 +121 @@
         //
         if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.conflicts.put(my,their);
+            Main.map.conflictDialog.addConflict(my, their);
         }
     }
-
-
 }

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

@@ -86 +86 @@
         }
     }
-
-
 }

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

@@ -25 +25 @@
 
     /** my way */
-    private Way my;
-    /** their way */ 
-    private Way their;
+    private final Way my;
+    /** their way */
+    private final Way their;
     /** the list of merged nodes. This becomes the list of news of my way after the
      *  command is executed
      */
-    private List<Node> mergedNodeList; 
-    
+    private final List<Node> mergedNodeList;
+
     /**
      * 
      * @param my my may
      * @param their their way
-     * @param mergedNodeList  the list of merged nodes 
+     * @param mergedNodeList  the list of merged nodes
      */
     public WayNodesConflictResolverCommand(Way my, Way their, List<Node> mergedNodeList) {
@@ -44 +44 @@
         this.mergedNodeList = mergedNodeList;
     }
-    
-    
+
+
     @Override
     public MutableTreeNode description() {
         return new DefaultMutableTreeNode(
                 new JLabel(
-                   tr("Resolve conflicts in node list of of way {0}", my.id), 
-                   ImageProvider.get("data", "object"), 
-                   JLabel.HORIZONTAL
+                        tr("Resolve conflicts in node list of of way {0}", my.id),
+                        ImageProvider.get("data", "object"),
+                        JLabel.HORIZONTAL
                 )
-         );
+        );
     }
 
@@ -62 +62 @@
         //
         super.executeCommand();
-        
+
         // replace the list of nodes of 'my' way by the list of merged
-        // nodes 
+        // nodes
         //
         my.nodes.clear();
@@ -74 +74 @@
             }
         }
-        return true;        
+        return true;
     }
 
@@ -80 +80 @@
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        modified.add(my);        
+        modified.add(my);
     }
 
@@ -88 +88 @@
         //
         super.undoCommand();
-        
+
         // restore a conflict if necessary
         //
         if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.conflicts.put(my,their);
+            Main.map.conflictDialog.addConflict(my, their);
         }
     }