Description Philip Langer 2017-04-04 03:29:22 EDT

The tree content merge viewer is used to show the left- and right-hand side of the model when the user selects an addition, deletion, or move of a model element, or when the user selects a match node in the structure merge viewer. To make the model in the tree to look just like the model in the Papyrus model explorer, if we are dealing with a Papyrus model, there is a dedicated PapyrusTreeContentMergeViewer, which re-uses the content provider from Papyrus to build the model tree shown in the content merge viewer.

The content provider of Papyrus may also display Diagram elements -- they are also shown in the model explorer. This, however, does not make a lot of sense in the context of the EMF Compare tree content merge viewer, as this tree viewer is only shown for models and not for diagrams. Therefore, we should filter all Diagram elements from this Papyrus content provider. This has already been done for the merge viewer item content provider, but not for the Papyrus content provider.