Package org.openstreetmap.josm.gui.conflict.pair

Provides the classes for displaying conflicts as pair of lists.

Interface Summary

Interface	Description
AbstractListMerger.FreezeActionProperties
IConflictResolver	The conflict resolver receives the result of a ConflictDialog.

Class Summary

Class	Description
AbstractListMergeModel<T extends PrimitiveId,C extends ConflictResolveCommand>	ListMergeModel is a model for interactively comparing and merging two list of entries of type T.
AbstractListMerger<T extends PrimitiveId,C extends ConflictResolveCommand>	A UI component for resolving conflicts in two lists of entries of type T.
AbstractListMerger.CopyAction	Base class of all other Copy* inner classes.
AbstractMergePanel	A panel used as tab in the merge dialog.
AbstractMergePanel.AbstractUndecideRow	Add the undecide button to the middle of the merged row.
AbstractMergePanel.MergeRow	A helper class to add a row to the layout.
AbstractMergePanel.MergeRowWithoutButton	A row that does not contain the merge buttons.
AbstractMergePanel.TitleRow	The title for the rows (mine, merged, theirs)
ComparePairListCellRenderer	This ListCellRenderer renders the value of a ComparePairType
ConflictResolver	An UI component for resolving conflicts between two OsmPrimitives.
PairTable	This is the base class for all tables that display an AbstractListMergeModel.

Enum Summary

Enum	Description
ComparePairType	Enumeration of the possible comparison pairs
ListRole	Enumeration of roles entry lists play in AbstractListMergeModel
MergeDecisionType	This is the merge decision for a primitive.