com.ibm.xtools.comparemerge.emf.delta.deltaresolver

Class ResolveConflictCommand

java.lang.Object

com.ibm.xtools.comparemerge.emf.delta.deltaresolver.ResolveConflictCommand

All Implemented Interfaces:

org.eclipse.emf.common.command.Command

public class ResolveConflictCommand
extends java.lang.Object
implements org.eclipse.emf.common.command.Command

A ResolveConflictCommand is used to resolve a conflict in a merged resource with a custom delta. The previous resolution is maintained in case the command is asked to undoIt.

Constructor Summary

Constructors

Constructor and Description
ResolveConflictCommand(DeltaResolver deltaResolver, Conflict conflict, Delta customDelta, Resolution customDeltaResolution)

Method Summary

Modifier and Type	Method and Description
boolean	canExecute()
boolean	canUndo()
org.eclipse.emf.common.command.Command	chain(org.eclipse.emf.common.command.Command command)
void	dispose()
void	execute() Resolves a conflict with the given resolution delta and rejects both conflicting deltas.
java.util.Collection	getAffectedObjects()
java.lang.String	getDescription()
java.lang.String	getLabel()
java.util.Collection	getResult()
void	redo()
ResolveConflictCommand	setUndoable(boolean v) Enable/disable undo possibility
void	undo() Undoes a custom resolve delta.

Methods inherited from class java.lang.Object

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

Constructor Detail

ResolveConflictCommand

public ResolveConflictCommand(DeltaResolver deltaResolver,
                              Conflict conflict,
                              Delta customDelta,
                              Resolution customDeltaResolution)

Method Detail

canExecute

public boolean canExecute()

Specified by:

canExecute in interface org.eclipse.emf.common.command.Command

execute

public void execute()

Resolves a conflict with the given resolution delta and rejects both conflicting deltas. Reject both conflicting deltas. Reject previous custom delta if there was one. Accept the new custom delta.

Specified by:

execute in interface org.eclipse.emf.common.command.Command

canUndo

public boolean canUndo()

Specified by:

canUndo in interface org.eclipse.emf.common.command.Command

redo

public void redo()

Specified by:

redo in interface org.eclipse.emf.common.command.Command

undo

public void undo()

Undoes a custom resolve delta. Undo the custom delta. Undo both conflicting deltas. Undo previous custom delta if there was one.

Specified by:

undo in interface org.eclipse.emf.common.command.Command

dispose

public void dispose()

Specified by:

dispose in interface org.eclipse.emf.common.command.Command

chain

public org.eclipse.emf.common.command.Command chain(org.eclipse.emf.common.command.Command command)

Specified by:

chain in interface org.eclipse.emf.common.command.Command

getAffectedObjects

public java.util.Collection getAffectedObjects()

Specified by:

getAffectedObjects in interface org.eclipse.emf.common.command.Command

getDescription

public java.lang.String getDescription()

Specified by:

getDescription in interface org.eclipse.emf.common.command.Command

getLabel

public java.lang.String getLabel()

Specified by:

getLabel in interface org.eclipse.emf.common.command.Command

getResult

public java.util.Collection getResult()

Specified by:

getResult in interface org.eclipse.emf.common.command.Command

setUndoable

public ResolveConflictCommand setUndoable(boolean v)

Enable/disable undo possibility

Parameters:

v -