Package org.openstreetmap.josm.command.conflict

Provides commands for handling conflicts.

Class Summary

Class	Description
ConflictAddCommand	Command used to add a new conflict.
ConflictResolveCommand	This is the common base class for Commands which manipulate Conflicts in addition to OsmPrimitives.
CoordinateConflictResolveCommand	Represents the resolution of a conflict between the coordinates of two Nodes.
DeletedStateConflictResolveCommand	Represents the resolution of a conflict between the deleted flag of two OsmPrimitives.
ModifiedConflictResolveCommand	Represents the resolution of a conflict between the modified flag of two OsmPrimitives.
RelationMemberConflictResolverCommand	Represents the resolution of conflicts in the member list of two Relations.
TagConflictResolveCommand	Represents the resolution of a tag conflict in an OsmPrimitive.
VersionConflictResolveCommand	Represents the resolution of a version conflict between two OsmPrimitives.
WayNodesConflictResolverCommand	Represents the resolution of conflicts in the node list of two Ways.