Changeset 11330 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java
- Timestamp:
- 2016-11-27T17:06:21+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java
r11318 r11330 15 15 public abstract class PairTable extends OsmPrimitivesTable { 16 16 17 private final transient ListMergeModel<? extends PrimitiveId, ? extends ConflictResolveCommand> model;17 private final transient AbstractListMergeModel<? extends PrimitiveId, ? extends ConflictResolveCommand> model; 18 18 19 19 /** … … 25 25 * @param sm selection model 26 26 */ 27 public PairTable(String name, ListMergeModel<? extends PrimitiveId, ? extends ConflictResolveCommand> model,27 public PairTable(String name, AbstractListMergeModel<? extends PrimitiveId, ? extends ConflictResolveCommand> model, 28 28 OsmPrimitivesTableModel dm, TableColumnModel cm, ListSelectionModel sm) { 29 29 super(dm, cm, sm);
Note:
See TracChangeset
for help on using the changeset viewer.