Uses of Class
org.openstreetmap.josm.command.conflict.ConflictResolveCommand

Packages that use ConflictResolveCommand

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.

Uses of ConflictResolveCommand in org.openstreetmap.josm.command.conflict

Subclasses of ConflictResolveCommand in org.openstreetmap.josm.command.conflict

Modifier and Type	Class	Description
class	CoordinateConflictResolveCommand	Represents the resolution of a conflict between the coordinates of two Nodes.
class	DeletedStateConflictResolveCommand	Represents the resolution of a conflict between the deleted flag of two OsmPrimitives.
class	ModifiedConflictResolveCommand	Represents the resolution of a conflict between the modified flag of two OsmPrimitives.
class	RelationMemberConflictResolverCommand	Represents the resolution of conflicts in the member list of two Relations.
class	TagConflictResolveCommand	Represents the resolution of a tag conflict in an OsmPrimitive.
class	VersionConflictResolveCommand	Represents the resolution of a version conflict between two OsmPrimitives.
class	WayNodesConflictResolverCommand	Represents the resolution of conflicts in the node list of two Ways.

Uses of ConflictResolveCommand in org.openstreetmap.josm.gui.conflict.pair

Classes in org.openstreetmap.josm.gui.conflict.pair with type parameters of type ConflictResolveCommand

Modifier and Type	Class	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.

Fields in org.openstreetmap.josm.gui.conflict.pair with type parameters of type ConflictResolveCommand

Modifier and Type	Field	Description
private AbstractListMergeModel<? extends PrimitiveId,? extends ConflictResolveCommand>	PairTable.model

Constructor parameters in org.openstreetmap.josm.gui.conflict.pair with type arguments of type ConflictResolveCommand

Constructor	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.