public static class ThreeWayComparisonGroupProvider.ConflictsGroupImpl extends BasicDifferenceGroupImpl
BasicDifferenceGroupImpl for Conflicts.Adapter.Internalchildren, E_ALL_CONTENTS, filter, image, nametargetTREE_NODE_DATA| Constructor and Description |
|---|
ConflictsGroupImpl(Comparison comparison,
com.google.common.base.Predicate<? super Diff> filter,
String name,
ECrossReferenceAdapter crossReferenceAdapter)
.
|
ConflictsGroupImpl(Comparison comparison,
String name,
ECrossReferenceAdapter crossReferenceAdapter)
Instantiates this group given the comparison.
|
| Modifier and Type | Method and Description |
|---|---|
protected void |
doBuildSubTrees()
Perform the creation of the sub-trees of the group.
|
IStyledString.IComposedStyledString |
getStyledName()
The styled label for the this group.
|
protected boolean |
mustDisplayAsDirectChildOfMatch(Diff diff)
In conflicts, a special case must be handled for refining diffs: If they are not part of the same
conflict then they should not be in the same group as the refined diff.
|
addDiffNode, buildMatchResourceTrees, buildMatchTrees, buildSubTree, buildSubTree, buildTree, createChildren, createConflictNode, createDiffNode, createMatchNode, createMatchResourceNode, customize, customize, dispose, getChildren, getComparison, getImage, getName, getTargetMatch, handleRefiningDiffs, isAdapterForType, isContainmentRefChange, populateMatchNode, registerCrossReferenceAdapter, unregisterCrossReferenceAdaptergetTarget, notifyChanged, setTarget, unsetTargetclone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, waitgetTarget, notifyChanged, setTargetpublic ConflictsGroupImpl(Comparison comparison, com.google.common.base.Predicate<? super Diff> filter, String name, ECrossReferenceAdapter crossReferenceAdapter)
org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.BasicDifferenceGroupImpl#BasicDifferenceGroupImpl(org.eclipse.emf.compare.Comparison,
java.lang.Iterable, com.google.common.base.Predicate, java.lang.String)public ConflictsGroupImpl(Comparison comparison, String name, ECrossReferenceAdapter crossReferenceAdapter)
comparison - The comparison that is the parent of this group.name - The name that the EMF Compare UI will display for this group.crossReferenceAdapter - The cross reference adapter that will be added to this group's children.protected boolean mustDisplayAsDirectChildOfMatch(Diff diff)
mustDisplayAsDirectChildOfMatch in class BasicDifferenceGroupImpldiff - The differencetrue if the diff refines nothing or if its conflict does not contain all the
diffs it refines.protected void doBuildSubTrees()
BasicDifferenceGroupImpldoBuildSubTrees in class BasicDifferenceGroupImplpublic IStyledString.IComposedStyledString getStyledName()
getStyledName in interface IDifferenceGroupgetStyledName in class BasicDifferenceGroupImplBasicDifferenceGroupImpl.getStyledName()
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.