| Package | Description |
|---|---|
| org.openstreetmap.josm.gui.conflict.pair |
Provides the classes for displaying conflicts as pair of lists.
|
| org.openstreetmap.josm.gui.conflict.pair.nodes |
Provides the classes for displaying conflicts in ways list of nodes.
|
| org.openstreetmap.josm.gui.conflict.pair.relation |
Provides the classes for displaying conflicts in OSM primitive relation memberships.
|
| Modifier and Type | Field and Description |
|---|---|
protected AbstractListMergeModel<T,C> |
AbstractListMerger.model |
private AbstractListMergeModel<? extends PrimitiveId,? extends ConflictResolveCommand> |
PairTable.model |
| Modifier and Type | Method and Description |
|---|---|
AbstractListMergeModel<T,C> |
AbstractListMergeModel.EntriesTableModel.getListMergeModel()
Returns the list merge model.
|
AbstractListMergeModel<T,C> |
AbstractListMerger.getModel()
Returns the model.
|
| Constructor and Description |
|---|
AbstractListMerger(AbstractListMergeModel<T,C> model)
Constructs a new
ListMerger. |
PairTable(java.lang.String name,
AbstractListMergeModel<? extends PrimitiveId,? extends ConflictResolveCommand> model,
OsmPrimitivesTableModel dm,
javax.swing.table.TableColumnModel cm,
javax.swing.ListSelectionModel sm)
Constructs a new
PairTable. |
| Modifier and Type | Class and Description |
|---|---|
class |
NodeListMergeModel
The model for merging two lists of way nodess
|
| Constructor and Description |
|---|
NodeListTable(java.lang.String name,
AbstractListMergeModel<Node,WayNodesConflictResolverCommand> model,
OsmPrimitivesTableModel dm,
javax.swing.ListSelectionModel sm)
Constructs a new
NodeListTable. |
| Modifier and Type | Class and Description |
|---|---|
class |
RelationMemberListMergeModel
The model for merging two lists of relation members
|
| Constructor and Description |
|---|
RelationMemberTable(java.lang.String name,
AbstractListMergeModel<RelationMember,RelationMemberConflictResolverCommand> model,
OsmPrimitivesTableModel dm,
javax.swing.ListSelectionModel sm)
Constructs a new
RelationMemberTable. |