Class MergeContainedConflictingAction
- java.lang.Object
-
- org.eclipse.core.commands.common.EventManager
-
- org.eclipse.jface.action.AbstractAction
-
- org.eclipse.jface.action.Action
-
- org.eclipse.ui.actions.BaseSelectionListenerAction
-
- org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.MergeAction
-
- org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.AbstractMergeContainedAction
-
- org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.MergeContainedConflictingAction
-
- All Implemented Interfaces:
org.eclipse.jface.action.IAction
,org.eclipse.jface.viewers.ISelectionChangedListener
public class MergeContainedConflictingAction extends AbstractMergeContainedAction
Action that manages a merge of a contained conflicting differences in case the selection is a resource match or a model element match.- Since:
- 4.5
-
-
Field Summary
-
Fields inherited from class org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.AbstractMergeContainedAction
isFiltered
-
Fields inherited from class org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.MergeAction
editingDomain, mergerRegistry
-
-
Constructor Summary
Constructors Constructor Description MergeContainedConflictingAction(IEMFCompareConfiguration compareConfiguration, IMerger.Registry mergerRegistry, MergeMode mode, org.eclipse.compare.INavigatable navigatable, org.eclipse.jface.viewers.IStructuredSelection selection, Predicate<TreeNode> isFiltered)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description protected IMergeRunnable
createMergeRunnable(MergeMode mode, boolean isLeftEditable, boolean isRightEditable, IDiffRelationshipComputer relationshipComputer)
protected Predicate<Diff>
getDiffPredicate()
Return a predicate that filters the {selected differences
to just those differences this action will actually operate upon.protected Predicate<Diff>
getStatePredicate()
protected void
initToolTipAndImage(MergeMode mode)
-
Methods inherited from class org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.AbstractMergeContainedAction
getSelectedDifferences, updateSelection
-
Methods inherited from class org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.MergeAction
clearCache, contextualizeTooltip, execute, executeCompareCopyCommand, getDiffRelationshipComputer, getSelectedDifferences, getSelectedDifferences, getSelectedMode, isLeftEditable, isLeftToRight, isMirrored, isRightEditable, run, setAdapterFactory, setEditingDomain
-
Methods inherited from class org.eclipse.ui.actions.BaseSelectionListenerAction
getStructuredSelection, runWithEvent, selectionChanged, selectionChanged
-
Methods inherited from class org.eclipse.jface.action.Action
convertAccelerator, convertAccelerator, findKeyCode, findKeyString, findModifier, findModifierString, getAccelerator, getActionDefinitionId, getDescription, getDisabledImageDescriptor, getHelpListener, getHoverImageDescriptor, getId, getImageDescriptor, getMenuCreator, getStyle, getText, getToolTipText, isChecked, isEnabled, isHandled, notifyResult, removeAcceleratorText, removeMnemonics, setAccelerator, setActionDefinitionId, setChecked, setDescription, setDisabledImageDescriptor, setEnabled, setHelpListener, setHoverImageDescriptor, setId, setImageDescriptor, setMenuCreator, setText, setToolTipText
-
Methods inherited from class org.eclipse.jface.action.AbstractAction
addPropertyChangeListener, firePropertyChange, firePropertyChange, removePropertyChangeListener
-
-
-
-
Constructor Detail
-
MergeContainedConflictingAction
public MergeContainedConflictingAction(IEMFCompareConfiguration compareConfiguration, IMerger.Registry mergerRegistry, MergeMode mode, org.eclipse.compare.INavigatable navigatable, org.eclipse.jface.viewers.IStructuredSelection selection, Predicate<TreeNode> isFiltered)
- Parameters:
isFiltered
- The predicate to use for determining whether aTreeNode
is filtered.
-
-
Method Detail
-
initToolTipAndImage
protected void initToolTipAndImage(MergeMode mode)
- Overrides:
initToolTipAndImage
in classMergeAction
-
createMergeRunnable
protected IMergeRunnable createMergeRunnable(MergeMode mode, boolean isLeftEditable, boolean isRightEditable, IDiffRelationshipComputer relationshipComputer)
- Overrides:
createMergeRunnable
in classMergeAction
-
getDiffPredicate
protected Predicate<Diff> getDiffPredicate()
Description copied from class:AbstractMergeContainedAction
Return a predicate that filters the {selected differences
to just those differences this action will actually operate upon.- Specified by:
getDiffPredicate
in classAbstractMergeContainedAction
- Returns:
- a predicate that filters the {
selected differences
.
-
getStatePredicate
protected Predicate<Diff> getStatePredicate()
- Overrides:
getStatePredicate
in classMergeAction
-
-