commit 398da3e00f3ff59ca0f7f2755cfea4fd1e17fbcb
author Eugen Neufeld <eneufeld@eclipsesource.com> Mon Jan 30 12:47:09 2017 +0100
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Mon Jan 30 07:53:14 2017 -0500
tree 8a079f83effe9170d619754714de10b4f8f40f63
parent d76997033e1cfe6d045cf6d23e2db49b9c9d2a97

Bug 510881 - NullPointerException in
MappedEClassControlSWTRenderer.getInput

Change-Id: I98177e517b4d959be2054458521b1966d27aa144
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>

bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java

diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java
index eba768a..82ba288 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java
@@ -59,7 +59,8 @@
 	 * @param viewContext the view context
 	 * @param reportService the {@link ReportService}
 	 */
-	public MappedEClassControlSWTRenderer(VControl vElement, ViewModelContext viewContext, ReportService reportService) {
+	public MappedEClassControlSWTRenderer(VControl vElement, ViewModelContext viewContext,
+		ReportService reportService) {
 		super(vElement, viewContext, reportService);
 	}
 
@@ -192,6 +193,9 @@
 		final EClass referenceMap = EReference.class.cast(dmr.getDomainModelEFeature()).getEReferenceType();
 
 		final EReference valueReference = EReference.class.cast(referenceMap.getEStructuralFeature("value")); //$NON-NLS-1$
+		if (valueReference == null) {
+			return null;
+		}
 		return EMFUtils.getSubClasses(valueReference.getEReferenceType());
 		// return Registry.INSTANCE;
 	}