-
-
Methods in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions with parameters of type MergeMode
| Modifier and Type |
Method |
Description |
protected IMergeRunnable |
MergeAction.createMergeRunnable(MergeMode mode,
boolean leftEditable,
boolean rightEditable,
IDiffRelationshipComputer relationshipComputer) |
|
protected MergeNonConflictingRunnable |
MergeAllNonConflictingAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
IDiffRelationshipComputer relationshipComputer) |
|
protected IMergeRunnable |
MergeContainedAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
IDiffRelationshipComputer relationshipComputer) |
|
protected IMergeRunnable |
MergeContainedConflictingAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
IDiffRelationshipComputer relationshipComputer) |
|
protected IMergeRunnable |
MergeContainedNonConflictingAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
IDiffRelationshipComputer relationshipComputer) |
|
protected void |
MergeAction.execute(ICompareCommandStack commandStack,
MergeMode mode,
java.util.List<Diff> diffs) |
|
protected void |
MergeAllNonConflictingAction.execute(ICompareCommandStack commandStack,
MergeMode mode,
java.util.List<Diff> diffs) |
|
protected void |
MergeAction.executeCompareCopyCommand(ICompareCommandStack commandStack,
MergeMode mode,
java.util.List<Diff> diffs) |
|
protected void |
MergeAction.initToolTipAndImage(MergeMode mode) |
|
protected void |
MergeAllNonConflictingAction.initToolTipAndImage(MergeMode mode) |
|
protected void |
MergeContainedAction.initToolTipAndImage(MergeMode mode) |
|
protected void |
MergeContainedConflictingAction.initToolTipAndImage(MergeMode mode) |
|
protected void |
MergeContainedNonConflictingAction.initToolTipAndImage(MergeMode mode) |
|
protected void |
AbstractMergeRunnable.markAllAsMerged(java.util.Collection<? extends Diff> diffToMarkAsMerged,
MergeMode mode,
IMerger.Registry mergerRegistry) |
Marks all of the given diffs as merged, keeping track of the merged mode used for the operation.
|
protected void |
AbstractMergeRunnable.markAsMerged(Diff diff,
MergeMode mode,
boolean mergeRightToLeft,
IMerger.Registry mergerRegistry) |
Marks a single diff as merged, keeping track of the merge mode used for the operation.
|
Constructors in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions with parameters of type MergeMode
| Constructor |
Description |
AbstractMergeContainedAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable) |
|
AbstractMergeContainedAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection) |
|
AbstractMergeRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer) |
Default constructor.
|
MergeAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable) |
Constructor.
|
MergeAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection) |
|
MergeAllNonConflictingAction(IEMFCompareConfiguration compareConfiguration,
Comparison comparison,
IMerger.Registry mergerRegistry,
MergeMode mode) |
Constructor.
|
MergeConflictingRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer) |
Default constructor.
|
MergeContainedAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
java.util.function.Predicate<TreeNode> isFiltered) |
|
MergeContainedConflictingAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
java.util.function.Predicate<TreeNode> isFiltered) |
MergeContainedNonConflictingAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
java.util.function.Predicate<TreeNode> isFiltered) |
MergeContainedRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer) |
|
MergeNonConflictingRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer) |
Default constructor.
|
MergeRunnableImpl(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer) |
|
-
-
-
-
-
-