public class MergeContainedNonConflictingAction extends AbstractMergeContainedAction
isFilterededitingDomain, mergerRegistry| Constructor and Description | 
|---|
| MergeContainedNonConflictingAction(IEMFCompareConfiguration compareConfiguration,
                                  IMerger.Registry mergerRegistry,
                                  MergeMode mode,
                                  org.eclipse.compare.INavigatable navigatable,
                                  org.eclipse.jface.viewers.IStructuredSelection selection,
                                  Predicate<TreeNode> isFiltered) | 
| Modifier and Type | Method and Description | 
|---|---|
| protected IMergeRunnable | createMergeRunnable(MergeMode mode,
                   boolean isLeftEditable,
                   boolean isRightEditable,
                   IDiffRelationshipComputer relationshipComputer) | 
| protected Predicate<Diff> | getDiffPredicate()Return a predicate that filters the { selected differencesto just
 those differences this action will actually operate upon. | 
| protected void | initToolTipAndImage(MergeMode mode) | 
getSelectedDifferences, updateSelectionclearCache, contextualizeTooltip, execute, executeCompareCopyCommand, getDiffRelationshipComputer, getSelectedDifferences, getSelectedDifferences, getSelectedMode, getStatePredicate, isLeftEditable, isLeftToRight, isMirrored, isRightEditable, run, setAdapterFactory, setEditingDomaingetStructuredSelection, runWithEvent, selectionChanged, selectionChangedconvertAccelerator, 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, setToolTipTextaddPropertyChangeListener, firePropertyChange, firePropertyChange, removePropertyChangeListenerpublic MergeContainedNonConflictingAction(IEMFCompareConfiguration compareConfiguration, IMerger.Registry mergerRegistry, MergeMode mode, org.eclipse.compare.INavigatable navigatable, org.eclipse.jface.viewers.IStructuredSelection selection, Predicate<TreeNode> isFiltered)
isFiltered - The predicate to use for determining whether a TreeNode is filtered.protected void initToolTipAndImage(MergeMode mode)
initToolTipAndImage in class MergeActionprotected IMergeRunnable createMergeRunnable(MergeMode mode, boolean isLeftEditable, boolean isRightEditable, IDiffRelationshipComputer relationshipComputer)
createMergeRunnable in class MergeActionprotected Predicate<Diff> getDiffPredicate()
AbstractMergeContainedActionselected differences to just
 those differences this action will actually operate upon.getDiffPredicate in class AbstractMergeContainedActionselected differences.
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.