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

Timestamp:

2012-06-25T21:25:50+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #4493, fix #7750 - conflict manager: select and zoom primitives with id:0

File:

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

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.pair.relation;
 
-import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 
 import org.openstreetmap.josm.actions.ZoomToAction;
-import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.PairTable;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
 
-public class RelationMemberTable extends OsmPrimitivesTable {
+public class RelationMemberTable extends PairTable {
 
-    public RelationMemberTable(String name, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
-        super(dm, new RelationMemberListColumnModel(), sm);
-        setName(name);
-        setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
+    public RelationMemberTable(String name, ListMergeModel<RelationMember> model, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
+        super(name, model, dm, new RelationMemberListColumnModel(), sm);
     }