org.openstreetmap.josm.command.conflict

Class VersionConflictResolveCommand

java.lang.Object

org.openstreetmap.josm.command.PseudoCommand

org.openstreetmap.josm.command.Command

org.openstreetmap.josm.command.conflict.ConflictResolveCommand

org.openstreetmap.josm.command.conflict.VersionConflictResolveCommand

public class VersionConflictResolveCommand
extends ConflictResolveCommand

Represents the resolution of a version conflict between two OsmPrimitives.

Nested Class Summary

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

Command.OldNodeState

Field Summary

Fields

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

Constructor Summary

Constructors

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

Method Summary

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

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

reconstituteConflicts, rememberConflict, undoCommand

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

checkAndConfirmOutlyingOperation, getLayer, getOrig, getParticipatingPrimitives, invalidBecauselayerRemoved

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

getChildren

Methods inherited from class java.lang.Object

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

Field Detail

conflict

private 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 class: PseudoCommand

Provides a description text representing this command.

Specified by:

getDescriptionText in class PseudoCommand

getDescriptionIcon

public javax.swing.Icon getDescriptionIcon()

Description copied from class: PseudoCommand

Provides a descriptive icon of this command.

Overrides:

getDescriptionIcon in class PseudoCommand

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.

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