Modifier and Type | Method and Description |
---|---|
IMergeViewerItem |
CompareAccessorMergeViewerItemProvider.getItemToSelect(Object object,
IMergeViewerItemProviderConfiguration configuration)
Determine the merge viewer item which shall be selected.
|
Modifier and Type | Method and Description |
---|---|
protected IMergeViewerItem |
TreeMergeViewerItemContentProvider.createBasicContainer(ResourceAttachmentChange diff,
IMergeViewerItem mergeViewerItem,
AdapterFactory adapterFactory)
Create an IMergeViewerItem for the parent of the given
ResourceAttachmentChange . |
protected IMergeViewerItem |
TreeMergeViewerItemContentProvider.createMergeViewerItem(Comparison comparison,
Diff diff,
Match match,
IMergeViewer.MergeViewerSide side,
AdapterFactory adapterFactory)
Creates the
IMergeViewerItem from the given data. |
protected IMergeViewerItem |
TreeMergeViewerItemContentProvider.createMergeViewerItem(Comparison comparison,
Diff diff,
Object left,
Object right,
Object ancestor,
IMergeViewer.MergeViewerSide side,
AdapterFactory adapterFactory)
Creates the
IMergeViewerItem from the given data. |
protected IMergeViewerItem |
TreeMergeViewerItemContentProvider.createMergeViewerItemFrom(EObject eObject,
IMergeViewerItem parent,
IMergeViewerItemProviderConfiguration configuration)
Creates an IMergeViewerItem from an EObject.
|
Modifier and Type | Method and Description |
---|---|
protected List<IMergeViewerItem> |
TreeMergeViewerItemContentProvider.createInsertionPoints(IMergeViewerItem parent,
List<IMergeViewerItem> values,
List<? extends Diff> differences,
IMergeViewerItemProviderConfiguration configuration)
Creates and inserts the insertion points for the given
values . |
protected List<IMergeViewerItem> |
TreeMergeViewerItemContentProvider.createInsertionPoints(IMergeViewerItem parent,
List<Object> sideContent,
List<Object> oppositeContent,
List<Object> ancestorContent,
List<? extends IMergeViewerItem> values,
List<? extends Diff> differences,
IMergeViewerItemProviderConfiguration configuration)
Creates the insertion points for the given
values based on the children of each side. |
protected List<IMergeViewerItem> |
TreeMergeViewerItemContentProvider.createMergeViewerItemsFrom(Collection<?> values,
IMergeViewerItem parent,
IMergeViewerItemProviderConfiguration configuration)
Creates the Merge Viewer Items for the given
values . |
Modifier and Type | Method and Description |
---|---|
protected IMergeViewerItem |
TreeMergeViewerItemContentProvider.createBasicContainer(ResourceAttachmentChange diff,
IMergeViewerItem mergeViewerItem,
AdapterFactory adapterFactory)
Create an IMergeViewerItem for the parent of the given
ResourceAttachmentChange . |
protected List<IMergeViewerItem> |
TreeMergeViewerItemContentProvider.createInsertionPoints(IMergeViewerItem parent,
List<IMergeViewerItem> values,
List<? extends Diff> differences,
IMergeViewerItemProviderConfiguration configuration)
Creates and inserts the insertion points for the given
values . |
protected List<IMergeViewerItem> |
TreeMergeViewerItemContentProvider.createInsertionPoints(IMergeViewerItem parent,
List<Object> sideContent,
List<Object> oppositeContent,
List<Object> ancestorContent,
List<? extends IMergeViewerItem> values,
List<? extends Diff> differences,
IMergeViewerItemProviderConfiguration configuration)
Creates the insertion points for the given
values based on the children of each side. |
protected IMergeViewerItem |
TreeMergeViewerItemContentProvider.createMergeViewerItemFrom(EObject eObject,
IMergeViewerItem parent,
IMergeViewerItemProviderConfiguration configuration)
Creates an IMergeViewerItem from an EObject.
|
protected List<IMergeViewerItem> |
TreeMergeViewerItemContentProvider.createMergeViewerItemsFrom(Collection<?> values,
IMergeViewerItem parent,
IMergeViewerItemProviderConfiguration configuration)
Creates the Merge Viewer Items for the given
values . |
protected Object |
TreeMergeViewerItemContentProvider.getBestSideValue(IMergeViewerItem mergeViewerItem,
IMergeViewer.MergeViewerSide side)
Get a non-null side of the the given
IMergeViewerItem , preferring but not limited to the given
side. |
protected Object |
TreeMergeViewerItemContentProvider.getSideValue(IMergeViewerItem mergeViewerItem,
IMergeViewer.MergeViewerSide side) |
protected boolean |
TreeMergeViewerItemContentProvider.yieldsInsertionPoint(IMergeViewerItem parent,
Iterable<? extends Diff> diffs,
IMergeViewerItemProviderConfiguration configuration)
Indicates whether for the given diffs at least one
IMergeViewerItem insertion point should be
created. |
Modifier and Type | Method and Description |
---|---|
protected List<IMergeViewerItem> |
TreeMergeViewerItemContentProvider.createInsertionPoints(IMergeViewerItem parent,
List<IMergeViewerItem> values,
List<? extends Diff> differences,
IMergeViewerItemProviderConfiguration configuration)
Creates and inserts the insertion points for the given
values . |
protected List<IMergeViewerItem> |
TreeMergeViewerItemContentProvider.createInsertionPoints(IMergeViewerItem parent,
List<Object> sideContent,
List<Object> oppositeContent,
List<Object> ancestorContent,
List<? extends IMergeViewerItem> values,
List<? extends Diff> differences,
IMergeViewerItemProviderConfiguration configuration)
Creates the insertion points for the given
values based on the children of each side. |
Modifier and Type | Method and Description |
---|---|
IMergeViewerItem |
ICompareAccessor.getInitialItem()
Returns the initial item of this accessor.
|
Modifier and Type | Method and Description |
---|---|
com.google.common.collect.ImmutableList<? extends IMergeViewerItem> |
ICompareAccessor.getItems()
Returns the list of items known by this accessor.
|
Modifier and Type | Method and Description |
---|---|
IMergeViewerItem |
AbstractStructuralFeatureAccessor.getInitialItem()
Returns the initial item of this accessor.
|
IMergeViewerItem |
ResourceContentsAccessorImpl.getInitialItem()
Returns the initial item of this accessor.
|
IMergeViewerItem |
MatchAccessor.getInitialItem()
Returns the initial item of this accessor.
|
IMergeViewerItem |
ContainmentReferenceChangeAccessorImpl.getInitialItem()
Returns the initial item of this accessor.
|
Modifier and Type | Method and Description |
---|---|
com.google.common.collect.ImmutableList<? extends IMergeViewerItem> |
ManyStructuralFeatureAccessorImpl.getItems()
Returns the list of items known by this accessor.
|
com.google.common.collect.ImmutableList<? extends IMergeViewerItem> |
SingleStructuralFeatureAccessorImpl.getItems()
Returns the list of items known by this accessor.
|
com.google.common.collect.ImmutableList<? extends IMergeViewerItem> |
ResourceContentsAccessorImpl.getItems()
Returns the list of items known by this accessor.
|
com.google.common.collect.ImmutableList<? extends IMergeViewerItem> |
MatchAccessor.getItems()
Returns the list of items known by this accessor.
|
com.google.common.collect.ImmutableList<? extends IMergeViewerItem> |
FeatureMapKeyChangeAccessorImpl.getItems()
Returns the list of items known by this accessor.
|
com.google.common.collect.ImmutableList<? extends IMergeViewerItem> |
ContainmentReferenceChangeAccessorImpl.getItems()
Returns the list of items known by this accessor.
|
Modifier and Type | Class and Description |
---|---|
class |
MergeViewerItem |
static class |
MergeViewerItem.Container
Deprecated.
|
class |
ResourceAttachmentChangeMergeViewerItem
A specific
MergeViewerItem for ResourceAttachmentChange . |
Modifier and Type | Method and Description |
---|---|
IMergeViewerItem |
MergeViewerItem.cloneAsOpposite() |
protected IMergeViewerItem |
ResourceAttachmentChangeMergeViewerItem.createMergeViewerItemFrom(EObject eObject)
Creates an IMergeViewerItem from an EObject.
|
protected IMergeViewerItem |
MergeViewerItem.createMergeViewerItemFrom(EObject eObject)
Deprecated.
|
IMergeViewerItem[] |
ResourceAttachmentChangeMergeViewerItem.getChildren(IDifferenceGroupProvider group,
com.google.common.base.Predicate<? super EObject> filters)
Returns the children of this container.
|
IMergeViewerItem[] |
MergeViewerItem.Container.getChildren(IDifferenceGroupProvider group,
com.google.common.base.Predicate<? super EObject> predicate)
Deprecated.
Returns the children of this container.
|
static IMergeViewerItem[] |
MergeViewerItem.Container.getNoItemsArr()
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
protected List<IMergeViewerItem> |
MergeViewerItem.createInsertionPoints(Comparison comparison,
EStructuralFeature eStructuralFeature,
List<? extends IMergeViewerItem> values,
List<? extends Diff> differences)
Deprecated.
|
protected List<IMergeViewerItem> |
MergeViewerItem.createMergeViewerItemFrom(Collection<?> values)
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
protected List<IMergeViewerItem> |
MergeViewerItem.createInsertionPoints(Comparison comparison,
EStructuralFeature eStructuralFeature,
List<? extends IMergeViewerItem> values,
List<? extends Diff> differences)
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
static IMergeViewerItem |
ResourceUIUtil.addNewContainerForNotLoadedFragmentMatches(Collection<IMergeViewerItem> items,
IMergeViewer.MergeViewerSide side,
Comparison comparison,
AdapterFactory adapterFactory)
Adds a new parent container to the given list of IMergeViewerItems if needed and returns it.
|
static IMergeViewerItem |
ResourceUIUtil.createItemForNotLoadedFragmentMatch(Match match,
IMergeViewer.MergeViewerSide side,
Comparison comparison,
AdapterFactory adapterFactory)
Constructs a
NotLoadedFragmentMatch from the given
Match and then return the
IMergeViewerItem corresponding to this
NotLoadedFragmentMatch. |
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.
|
Modifier and Type | Method and Description |
---|---|
static IMergeViewerItem |
ResourceUIUtil.addNewContainerForNotLoadedFragmentMatches(Collection<IMergeViewerItem> items,
IMergeViewer.MergeViewerSide side,
Comparison comparison,
AdapterFactory adapterFactory)
Adds a new parent container to the given list of IMergeViewerItems if needed and returns it.
|
static Collection<Match> |
ResourceUIUtil.getNotLoadedFragmentMatches(Collection<IMergeViewerItem> items)
Get from the given list of
IMergeViewerItem s, the NotLoadedFragmentMatchs. |
Modifier and Type | Interface and Description |
---|---|
static interface |
IMergeViewerItem.Container
Deprecated.
IMergeViewerItem.Container is no longer needed since its functionality is now provided by
IMergeViewerItemContentProvider . Use an IMergeViewerItem instead. |
Modifier and Type | Field and Description |
---|---|
static com.google.common.base.Predicate<IMergeViewerItem> |
IMergeViewerItem.IS_INSERTION_POINT
A predicate to know if the given Item is an insertion point.
|
Modifier and Type | Method and Description |
---|---|
IMergeViewerItem[] |
IMergeViewerItem.Container.getChildren(IDifferenceGroupProvider group,
com.google.common.base.Predicate<? super EObject> predicate)
Deprecated.
Returns the children of this container.
|
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.