Modifier and Type | Class and Description |
---|---|
class |
EMFCompareConfiguration |
Constructor and Description |
---|
DependencyData(IEMFCompareConfiguration compareConfiguration) |
Constructor and 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) |
DropDownMergeMenuAction(IEMFCompareConfiguration configuration,
EnumSet<MergeMode> previewModes)
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.
|
MergeContainedAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
com.google.common.base.Predicate<TreeNode> isFiltered) |
MergeContainedConflictingAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
com.google.common.base.Predicate<TreeNode> isFiltered) |
MergeContainedNonConflictingAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
com.google.common.base.Predicate<TreeNode> isFiltered) |
RevealConflictingDiffsAction(org.eclipse.jface.viewers.StructuredViewer viewer,
Diff selectedDiff,
IEMFCompareConfiguration compareConfiguration) |
SaveComparisonModelAction(IEMFCompareConfiguration configuration)
Constructor.
|
Modifier and Type | Method and Description |
---|---|
protected IEMFCompareConfiguration |
AbstractMergeViewer.getCompareConfiguration()
Returns the compare configuration object used by this viewer.
|
Constructor and Description |
---|
AbstractMergeViewer(IMergeViewer.MergeViewerSide side,
IEMFCompareConfiguration compareConfiguration)
Default constructor.
|
AbstractStructuredMergeViewer(org.eclipse.swt.widgets.Composite parent,
IMergeViewer.MergeViewerSide side,
IEMFCompareConfiguration compareConfiguration)
Default constructor.
|
AbstractTableOrTreeMergeViewer(org.eclipse.swt.widgets.Composite parent,
IMergeViewer.MergeViewerSide side,
ICompareColor.Provider colorProvider,
IEMFCompareConfiguration compareConfiguration)
Default constructor.
|
TableMergeViewer(org.eclipse.swt.widgets.Composite parent,
IMergeViewer.MergeViewerSide side,
ICompareColor.Provider colorProvider,
IEMFCompareConfiguration compareConfiguration)
Default constructor.
|
TreeMergeViewer(org.eclipse.swt.widgets.Composite parent,
IMergeViewer.MergeViewerSide side,
ICompareColor.Provider colorProvider,
IEMFCompareConfiguration compareConfiguration)
Default constructor.
|
Modifier and Type | Method and Description |
---|---|
static boolean |
MergeViewerUtil.isMarkAsMerged(Diff diff,
IMergeViewerItem item,
IEMFCompareConfiguration compareConfiguration)
Checks if the given diff is considered as a mark as merged diff.
|
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.