Skip to main content
diff options
authorStefan Dirix2016-08-10 03:57:57 -0400
committerStefan Dirix2017-01-13 06:40:44 -0500
commit5aeefe6e825a9d7b529202b48fd3dc64501c0021 (patch)
treed1c08b8f91052a44e7006f9b01e0c3f22b3f6ddc /plugins/
parenta6cb5f1bd528d972fc41cc14907375aeb5ea13dc (diff)
Introduce ContentProviders for TreeContentMergeViewer
This refactoring has two distinct goals: Clear separation of concerns in the code and allowing the user to customize the TreeContentMergeViewer. Currently the MergeViewerItem serves the dual use of wrapping the displayed model but is also responsible to determine its parents, children and stub elements. The later tasks are now separated to different ContentProviders. The content of the TreeContentMergeViewer is now determined by 'IMergeViewerItemContentProvider's which can be registered at the new extension point 'contentMergeViewerCustomization'. The default implementation uses the existing EMFCompare adapterFactory mechanism to determine the 'real' and 'stub' content of the TreeContentMergeViewer. Additionally the new 'ImergeViewerItemProvider's are used to determine the root elements of the tree, currently provided by the 'ICompareAccessors'. The new customizations are extensively used within the Papyrus customizations for EMFCompare. Change-Id: I5f3cc5143b71ed3f517e427868395a5e14638fea Signed-off-by: Alexandra Buzila <> Signed-off-by: Stefan Dirix <>
Diffstat (limited to 'plugins/')
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/ b/plugins/
index fd77e3408..e552d8194 100644
--- a/plugins/
+++ b/plugins/
@@ -103,3 +103,8 @@ DefaultMatchEngineConfiguratorUI.useIdentifier.label = Select if identifiers sh
DefaultMatchEngineConfiguratorUI.whenAvailable.label = When available: The engine will use some heuristics when identifiers are missing
DefaultMatchEngineConfiguratorUI.only.label = Only: Objects without identifiers will never be matched.
DefaultMatchEngineConfiguratorUI.never.label = Never: Objects will be matched with some heuristics regardless of having identifiers.
+ContentCustomizationRegistry.invalidRanking = Ranking of resolver ''{0}'' is not a valid integer : ''{1}''.
+ContentCustomizationRegistry.invalidContextTester = IContextTester named ''{0}'' could not be instantiated.
+ContentCustomizationRegistry.invalidProvider = Provider named ''{0}'' could not be instantiated.

Back to the top