From 49023517b9aea7d07bc6525df335e062f70ea242 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Thu, 17 Aug 2017 17:26:52 +0200 Subject: null check before mapping value of a reference --- .../InstanceModel2PartialInterpretation.xtend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend index 080ad963..8e5e0661 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend @@ -2,6 +2,8 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace +import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput +import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguageFactory import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration @@ -15,11 +17,9 @@ import java.util.List import java.util.Map import org.eclipse.emf.common.util.Enumerator import org.eclipse.emf.ecore.EObject +import org.eclipse.emf.ecore.resource.Resource import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* -import org.eclipse.emf.ecore.resource.Resource -import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput -import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes class InstanceModel2PartialInterpretation { val extension LogiclanguageFactory factory = LogiclanguageFactory.eINSTANCE @@ -87,8 +87,8 @@ class InstanceModel2PartialInterpretation { } } else { val target = source.eGet(reference) as EObject - val targetElement = target.lookup(object2DefinedElement) if(target !== null) { + val targetElement = target.lookup(object2DefinedElement) translateLink(interpretation,sourceElement,targetElement) } } -- cgit v1.2.3-54-g00ecf