Package org.openstreetmap.josm.command.conflict

Class VersionConflictResolveCommand

java.lang.Object

org.openstreetmap.josm.command.Command

org.openstreetmap.josm.command.conflict.ConflictResolveCommand

org.openstreetmap.josm.command.conflict.VersionConflictResolveCommand

All Implemented Interfaces:

PseudoCommand

public class VersionConflictResolveCommand
extends ConflictResolveCommand

Represents the resolution of a version conflict between two OsmPrimitives.

Since:

1622

Nested Class Summary

Nested classes/interfaces inherited from class org.openstreetmap.josm.command.Command

Command.OldNodeState

Field Summary

Fields

Modifier and Type	Field	Description
private Conflict<? extends OsmPrimitive>	conflict	the conflict to resolve

Fields inherited from class org.openstreetmap.josm.command.Command

IS_INCOMPLETE, IS_OK, IS_OUTSIDE

Constructor Summary

Constructors

Constructor	Description
VersionConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict)	constructor

Method Summary

Modifier and Type	Method	Description
boolean	equals(java.lang.Object obj)
boolean	executeCommand()	Executes the command on the dataset.
void	fillModifiedData(java.util.Collection<OsmPrimitive> modified, java.util.Collection<OsmPrimitive> deleted, java.util.Collection<OsmPrimitive> added)	Fill in the changed data this command operates on.
javax.swing.Icon	getDescriptionIcon()	Provides a descriptive icon of this command.
java.lang.String	getDescriptionText()	Provides a description text representing this command.
int	hashCode()

Methods inherited from class org.openstreetmap.josm.command.conflict.ConflictResolveCommand

reconstituteConflicts, rememberConflict, undoCommand

Methods inherited from class org.openstreetmap.josm.command.Command

checkOutlyingOrIncompleteOperation, ensurePrimitivesAreInDataset, getAffectedDataSet, getOrig, getParticipatingPrimitives

Methods inherited from class java.lang.Object

clone, finalize, getClass, notify, notifyAll, toString, wait, wait, wait

Methods inherited from interface org.openstreetmap.josm.command.PseudoCommand

getChildren

Field Detail

conflict

private final Conflict<? extends OsmPrimitive> conflict

the conflict to resolve

Constructor Detail

VersionConflictResolveCommand

public VersionConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict)

constructor

Parameters:

conflict - the conflict data set

Method Detail

getDescriptionText

public java.lang.String getDescriptionText()

Description copied from interface: PseudoCommand

Provides a description text representing this command.

Returns:

description text representing this command

getDescriptionIcon

public javax.swing.Icon getDescriptionIcon()

Description copied from interface: PseudoCommand

Provides a descriptive icon of this command.

Returns:

descriptive icon of this command

executeCommand

public boolean executeCommand()

Description copied from class: Command

Executes the command on the dataset. This implementation will remember all primitives returned by fillModifiedData for restoring them on undo.

The layer should be invalidated after execution so that it can be re-painted.

Overrides:

executeCommand in class Command

Returns:

true

fillModifiedData

public void fillModifiedData(java.util.Collection<OsmPrimitive> modified,
                             java.util.Collection<OsmPrimitive> deleted,
                             java.util.Collection<OsmPrimitive> added)

Description copied from class: Command

Fill in the changed data this command operates on. Add to the lists, don't clear them.

Specified by:

fillModifiedData in class Command

Parameters:

modified - The modified primitives

deleted - The deleted primitives

added - The added primitives

hashCode

public int hashCode()

Overrides:

hashCode in class ConflictResolveCommand

equals

public boolean equals(java.lang.Object obj)

Overrides:

equals in class ConflictResolveCommand