Bug 578357: [ModelExplorer] org.eclipse.core.runtime.AssertionFailedException: null argument

Change-Id: I46defebf2ad6da2e6df8ca37105953c873b4d239
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

3 files changed, 10 insertions, 8 deletions

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index 0e3ed866073..cdd44d71c20 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -51,7 +51,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 5.0.100.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.Activator
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
index b425b5a7ca5..a1d940c69a9 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
@@ -9,6 +9,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.modelexplorer</artifactId>
-	<version>5.0.0-SNAPSHOT</version>
+	<version>5.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.java
index e5fc47b4246..7b2c4932b11 100755
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2021 CEA LIST and others.
+ * Copyright (c) 2021, 2022 CEA LIST and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,7 +10,7 @@
  *
  * Contributors:
  *   Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
+ *   Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 578357
  *****************************************************************************/
 
 package org.eclipse.papyrus.views.modelexplorer.provider;
@@ -56,11 +56,13 @@ public class IsIOpenablePropertyTester extends org.eclipse.core.expressions.Prop
 				// /!\ Here we don't use the "selection" variable because it is updated too late to be used by enablement of org.eclipse.ui.navigator.navigatorContent#actionProvider
 				final ISelectionProvider selectionProvider = wp.getSite().getSelectionProvider();
 				final ISelection selection = selectionProvider.getSelection();
-				if (selection instanceof IStructuredSelection) {
+				if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
 					final EObject current = EMFHelper.getEObject(((IStructuredSelection) selection).getFirstElement());
-					IAdapterManager adapterManager = Platform.getAdapterManager();
-					IOpenable adapter = adapterManager.getAdapter(current, IOpenable.class);
-					return Boolean.valueOf(adapter != null).equals(expectedValue);
+					if (current != null) {
+						IAdapterManager adapterManager = Platform.getAdapterManager();
+						IOpenable adapter = adapterManager.getAdapter(current, IOpenable.class);
+						return Boolean.valueOf(adapter != null).equals(expectedValue);
+					}
 				}
 			}
 		}