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

Timestamp:

2016-11-26T21:28:20+01:00 (7 years ago)

Author:

Don-vip

Message:

refactor conflict classes

File:

• trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java (modified) (8 diffs)

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

@@ -11 +11 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -19 +20 @@
 /**
  * Represents the resolution of conflicts in the member list of two {@link Relation}s.
- *
+ * @since 1631
  */
 public class RelationMemberConflictResolverCommand extends ConflictResolveCommand {
-    /** my relation */
-    private final Relation my;
-    /** their relation */
-    private final Relation their;
-    /** the list of merged nodes. This becomes the list of news of my way after the
-     *  command is executed
-     */
+    /** the conflict to resolve */
+    private final Conflict<Relation> conflict;
+    /** the list of merged nodes. This becomes the list of news of my way after the command is executed */
     private final List<RelationMember> mergedMembers;
 
     /**
-     *
-     * @param my my relation
-     * @param their their relation
+     * Constructs a new {@code RelationMemberConflictResolverCommand}.
+     * @param conflict the conflict to resolve
      * @param mergedMembers the list of merged relation members
      */
-    public RelationMemberConflictResolverCommand(Relation my, Relation their, List<RelationMember> mergedMembers) {
-        this.my = my;
-        this.their = their;
+    @SuppressWarnings("unchecked")
+    public RelationMemberConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict, List<RelationMember> mergedMembers) {
+        this.conflict = (Conflict<Relation>) conflict;
         this.mergedMembers = mergedMembers;
     }
@@ -45 +41 @@
     @Override
     public String getDescriptionText() {
-        return tr("Resolve conflicts in member list of relation {0}", my.getId());
+        return tr("Resolve conflicts in member list of relation {0}", conflict.getMy().getId());
     }
 
@@ -61 +57 @@
         // replace the list of members of 'my' relation by the list of merged members
         //
-        my.setMembers(mergedMembers);
+        conflict.getMy().setMembers(mergedMembers);
 
         return true;
@@ -69 +65 @@
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        modified.add(my);
+        modified.add(conflict.getMy());
     }
 
@@ -92 +88 @@
         // restore a conflict if necessary
         //
-        if (!editLayer.getConflicts().hasConflictForMy(my)) {
-            editLayer.getConflicts().add(my, their);
+        if (!editLayer.getConflicts().hasConflictForMy(conflict.getMy())) {
+            editLayer.getConflicts().add(conflict);
         }
     }
@@ -99 +95 @@
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), my, their, mergedMembers);
+        return Objects.hash(super.hashCode(), conflict, mergedMembers);
     }
 
@@ -108 +104 @@
         if (!super.equals(obj)) return false;
         RelationMemberConflictResolverCommand that = (RelationMemberConflictResolverCommand) obj;
-        return Objects.equals(my, that.my) &&
-                Objects.equals(their, that.their) &&
-                Objects.equals(mergedMembers, that.mergedMembers);
+        return Objects.equals(conflict, that.conflict) &&
+               Objects.equals(mergedMembers, that.mergedMembers);
     }
 }