org.openstreetmap.josm.command
Class WayNodesConflictResolverCommand

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

public class WayNodesConflictResolverCommand
extends ConflictResolveCommand

Represent a command for resolving conflicts in the node list of two Ways.

Field Summary

private Conflict<Way>	conflict the conflict to resolve
private java.util.List<Node>	mergedNodeList the list of merged nodes.

Constructor Summary

WayNodesConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict, java.util.List<Node> mergedNodeList)

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<Way> conflict

the conflict to resolve

mergedNodeList

private final java.util.List<Node> mergedNodeList

the list of merged nodes. This becomes the list of news of my way after the command is executed

Constructor Detail

WayNodesConflictResolverCommand

public WayNodesConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict,
                                       java.util.List<Node> mergedNodeList)

Parameters:

my - my may

their - their way

mergedNodeList - the list of merged nodes

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