Package | Description |
---|---|
org.openstreetmap.josm.command.conflict |
Provides commands for handling conflicts.
|
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. |