Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java')
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java
index 08eca5569..a3990f153 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java
@@ -159,16 +159,16 @@ public class MatchAccessor extends AbstractTypedElementAdapter implements ICompa
}
} else if (getSide() != MergeViewerSide.ANCESTOR
|| (getSide() == MergeViewerSide.ANCESTOR && match.getOrigin() != null)) {
- ResourceAttachmentChange diff = getFirst(filter(match.getDifferences(),
- ResourceAttachmentChange.class), null);
- container = new MergeViewerItem.Container(getComparison(), diff, match.getLeft(), match
- .getRight(), match.getOrigin(), getSide(), getRootAdapterFactory());
+ ResourceAttachmentChange diff = getFirst(
+ filter(match.getDifferences(), ResourceAttachmentChange.class), null);
+ container = new MergeViewerItem.Container(getComparison(), diff, match.getLeft(),
+ match.getRight(), match.getOrigin(), getSide(), getRootAdapterFactory());
items.add(container);
}
}
- final IMergeViewerItem newContainer = ResourceUIUtil.addNewContainerForNotLoadedFragmentMatches(
- items, getSide(), getComparison(), getRootAdapterFactory());
+ final IMergeViewerItem newContainer = ResourceUIUtil.addNewContainerForNotLoadedFragmentMatches(items,
+ getSide(), getComparison(), getRootAdapterFactory());
if (newContainer != null) {
ret.add(newContainer);
} else {

Back to the top