diff options
| author | Camille Letavernier | 2017-11-29 14:05:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2017-11-29 14:05:29 +0000 |
| commit | 4bc1416aa9aab4ae3775f91376903037f3eb0944 (patch) | |
| tree | 5a9c5f29133677a0ec9557d617388522444562da | |
| parent | e515be158e96153e35330c3d25f235d1643d1c33 (diff) | |
| parent | 0c0828c915fee1d34a621bed0ba7e83697b4d8a6 (diff) | |
| download | org.eclipse.papyrus-collaborativemodeling-4bc1416aa9aab4ae3775f91376903037f3eb0944.tar.gz org.eclipse.papyrus-collaborativemodeling-4bc1416aa9aab4ae3775f91376903037f3eb0944.tar.xz org.eclipse.papyrus-collaborativemodeling-4bc1416aa9aab4ae3775f91376903037f3eb0944.zip | |
Merge "NPE in PapyrusFacetContentProviderWrapperAdapterFactory"
1 files changed, 8 insertions, 3 deletions
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java index a6df7345..aa1e8c5a 100644 --- a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java +++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapperAdapterFactory.java @@ -8,6 +8,7 @@ * Contributors: * Stefan Dirix - initial API and implementation * Martin Fleck - bug 518957 + * Philip Langer - Fix NPE *******************************************************************************/ package org.eclipse.papyrus.compare.diagram.ide.ui.contentmergeviewer.facet; @@ -17,6 +18,7 @@ import java.util.Map; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.edit.provider.Disposable; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; @@ -75,9 +77,12 @@ public class PapyrusFacetContentProviderWrapperAdapterFactory extends UMLItemPro * @return The {@link ResourceSet} for the given {@code target} if there is one, {@code null} otherwise. */ private ResourceSet getResourceSet(Notifier target) { - if (EObject.class.isInstance(target)) { - EObject object = EObject.class.cast(target); - return object.eResource().getResourceSet(); + if (target instanceof EObject) { + EObject object = (EObject)target; + Resource resource = object.eResource(); + if (resource != null) { + return resource.getResourceSet(); + } } return null; } |