Package | Description |
---|---|
org.openstreetmap.josm.command.conflict |
Provides commands for handling conflicts.
|
org.openstreetmap.josm.gui.conflict.pair |
Provides the classes for displaying conflicts as pair of lists.
|
Modifier and Type | Class and Description |
---|---|
class |
CoordinateConflictResolveCommand
Represents the resolution of a conflict between the coordinates of two
Node s. |
class |
DeletedStateConflictResolveCommand
Represents the resolution of a conflict between the deleted flag of two
OsmPrimitive s. |
class |
ModifiedConflictResolveCommand
Represents the resolution of a conflict between the modified flag of two
OsmPrimitive s. |
class |
RelationMemberConflictResolverCommand
Represents the resolution of conflicts in the member list of two
Relation s. |
class |
TagConflictResolveCommand
Represents the resolution of a tag conflict in an
OsmPrimitive . |
class |
VersionConflictResolveCommand
Represents the resolution of a version conflict between two
OsmPrimitive s. |
class |
WayNodesConflictResolverCommand
Represents the resolution of conflicts in the node list of two
Way s. |
Modifier and Type | Class and Description |
---|---|
class |
AbstractListMergeModel<T extends PrimitiveId,C extends ConflictResolveCommand>
ListMergeModel is a model for interactively comparing and merging two list of entries
of type T.
|
class |
AbstractListMerger<T extends PrimitiveId,C extends ConflictResolveCommand>
A UI component for resolving conflicts in two lists of entries of type T.
|
Modifier and Type | Field and Description |
---|---|
private AbstractListMergeModel<? extends PrimitiveId,? extends ConflictResolveCommand> |
PairTable.model |
Constructor and Description |
---|
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 . |