Changeset 11318 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTable.java

Timestamp:

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

Author:

Don-vip

Message:

refactor conflict classes

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTable.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTable.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.actions.ZoomToAction;
+import org.openstreetmap.josm.command.conflict.RelationMemberConflictResolverCommand;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
@@ -10 +11 @@
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
 
+/**
+ * Relation member table.
+ * @since 5297
+ */
 public class RelationMemberTable extends PairTable {
 
@@ -19 +24 @@
      * @param sm selection model
      */
-    public RelationMemberTable(String name, ListMergeModel<RelationMember> model, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
+    public RelationMemberTable(String name, ListMergeModel<RelationMember, RelationMemberConflictResolverCommand> model,
+            OsmPrimitivesTableModel dm, ListSelectionModel sm) {
         super(name, model, dm, new RelationMemberListColumnModel(), sm);
     }