org.openstreetmap.josm.command.conflict

Class ConflictResolveCommand

java.lang.Object

org.openstreetmap.josm.command.PseudoCommand

org.openstreetmap.josm.command.Command

org.openstreetmap.josm.command.conflict.ConflictResolveCommand

Direct Known Subclasses:

CoordinateConflictResolveCommand, DeletedStateConflictResolveCommand, ModifiedConflictResolveCommand, RelationMemberConflictResolverCommand, TagConflictResolveCommand, VersionConflictResolveCommand, WayNodesConflictResolverCommand

public abstract class ConflictResolveCommand
extends Command

This is the common base class for Commands which manipulate Conflicts in addition to OsmPrimitives. A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing it reconstitutes them.

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 ConflictCollection	resolvedConflicts the list of resolved conflicts

Constructor Summary

Constructors

Constructor and Description
ConflictResolveCommand() Constructs a new ConflictResolveCommand in the context of the current edit layer, if any.
ConflictResolveCommand(OsmDataLayer layer) Constructs a new ConflictResolveCommand in the context of a given data layer.

Method Summary

Modifier and Type	Method and Description
protected void	reconstituteConflicts() reconstitutes all remembered conflicts.
protected void	rememberConflict(Conflict<?> c) remembers a conflict in the internal list of remembered conflicts
void	undoCommand() Undoes the command.

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

checkAndConfirmOutlyingOperation, executeCommand, fillModifiedData, getLayer, getOrig, getParticipatingPrimitives, invalidBecauselayerRemoved

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

getChildren, getDescriptionIcon, getDescriptionText

Methods inherited from class java.lang.Object

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

Field Detail

resolvedConflicts

private ConflictCollection resolvedConflicts

the list of resolved conflicts

Constructor Detail

ConflictResolveCommand

public ConflictResolveCommand()

Constructs a new ConflictResolveCommand in the context of the current edit layer, if any.

ConflictResolveCommand

public ConflictResolveCommand(OsmDataLayer layer)

Constructs a new ConflictResolveCommand in the context of a given data layer.

Parameters:

layer - the data layer. Must not be null.

Method Detail

rememberConflict

protected void rememberConflict(Conflict<?> c)

remembers a conflict in the internal list of remembered conflicts

Parameters:

c - the remembered conflict

reconstituteConflicts

protected void reconstituteConflicts()

reconstitutes all remembered conflicts. Add the remembered conflicts to the set of conflicts of the OsmDataLayer this command was applied to.

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 Command