org.openstreetmap.josm.command.conflict

Class RelationMemberConflictResolverCommand

java.lang.Object

org.openstreetmap.josm.command.PseudoCommand

org.openstreetmap.josm.command.Command

org.openstreetmap.josm.command.conflict.ConflictResolveCommand

org.openstreetmap.josm.command.conflict.RelationMemberConflictResolverCommand

public class RelationMemberConflictResolverCommand
extends ConflictResolveCommand

Represents the resolution of conflicts in the member list of two Relations.

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 java.util.List<RelationMember>	mergedMembers the list of merged nodes.
private Relation	my my relation
private Relation	their their relation

Constructor Summary

Constructors

Constructor and Description
RelationMemberConflictResolverCommand(Relation my, Relation their, java.util.List<RelationMember> mergedMembers)

Method Summary

Modifier and Type	Method and 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()
void	undoCommand() Undoes the command.

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

reconstituteConflicts, rememberConflict

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

checkAndConfirmOutlyingOperation, getAffectedDataSet, getLayer, getOrig, getParticipatingPrimitives, invalidateAffectedLayers, invalidBecauselayerRemoved

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

getChildren

Methods inherited from class java.lang.Object

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

Field Detail

my

private final Relation my

my relation

their

private final Relation their

their relation

mergedMembers

private final java.util.List<RelationMember> mergedMembers

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

Constructor Detail

RelationMemberConflictResolverCommand

public RelationMemberConflictResolverCommand(Relation my,
                                             Relation their,
                                             java.util.List<RelationMember> mergedMembers)

Parameters:

my - my relation

their - their relation

mergedMembers - the list of merged relation members

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

Returns:

description text representing this command

getDescriptionIcon

public javax.swing.Icon getDescriptionIcon()

Description copied from class: PseudoCommand

Provides a descriptive icon of this command.

Overrides:

getDescriptionIcon in class PseudoCommand

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

See Also:

Command.invalidateAffectedLayers()

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

undoCommand

public void undoCommand()

Description copied from class: Command

Undoes the command. It can be assumed that all objects are in the same state they were before. It can also be assumed that executeCommand was called exactly once before. This implementation undoes all objects stored by a former call to executeCommand.

Overrides:

undoCommand in class ConflictResolveCommand

hashCode

public int hashCode()

Overrides:

hashCode in class ConflictResolveCommand

equals

public boolean equals(java.lang.Object obj)

Overrides:

equals in class ConflictResolveCommand