| Modifier and Type | Method and Description | 
|---|---|
| MergeMode | EMFCompareConfiguration. getMergePreviewMode() | 
| Modifier and Type | Method and Description | 
|---|---|
| void | EMFCompareConfiguration. setMergePreviewMode(MergeMode previewMergeMode) | 
| Modifier and Type | Method and Description | 
|---|---|
| protected MergeMode | AbstractMergeRunnable. getMergeMode() | 
| protected MergeMode | MergeAction. getSelectedMode() | 
| Modifier and Type | Method and Description | 
|---|---|
| protected IMergeRunnable | MergeContainedNonConflictingAction. createMergeRunnable(MergeMode mode,
                   boolean isLeftEditable,
                   boolean isRightEditable,
                   IDiffRelationshipComputer relationshipComputer) | 
| protected IMergeRunnable | MergeContainedConflictingAction. createMergeRunnable(MergeMode mode,
                   boolean isLeftEditable,
                   boolean isRightEditable,
                   IDiffRelationshipComputer relationshipComputer) | 
| protected IMergeRunnable | MergeContainedAction. createMergeRunnable(MergeMode mode,
                   boolean isLeftEditable,
                   boolean isRightEditable,
                   IDiffRelationshipComputer relationshipComputer) | 
| protected MergeNonConflictingRunnable | MergeAllNonConflictingAction. createMergeRunnable(MergeMode mode,
                   boolean isLeftEditable,
                   boolean isRightEditable,
                   IDiffRelationshipComputer relationshipComputer) | 
| protected IMergeRunnable | MergeAction. createMergeRunnable(MergeMode mode,
                   boolean leftEditable,
                   boolean rightEditable,
                   IDiffRelationshipComputer relationshipComputer) | 
| protected void | MergeAllNonConflictingAction. execute(ICompareCommandStack commandStack,
       MergeMode mode,
       List<Diff> diffs) | 
| protected void | MergeAction. execute(ICompareCommandStack commandStack,
       MergeMode mode,
       List<Diff> diffs) | 
| protected void | MergeAction. executeCompareCopyCommand(ICompareCommandStack commandStack,
                         MergeMode mode,
                         List<Diff> diffs) | 
| protected void | MergeContainedNonConflictingAction. initToolTipAndImage(MergeMode mode) | 
| protected void | MergeContainedConflictingAction. initToolTipAndImage(MergeMode mode) | 
| protected void | MergeContainedAction. initToolTipAndImage(MergeMode mode) | 
| protected void | MergeAllNonConflictingAction. initToolTipAndImage(MergeMode mode) | 
| protected void | MergeAction. initToolTipAndImage(MergeMode mode) | 
| protected void | AbstractMergeRunnable. markAllAsMerged(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. | 
| 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) | 
| 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,
                    Predicate<TreeNode> isFiltered) | 
| MergeContainedConflictingAction(IEMFCompareConfiguration compareConfiguration,
                               IMerger.Registry mergerRegistry,
                               MergeMode mode,
                               org.eclipse.compare.INavigatable navigatable,
                               org.eclipse.jface.viewers.IStructuredSelection selection,
                               Predicate<TreeNode> isFiltered) | 
| MergeContainedNonConflictingAction(IEMFCompareConfiguration compareConfiguration,
                                  IMerger.Registry mergerRegistry,
                                  MergeMode mode,
                                  org.eclipse.compare.INavigatable navigatable,
                                  org.eclipse.jface.viewers.IStructuredSelection selection,
                                  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) | 
| Constructor and Description | 
|---|
| DropDownMergeMenuAction(IEMFCompareConfiguration configuration,
                       EnumSet<MergeMode> previewModes)Constructor. | 
| Modifier and Type | Method and Description | 
|---|---|
| static MergeMode | MergeMode. getMergeMode(Diff diff,
            boolean leftEditable,
            boolean rightEditable) | 
| MergeMode | MergeMode. inverse()Returns the inverse of this enum. | 
| static MergeMode | MergeMode. valueOf(String name)Returns the enum constant of this type with the specified name. | 
| static MergeMode[] | MergeMode. values()Returns an array containing the constants of this enum type, in
the order they are declared. | 
| Constructor and Description | 
|---|
| ComputeDiffsToMerge(MergeMode mergeMode,
                   boolean isLeftEditable,
                   boolean isRightEditable,
                   IDiffRelationshipComputer relationshipComputer)Constructor. | 
| Modifier and Type | Method and Description | 
|---|---|
| String | ITooltipLabelProvider. getTooltip(MergeMode mode)Return a tooltip for the given MergeMode. | 
| Modifier and Type | Method and Description | 
|---|---|
| MergeMode | IEMFCompareConfiguration. getMergePreviewMode() | 
| MergeMode | IMergePreviewModeChange. getNewValue() | 
| MergeMode | IMergePreviewModeChange. getOldValue() | 
| Modifier and Type | Method and Description | 
|---|---|
| void | IEMFCompareConfiguration. setMergePreviewMode(MergeMode mergePreviewMode) | 
| Constructor and Description | 
|---|
| MergePreviewModeChange(MergeMode oldValue,
                      MergeMode newValue) | 
| Modifier and Type | Method and Description | 
|---|---|
| protected org.eclipse.jface.action.IAction | AbstractStructuredMergeViewer. createAction(MergeMode mode,
            Diff diff)Creates the action for merging the given diff via the specified mode. | 
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.