commit 359096b4a8c7f368fb03a89ec1846ff6996f68f0
author Stefan Dirix <sdirix@eclipsesource.com> Fri Jan 13 17:35:22 2017 +0100
committer Philip Langer <planger@eclipsesource.com> Mon May 08 11:06:25 2017 -0400
tree b0f23e8cedf10bfe89d80aa0411151f2b94d9268
parent a342e717b4fd0a8de948fac21cb047b39f3d806b

[510442] Fix NPE in MergeViewerItemProviderConfiguration

* Register the types NODE_TYPE__EMF_EOBJECT, NODE_TYPE__EMF_RESOURCE,
NODE_TYPE__EMF_RESOURCESET and NODE_TYPE__EMF_COMPARISON to the
WaitViewer instead of the TreeContentMergeViewer. This avoids creating a
TreeContentMergeViewer when no Comparison is
created yet..
* Null-check the comparison within the TreeContentMergeViewer and create
a DummyContentProvider if necessary.

Bug: 510442
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Change-Id: I69e3f5676e2a99b13b29d42c536664eb9d71fbbf