430280: [Table 2] In a table in detached mode, pasting a cell with a stereotype information (like port direction) fails with an NPE

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

1 files changed, 8 insertions, 4 deletions

diff --git a/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java b/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
index cefd7a205f1..ef5ca785fe5 100644
--- a/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
+++ b/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
@@ -198,6 +198,7 @@ public class UMLTableUtils {
 		}

 		return stereotypes;

 	}

+

 	/**

 	 * 

 	 * @param editedElement

@@ -212,11 +213,14 @@ public class UMLTableUtils {
 	 */

 	public static final List<StereotypeApplicationStructure> findStereotypeApplicationDataStructure(final Element editedElement, final String id, final Map<?, ?> sharedMap) {

 		//TODO : enhance the data structure to look for an editedElement + a propQn as Key!

+		@SuppressWarnings("unchecked")

 		List<StereotypeApplicationStructure> list = (List<StereotypeApplicationStructure>)sharedMap.get(editedElement);

-		final String propertyQN = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$

-		for(final StereotypeApplicationStructure current : list) {

-			if(current.getProperty().getQualifiedName().equals(propertyQN)) {

-				return Collections.singletonList(current);//TODO : doesn't manage when several stereotype with the same property are applied

+		if(list != null && !list.isEmpty()) {

+			final String propertyQN = id.replace(UMLTableUtils.PROPERTY_OF_STEREOTYPE_PREFIX, ""); //$NON-NLS-1$

+			for(final StereotypeApplicationStructure current : list) {

+				if(current.getProperty().getQualifiedName().equals(propertyQN)) {

+					return Collections.singletonList(current);//TODO : doesn't manage when several stereotype with the same property are applied

+				}

 			}

 		}

 		return null;