Changeset 2198 in josm for trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java

Timestamp:

2009-09-27T16:29:21+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3249: Resolve conflicts between invisible and deleted primitives automatically

File:

• trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) (6 diffs)

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

@@ -12 +12 @@
 
 /**
- * This is the common basse class for {@see Command}s which manipulate {@see Conflict}s in
+ * This is the common base class for {@see Command}s which manipulate {@see Conflict}s in
  * addition to {@see OsmPrimitive}s.
  * 
  * A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing
- * it reconstitutes these conflicts.
+ * it reconstitutes them.
  *
  */
@@ -30 +30 @@
     }
 
+    public ConflictResolveCommand(OsmDataLayer layer) {
+        super(layer);
+        resolvedConflicts = new ConflictCollection();
+    }
+
     /**
      * remembers a conflict in the internal list of remembered conflicts
@@ -35 +40 @@
      * @param c the remembered conflict
      */
-    protected void rememberConflict(Conflict c) {
+    protected void rememberConflict(Conflict<?> c) {
         if (! resolvedConflicts.hasConflictForMy(c.getMy())) {
             resolvedConflicts.add(c);
@@ -48 +53 @@
     protected void reconstituteConflicts() {
         OsmDataLayer editLayer = getLayer();
-        for(Conflict c : resolvedConflicts) {
+        for(Conflict<?> c : resolvedConflicts) {
             if (!editLayer.getConflicts().hasConflictForMy(c.getMy())) {
                 editLayer.getConflicts().add(c);
@@ -60 +65 @@
 
         if (! Main.map.mapView.hasLayer(getLayer())) {
-            logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more",
+            logger.warning(tr("Can''t undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),
                     getLayer().toString()
@@ -70 +75 @@
         reconstituteConflicts();
     }
-
-
-
 }