org.openstreetmap.josm.command
Class DeletedStateConflictResolveCommand

java.lang.Object
  org.openstreetmap.josm.command.PseudoCommand
      org.openstreetmap.josm.command.Command
          org.openstreetmap.josm.command.ConflictResolveCommand
              org.openstreetmap.josm.command.DeletedStateConflictResolveCommand

public class DeletedStateConflictResolveCommand
extends ConflictResolveCommand

Represents a the resolution of a conflict between the coordinates of two Nodes

Field Summary

private Conflict<? extends OsmPrimitive>	conflict the conflict to resolve
private MergeDecisionType	decision the merge decision

Constructor Summary

DeletedStateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, MergeDecisionType decision)
constructor

Method Summary

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

decision

private final MergeDecisionType decision

the merge decision

Constructor Detail

DeletedStateConflictResolveCommand

public DeletedStateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict,
                                          MergeDecisionType decision)

constructor

Parameters:

my - my node

their - their node

decision - the merge decision

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

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