413703: [Model Explorer] Cannot create a LiteralInteger in a Property

https://bugs.eclipse.org/bugs/show_bug.cgi?id=413703

Fix exceptions that prevent correct presentation of the "New Child" context menu on EReferences in the Advanced mode of the Model Explorer.

1 files changed, 9 insertions, 7 deletions

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/util/ModelExplorerUtils.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/util/ModelExplorerUtils.java
index 4bdaec2a680..127c62f68df 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/util/ModelExplorerUtils.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/util/ModelExplorerUtils.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

+ * Copyright (c) 2013, 2014 CEA LIST and others.

  * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -8,10 +8,11 @@
  *

  * Contributors:

  *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 413703

+ *  

  *****************************************************************************/

 package org.eclipse.papyrus.uml.modelexplorer.util;

 

-import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.jface.viewers.IStructuredSelection;

@@ -57,14 +58,15 @@ public class ModelExplorerUtils {
 

 		container = EMFHelper.getEObject(selection);

 

-		if(container == null) {

-			reference = (EReference)((IAdaptable)selection).getAdapter(EReference.class);

-

+		if(container instanceof EReference) {

+			reference = (EReference)container;

+			container = null;

+			

 			// The following part introduce a dependency to EMF Facet.

 			// Although the selection can be adapted to EReference, the link parent is required but

 			// no API allows to get this element except LinkItem or ITreeElement.

-			if((reference != null) && (selection instanceof EReferenceTreeElement )) {

-				container = ((EReferenceTreeElement)selection).getParent();

+			if(selection instanceof EReferenceTreeElement) {

+				container = ((EReferenceTreeElement)selection).getParent().getEObject();

 			}

 		}