Fixing Xtend != warnings for null comparison

Change-Id: I969d3fa0a74b7a2c1568540e4fbae23574844234
Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/optimized/CPS2DeploymentBatchTransformationOptimized.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/optimized/CPS2DeploymentBatchTransformationOptimized.xtend
index 4f6649b..1ae7fb2 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/optimized/CPS2DeploymentBatchTransformationOptimized.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/optimized/CPS2DeploymentBatchTransformationOptimized.xtend
@@ -90,9 +90,9 @@
 		traceBegin("constructor")
 		
 
-		checkNotNull(mapping != null, "Mapping cannot be null!")
-		checkArgument(mapping.cps != null, "CPS not defined in mapping!")
-		checkArgument(mapping.deployment != null, "Deployment not defined in mapping!")
+		checkNotNull(mapping !== null, "Mapping cannot be null!")
+		checkArgument(mapping.cps !== null, "CPS not defined in mapping!")
+		checkArgument(mapping.deployment !== null, "Deployment not defined in mapping!")
 
 		this.mapping = mapping;
 
@@ -190,7 +190,7 @@
 	private def void createTransitionCache(CPS2DeploymentTrace transitionTrace) {
 		transitionMappingCachingPerformance.start
 		val transition = transitionTrace.cpsElements.head as Transition
-		if (transition.action == null) {
+		if (transition.action === null) {
 			transitionMappingCachingPerformance.stop
 			return
 		}
@@ -285,7 +285,7 @@
 	 */
 	private def isTransitionSender(Transition transition) {
 		traceBegin('''isTransitionSender(«transition.name»)''')
-		if (transition.action == null) {
+		if (transition.action === null) {
 			return false
 		}
 
@@ -318,7 +318,7 @@
 	 */
 	private def isTransitionReceiver(Transition transition) {
 		traceBegin('''isTransitionReceiver(«transition.name»)''')
-		if (transition.action == null) {
+		if (transition.action === null) {
 			return false
 		}
 
@@ -383,7 +383,7 @@
 
 		appTransformationPerformance.stop
 		// Transform state machines
-		if (appInstance.type.behavior != null)
+		if (appInstance.type.behavior !== null)
 			deploymentApp.behavior = appInstance.type.behavior.transform
 
 		traceEnd('''transform(«appInstance.name»)''')
@@ -416,8 +416,8 @@
 			] as BehaviorState
 			behaviorTransitions.addAll(
 				state.outgoingTransitions
-					.filter[targetState != null]
-					.filter[transition|mappingCache.get(transition.targetState) != null && /* Need to check, if it is in the model */ transition.targetState.eContainer != null]
+					.filter[targetState !== null]
+					.filter[transition|mappingCache.get(transition.targetState) !== null && /* Need to check, if it is in the model */ transition.targetState.eContainer !== null]
 					.map[
 						transform(parentBehaviorState)
 					]
@@ -484,7 +484,7 @@
 	private def setCurrentState(StateMachine stateMachine, DeploymentBehavior behavior) {
 		traceBegin('''transform(«stateMachine.name», «behavior.name»)''')
 		val initial = stateMachine.initial
-		if (initial != null) {
+		if (initial !== null) {
 
 			val initialBehaviorState = mappingCache.get(initial).findFirst[behavior.states.contains(it)]
 
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/simple/CPS2DeploymentBatchTransformationSimple.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/simple/CPS2DeploymentBatchTransformationSimple.xtend
index dc4ecb9..fd32f30 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/simple/CPS2DeploymentBatchTransformationSimple.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/simple/CPS2DeploymentBatchTransformationSimple.xtend
@@ -56,8 +56,8 @@
 		traceBegin("constructor")
 
 		checkNotNull(mapping, "Mapping cannot be null!")
-		checkArgument(mapping.cps != null, "CPS not defined in mapping!")
-		checkArgument(mapping.deployment != null, "Deployment not defined in mapping!")
+		checkArgument(mapping.cps !== null, "CPS not defined in mapping!")
+		checkArgument(mapping.deployment !== null, "Deployment not defined in mapping!")
 
 		this.mapping = mapping;
 
@@ -189,7 +189,7 @@
 	 */
 	private def isTransitionSender(Transition transition) {
 		traceBegin('''isTransitionSender(«transition.name»)''')
-		if (transition.action == null) {
+		if (transition.action === null) {
 			return false
 		}
 
@@ -222,7 +222,7 @@
 	 */
 	private def isTransitionReceiver(Transition transition) {
 		traceBegin('''isTransitionReceiver(«transition.name»)''')
-		if (transition.action == null) {
+		if (transition.action === null) {
 			return false
 		}
 
@@ -281,7 +281,7 @@
 		appInstance.createOrAddTrace(deploymentApp)
 
 		// Transform state machines
-		if (appInstance.type.behavior != null)
+		if (appInstance.type.behavior !== null)
 			deploymentApp.behavior = appInstance.type.behavior.transform
 
 		traceEnd('''transform(«appInstance.name»)''')
@@ -311,10 +311,10 @@
 				behavior.states.contains(it)
 			]
 			behaviorTransitions.addAll(
-				state.outgoingTransitions.filter[targetState != null].filter [ transition |
+				state.outgoingTransitions.filter[targetState !== null].filter [ transition |
 					mapping.traces.findFirst [
 						it.cpsElements.contains(transition.targetState)
-					] != null && /* Need to check, if it is in the model */ transition.targetState != null
+					] !== null && /* Need to check, if it is in the model */ transition.targetState !== null
 				].map [
 					transform(parentBehaviorState)
 				]
@@ -379,7 +379,7 @@
 	private def setCurrentState(StateMachine stateMachine, DeploymentBehavior behavior) {
 		traceBegin('''transform(«stateMachine.name», «behavior.name»)''')
 		val initial = stateMachine.states.findFirst[stateMachine.initial == it]
-		if (initial != null) {
+		if (initial !== null) {
 			val mappingForInitialState = mapping.traces.findFirst[it.cpsElements.contains(initial)]
 
 			val initialBehaviorState = mappingForInitialState.deploymentElements.findFirst[behavior.states.contains(it)]
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/viatra/CPS2DeploymentBatchViatra.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/viatra/CPS2DeploymentBatchViatra.xtend
index ba73f8a..eef5afb 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/viatra/CPS2DeploymentBatchViatra.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/viatra/CPS2DeploymentBatchViatra.xtend
@@ -43,10 +43,10 @@
     }
     
     def initialize(CPSToDeployment cps2dep, ViatraQueryEngine engine, boolean isDebuggable, String debugName) {
-        checkArgument(cps2dep != null, "Mapping cannot be null!")
-        checkArgument(cps2dep.cps != null, "CPS not defined in mapping!")
-        checkArgument(cps2dep.deployment != null, "Deployment not defined in mapping!")
-        checkArgument(engine != null, "Engine cannot be null!")
+        checkArgument(cps2dep !== null, "Mapping cannot be null!")
+        checkArgument(cps2dep.cps !== null, "CPS not defined in mapping!")
+        checkArgument(cps2dep.deployment !== null, "Deployment not defined in mapping!")
+        checkArgument(engine !== null, "Engine cannot be null!")
         
         if (!initialized) {
             this.mapping = cps2dep
@@ -92,7 +92,7 @@
     
     
     def dispose(){
-        if(transformation != null){
+        if(transformation !== null){
             transformation.ruleEngine.dispose
         }
         transformation = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/viatra/rules/RuleProvider.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/viatra/rules/RuleProvider.xtend
index 6c07ab2..c1be6a3 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/viatra/rules/RuleProvider.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/batch/viatra/rules/RuleProvider.xtend
@@ -59,7 +59,7 @@
 	
 	
 	public def getHostRule() {
-		if (hostRule == null) {
+		if (hostRule === null) {
 			hostRule = createRule.name("HostRule").precondition(HostInstanceMatcher.querySpecification).action[
 				val cpsHostInstance = it.hostInstance
 				val nodeIp = it.hostInstance.nodeIp
@@ -78,7 +78,7 @@
 	}
 	
 	public def getApplicationRule() {
-		if (applicationRule == null) {
+		if (applicationRule === null) {
 			applicationRule = createRule.name("ApplicationRule").precondition(ApplicationInstanceMatcher.querySpecification).action[
 				val cpsApplicationInstance = it.appInstance
 				val appId = it.appInstance.identifier
@@ -104,7 +104,7 @@
 	}
 	
 	public def getStateMachineRule() {
-		if (stateMachineRule == null) {
+		if (stateMachineRule === null) {
 			stateMachineRule = createRule.name("StateMachineRule").precondition(AppInstanceWithStateMachineMatcher.querySpecification).action[
 				val cpsApplicationInstance = it.appInstance
 				val cpsStateMachine = it.stateMachine
@@ -117,7 +117,7 @@
 				depApplication.behavior = depBehavior
 				
 				val trace = getTraceForCPSElement(cpsStateMachine)
-				if (trace == null){
+				if (trace === null){
 					mapping.traces += createCPS2DeploymentTrace => [
 						cpsElements += cpsStateMachine
 						deploymentElements += depBehavior
@@ -132,7 +132,7 @@
 	}
 	
 	public def getStateRule() {
-		if (stateRule == null) {
+		if (stateRule === null) {
 			stateRule = createRule.name("StateRule").precondition(StateMatcher.querySpecification).action[
 				val cpsStateMachine = it.stateMachine
 				val cpsAppInstance = it.appInstance
@@ -149,7 +149,7 @@
 				depBehavior.states += behaviorState
 				
 				val trace = getTraceForCPSElement(cpsState)
-				if (trace == null) {
+				if (trace === null) {
 					mapping.traces += createCPS2DeploymentTrace => [
 						cpsElements += cpsState
 						deploymentElements += behaviorState
@@ -167,7 +167,7 @@
 	}
 	
 	public def getTransitionRule() {
-		if (transitionRule == null) {
+		if (transitionRule === null) {
 			transitionRule = createRule.name("TransitionRule").precondition(TransitionMatcher.querySpecification).action[
 				val cpsAppInstance = it.appInstance
 				val cpsState = it.sourceState
@@ -185,7 +185,7 @@
 				depBehavior.transitions += behaviorTransition
 				
 				val trace = getTraceForCPSElement(cpsTransition)
-				if (trace == null){
+				if (trace === null){
 					mapping.traces += createCPS2DeploymentTrace => [
 						cpsElements += cpsTransition
 						deploymentElements += behaviorTransition
@@ -205,7 +205,7 @@
 	}
 	
 	public def getActionRule() {
-		if (actionRule == null) {
+		if (actionRule === null) {
 			actionRule = createRule.name("ActionRule").precondition(ActionPairMatcher.querySpecification).action[
 				val cpsSendTransition = sendTransition
 				val cpsSendAppInstance = sendAppInstance
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/aggr/CPS2DeploymentPartialBatchTransformation.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/aggr/CPS2DeploymentPartialBatchTransformation.xtend
index 11fd8e5..e283621 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/aggr/CPS2DeploymentPartialBatchTransformation.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/aggr/CPS2DeploymentPartialBatchTransformation.xtend
@@ -105,10 +105,10 @@
 	 *             does not contain a cps and a deployment model.
 	 */
 	new(CPSToDeployment mapping, ViatraQueryEngine engine) {
-		checkArgument(mapping != null, "Mapping cannot be null!")
-		checkArgument(mapping.cps != null, "CPS not defined in mapping!")
-		checkArgument(mapping.deployment != null, "Deployment not defined in mapping!")
-		checkArgument(engine != null, "Engine cannot be null!")
+		checkArgument(mapping !== null, "Mapping cannot be null!")
+		checkArgument(mapping.cps !== null, "CPS not defined in mapping!")
+		checkArgument(mapping.deployment !== null, "Deployment not defined in mapping!")
+		checkArgument(engine !== null, "Engine cannot be null!")
 
 		this.mapping = mapping
 		this.engine = engine
@@ -318,7 +318,7 @@
 			debug("Resolving initial state.")
 			stateMachineTransformationPerformance.start
 			watch.reset.start
-			if (cpsBehavior.initial != null)
+			if (cpsBehavior.initial !== null)
 				depBehavior.current = engine.cps2depTrace.getAllMatches(mapping, null, cpsBehavior.initial, null).map[
 					depElement].filter(BehaviorState).findFirst[depBehavior.states.contains(it)]
 			else
@@ -373,7 +373,7 @@
 		transitionTransformationPerformance.start
 
 		val depState = stateTable.get(cpsState, depBehavior)
-		cpsState.outgoingTransitions.filter[targetState != null && cpsBehavior.states.contains(targetState)].forEach [
+		cpsState.outgoingTransitions.filter[targetState !== null && cpsBehavior.states.contains(targetState)].forEach [
 			mapTransition(depState, depBehavior)
 		]
 		transitionTransformationPerformance.stop
@@ -563,7 +563,7 @@
 				if (b instanceof TransitionsMatch) {
 					val transition = b.transition
 					val action = transitionMap.get(transition)
-					if (action != null && SignalUtil.isWait(action)) {
+					if (action !== null && SignalUtil.isWait(action)) {
 						val id = SignalUtil.getSignalId(action)
 						engine.sendTransitionAppSignal.getAllMatches(null, null, id).forEach [ match |
 							match.transition.removeTransition
@@ -607,7 +607,7 @@
 	private def removeAppInstance(ApplicationInstance app) {
 			trace('''Executing: removeAppinstance(app = «app.name»)''')
 			engine.cps2depTrace.getAllMatches(mapping, null, app, null).forEach [ c |
-				if (c.depElement != null) {
+				if (c.depElement !== null) {
 					mapping.traces.remove(c.trace)
 					val depapp = c.depElement as DeploymentApplication
 					engine.depApp2depHost.getAllMatches(depapp, null).forEach [ match |
@@ -646,7 +646,7 @@
 
 			trace('''Executing: removeStateMachine(sm = «sm.name»)''')
 			engine.cps2depTrace.getAllMatches(mapping, null, sm, null).forEach [ c |
-				if (c.depElement != null) {
+				if (c.depElement !== null) {
 					mapping.traces.remove(c.trace)
 					val depBehavior = c.depElement as DeploymentBehavior
 					engine.depBehavior2depApp.getAllMatches(depBehavior, null).forEach [ match |
@@ -661,7 +661,7 @@
 				state.outgoingTransitions.forEach [ trans |
 					if (recursive) {
 						val action = transitionMap.get(trans)
-						if (action != null && SignalUtil.isWait(action)) {
+						if (action !== null && SignalUtil.isWait(action)) {
 							val id = SignalUtil.getSignalId(action)
 							engine.sendTransitionAppSignal.getAllMatches(null, null, id).forEach [ match |
 								engine.transition2StateMachine.getAllMatches(match.transition, null).forEach [ m |
@@ -687,7 +687,7 @@
 
 			trace('''Executing: removeState(trans = «state.name»)''')
 			engine.cps2depTrace.getAllMatches(mapping, null, state, null).forEach [ c |
-				if (c.depElement != null) {
+				if (c.depElement !== null) {
 					mapping.traces.remove(c.trace)
 				}
 			]
@@ -704,7 +704,7 @@
 	private def removeTransition(Transition trans) {
 			trace('''Executing: removeTransition(trans = «trans.name»)''')
 			engine.cps2depTrace.getAllMatches(mapping, null, trans, null).forEach [ c |
-				if (c.depElement != null) {
+				if (c.depElement !== null) {
 					mapping.traces.remove(c.trace)
 					val depTrans = c.depElement as BehaviorTransition
 					depTrans.trigger.clear
@@ -726,7 +726,7 @@
 
 		//var trace = engine.cps2depTrace.getOneArbitraryMatch(mapping, null, cpsElement, null)?.trace
 		var trace = traceTable.get(cpsElement)
-		if (trace == null) {
+		if (trace === null) {
 			trace = tracFactory.createCPS2DeploymentTrace
 			traceTable.put(cpsElement, trace)
 
@@ -759,7 +759,7 @@
 	
 	def dispose() {
 		trace("dispose")
-		if(monitor != null){
+		if(monitor !== null){
 			monitor.dispose
 		}
 		monitor = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/expl/CPS2DeploymentTransformation.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/expl/CPS2DeploymentTransformation.xtend
index efe72c0..0cec9f7 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/expl/CPS2DeploymentTransformation.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/expl/CPS2DeploymentTransformation.xtend
@@ -40,10 +40,10 @@
 	ViatraQueryEngine engine
 	
 	def initialize(CPSToDeployment mapping, ViatraQueryEngine iqEngine) {
-		checkArgument(mapping != null, "Mapping cannot be null!")
-		checkArgument(mapping.cps != null, "CPS not defined in mapping!")
-		checkArgument(mapping.deployment != null, "Deployment not defined in mapping!")
-		checkArgument(iqEngine != null, "Engine cannot be null!")
+		checkArgument(mapping !== null, "Mapping cannot be null!")
+		checkArgument(mapping.cps !== null, "CPS not defined in mapping!")
+		checkArgument(mapping.deployment !== null, "Deployment not defined in mapping!")
+		checkArgument(iqEngine !== null, "Engine cannot be null!")
 		
 		this.cps2dep = mapping
 		this.engine = iqEngine
@@ -57,7 +57,7 @@
 	
 	def execute() {
 		
-		if(schema == null){
+		if(schema === null){
 			info('''
 				Executing transformation on:
 					Cyber-physical system: «cps2dep.cps.identifier»''')
@@ -92,7 +92,7 @@
 	}
 	
 	def dispose() {
-		if(schema != null){
+		if(schema !== null){
 			schema.dispose
 		}
 		engine = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/CPS2DeploymentTransformationQrt.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/CPS2DeploymentTransformationQrt.xtend
index 1db3b8d..b474bad 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/CPS2DeploymentTransformationQrt.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/CPS2DeploymentTransformationQrt.xtend
@@ -41,10 +41,10 @@
 	ViatraQueryEngine engine
 
 	def initialize(CPSToDeployment cps2dep, ViatraQueryEngine engine) {
-		checkArgument(cps2dep != null, "Mapping cannot be null!")
-		checkArgument(cps2dep.cps != null, "CPS not defined in mapping!")
-		checkArgument(cps2dep.deployment != null, "Deployment not defined in mapping!")
-		checkArgument(engine != null, "Engine cannot be null!")
+		checkArgument(cps2dep !== null, "Mapping cannot be null!")
+		checkArgument(cps2dep.cps !== null, "CPS not defined in mapping!")
+		checkArgument(cps2dep.deployment !== null, "Deployment not defined in mapping!")
+		checkArgument(engine !== null, "Engine cannot be null!")
 
 		this.cps2dep = cps2dep
 		this.engine = engine
@@ -56,7 +56,7 @@
 	}
 
 	def execute() {
-		if (schema == null) {
+		if (schema === null) {
 			info(
 				'''
 				Executing transformation on:
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/rules/StateMachineRules.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/rules/StateMachineRules.xtend
index 9f42720..c4c1e81 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/rules/StateMachineRules.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/rules/StateMachineRules.xtend
@@ -18,7 +18,6 @@
 import org.eclipse.viatra.transformation.evm.specific.crud.CRUDActivationStateEnum
 import org.eclipse.viatra.examples.cps.deployment.DeploymentApplication
 import org.eclipse.viatra.examples.cps.deployment.DeploymentBehavior
-import org.eclipse.viatra.examples.cps.cyberPhysicalSystem.ApplicationInstance
 
 class StateMachineRules {
 	static def getRules(ViatraQueryEngine engine) {
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/rules/StateRules.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/rules/StateRules.xtend
index b2ada37..f50b9d7 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/rules/StateRules.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/rules/StateRules.xtend
@@ -107,7 +107,7 @@
 					BehaviorState).findFirst[depApp.behavior.states.contains(it)];
 				val stateId = depState.description
 				logger.debug('''Removing state with ID: «stateId»''')
-				if (depBehavior != null) {
+				if (depBehavior !== null) {
 					depBehavior.states -= depState
 					if (depBehavior.current == depState) {
 						depBehavior.current = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/util/PerJobFixedPriorityConflictResolver.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/util/PerJobFixedPriorityConflictResolver.xtend
index 7ef9365..971ba9d 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/util/PerJobFixedPriorityConflictResolver.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/qrt/util/PerJobFixedPriorityConflictResolver.xtend
@@ -38,7 +38,7 @@
 		}
 
 		override removeActivation(Activation<?> activation) {
-			checkArgument(activation != null, "Activation cannot be null!")
+			checkArgument(activation !== null, "Activation cannot be null!")
 			val rulePriority = getRulePriority(activation)
 			return priorityBuckets.remove(rulePriority, activation) ||
 				priorityBuckets.remove((-1) * rulePriority, activation)
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/CPS2DeploymentTransformationViatra.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/CPS2DeploymentTransformationViatra.xtend
index 4612974..d71a413 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/CPS2DeploymentTransformationViatra.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/CPS2DeploymentTransformationViatra.xtend
@@ -18,7 +18,6 @@
 import org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra.rules.RuleProvider
 import org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra.util.PerJobFixedPriorityConflictResolver
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
-import org.eclipse.viatra.transformation.evm.api.Executor
 import org.eclipse.viatra.transformation.evm.api.Scheduler.ISchedulerFactory
 import org.eclipse.viatra.transformation.runtime.emf.transformation.eventdriven.EventDrivenTransformation
 
@@ -43,10 +42,10 @@
     }
     
     def initialize(CPSToDeployment cps2dep, ViatraQueryEngine engine, boolean isDebuggable, String debugName) {
-        checkArgument(cps2dep != null, "Mapping cannot be null!")
-        checkArgument(cps2dep.cps != null, "CPS not defined in mapping!")
-        checkArgument(cps2dep.deployment != null, "Deployment not defined in mapping!")
-        checkArgument(engine != null, "Engine cannot be null!")
+        checkArgument(cps2dep !== null, "Mapping cannot be null!")
+        checkArgument(cps2dep.cps !== null, "CPS not defined in mapping!")
+        checkArgument(cps2dep.deployment !== null, "Deployment not defined in mapping!")
+        checkArgument(engine !== null, "Engine cannot be null!")
 
         if (!initialized) {
             this.cps2dep = cps2dep
@@ -68,7 +67,7 @@
 
     def execute() {
         debug('''Executing transformation on: Cyber-physical system: «cps2dep.cps.identifier»''')
-        if(factory == null){
+        if(factory === null){
             transform.executionSchema.startUnscheduledExecution
         }
     }
@@ -95,7 +94,7 @@
              .addRule(stateRule)
              .addRule(transitionRule)
              .addRule(triggerRule)
-        if (factory != null) {
+        if (factory !== null) {
             builder.schedulerFactory = factory
         }
         if (isDebuggable) {
@@ -108,7 +107,7 @@
     }
 
     def dispose() {
-        if (transform != null) {
+        if (transform !== null) {
             transform.executionSchema.dispose
         }
         transform = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/rules/RuleProvider.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/rules/RuleProvider.xtend
index 92687d9..5a5d789 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/rules/RuleProvider.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/rules/RuleProvider.xtend
@@ -62,7 +62,7 @@
 	}
 
 	public def getHostRule() {
-		if (hostRule == null) {
+		if (hostRule === null) {
 			hostRule = createRule.name("HostRule").precondition(HostInstanceMatcher.querySpecification).action(
 				CRUDActivationStateEnum.CREATED) [	
 				debug('''Mapping host with IP: «hostInstance.nodeIp»''')
@@ -92,7 +92,7 @@
 	}
 
 	public def getApplicationRule() {
-		if (applicationRule == null) {
+		if (applicationRule === null) {
 
 			applicationRule = createRule.name("ApplicationRule").precondition(ApplicationInstanceMatcher.querySpecification).action(
 				CRUDActivationStateEnum.CREATED) [
@@ -122,7 +122,7 @@
 	}
 
 	public def getStateMachineRule() {
-		if (stateMachineRule == null) {
+		if (stateMachineRule === null) {
 			stateMachineRule = createRule.name("StateMachineRule").precondition(StateMachineMatcher.querySpecification).action(
 				CRUDActivationStateEnum.CREATED) [
 				val depApp = engine.cps2depTrace.getAllValuesOfdepElement(null, null, appInstance).filter(
@@ -177,7 +177,7 @@
 	}
 
 	public def getStateRule() {
-		if (stateRule == null) {
+		if (stateRule === null) {
 			stateRule = createRule.name("StateRule").precondition(StateMatcher.querySpecification).action(
 				CRUDActivationStateEnum.CREATED) [
 				val depApp = engine.cps2depTrace.getAllValuesOfdepElement(null, null, appInstance).head as DeploymentApplication
@@ -227,7 +227,7 @@
 				val stateId = depState.description
 				
 				logger.debug('''Removing state with ID: «stateId»''')
-				if (depBehavior != null) {
+				if (depBehavior !== null) {
 					depBehavior.remove(deploymentBehavior_States, depState)
 					if (depBehavior.current == depState) {
 						depBehavior.set(deploymentBehavior_Current, null)
@@ -247,7 +247,7 @@
 	}
 
 	public def getTransitionRule() {
-		if (transitionRule == null) {
+		if (transitionRule === null) {
 			transitionRule = createRule.name("TransitionRule").precondition(TransitionMatcher.querySpecification).action(
 				CRUDActivationStateEnum.CREATED) [
 				val depApp = engine.cps2depTrace.getAllValuesOfdepElement(null, null, appInstance).filter(
@@ -336,7 +336,7 @@
 	}
 
 	public def getTriggerRule() {
-		if (triggerRule == null) {
+		if (triggerRule === null) {
 			triggerRule = createRule.name("TriggerRule").precondition(TriggerPairMatcher.querySpecification).action(
 				CRUDActivationStateEnum.CREATED) [
 				val depAppTrigger = engine.cps2depTrace.getAllValuesOfdepElement(null, null, appInstanceTrigger).
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/util/PerJobFixedPriorityConflictResolver.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/util/PerJobFixedPriorityConflictResolver.xtend
index da5692f..a55dc8f 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/util/PerJobFixedPriorityConflictResolver.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/src/org/eclipse/viatra/examples/cps/xform/m2m/incr/viatra/util/PerJobFixedPriorityConflictResolver.xtend
@@ -38,7 +38,7 @@
 		}
 
 		override removeActivation(Activation<?> activation) {
-			checkArgument(activation != null, "Activation cannot be null!")
+			checkArgument(activation !== null, "Activation cannot be null!")
 			val rulePriority = getRulePriority(activation)
 			return priorityBuckets.remove(rulePriority, activation) ||
 				priorityBuckets.remove((-1) * rulePriority, activation)
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchOptimized.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchOptimized.xtend
index 50e3276..f8e2723 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchOptimized.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchOptimized.xtend
@@ -27,7 +27,7 @@
 	}
 
 	override cleanupTransformation() {
-		if(xform != null){
+		if(xform !== null){
 			xform.dispose
 		}
 		xform = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchQueryLocalSearch.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchQueryLocalSearch.xtend
index a70843d..4b03143 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchQueryLocalSearch.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchQueryLocalSearch.xtend
@@ -39,7 +39,7 @@
 	}
 
 	override cleanupTransformation() {
-		if (engine != null) {
+		if (engine !== null) {
 			engine.dispose
 		}
 		engine = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchQueryOnly.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchQueryOnly.xtend
index fb67206..5eec419 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchQueryOnly.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchQueryOnly.xtend
@@ -39,7 +39,7 @@
 	}
 
 	override cleanupTransformation() {
-		if (engine != null) {
+		if (engine !== null) {
 			engine.dispose
 		}
 		engine = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchSimple.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchSimple.xtend
index e834a1f..70526b4 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchSimple.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchSimple.xtend
@@ -27,7 +27,7 @@
 	}
 
 	override cleanupTransformation() {
-		if(xform != null){
+		if(xform !== null){
 			xform.dispose
 		}
 		xform = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchViatra.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchViatra.xtend
index 7672dd2..26b971c 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchViatra.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/BatchViatra.xtend
@@ -32,10 +32,10 @@
 	}
 	
 	override cleanupTransformation() {
-		if(xform != null){
+		if(xform !== null){
 			xform.dispose
 		}
-		if(engine != null){
+		if(engine !== null){
 			engine.dispose
 		}
 		xform = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/ExplicitTraceability.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/ExplicitTraceability.xtend
index 6977960..83ea787 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/ExplicitTraceability.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/ExplicitTraceability.xtend
@@ -33,10 +33,10 @@
 	}
 	
 	override cleanupTransformation() {
-		if(xform != null){
+		if(xform !== null){
 			xform.dispose
 		}
-		if(engine != null){
+		if(engine !== null){
 			engine.dispose
 		}
 		xform = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/PartialBatch.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/PartialBatch.xtend
index 28776a6..d6c00ba 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/PartialBatch.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/PartialBatch.xtend
@@ -31,10 +31,10 @@
 	}
 
 	override cleanupTransformation() {
-		if(xform != null){
+		if(xform !== null){
 			xform.dispose
 		}
-		if (engine != null) {
+		if (engine !== null) {
 			engine.dispose
 		}
 		engine = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/QueryResultTraceability.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/QueryResultTraceability.xtend
index 3261a2b..8c424b3 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/QueryResultTraceability.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/QueryResultTraceability.xtend
@@ -33,10 +33,10 @@
 	}
 	
 	override cleanupTransformation() {
-		if(xform != null){
+		if(xform !== null){
 			xform.dispose
 		}
-		if(engine != null){
+		if(engine !== null){
 			engine.dispose
 		}
 		engine = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/ViatraTransformation.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/ViatraTransformation.xtend
index dcba4c9..dd9c79a 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/ViatraTransformation.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/src/org/eclipse/viatra/examples/cps/xform/m2m/launcher/ViatraTransformation.xtend
@@ -34,10 +34,10 @@
 	}
 	
 	override cleanupTransformation() {
-		if(xform != null){
+		if(xform !== null){
 			xform.dispose
 		}
-		if(engine != null){
+		if(engine !== null){
 			engine.dispose
 		}
 		xform = null
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/src/org/eclipse/viatra/examples/cps/xform/m2m/util/SignalUtil.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/src/org/eclipse/viatra/examples/cps/xform/m2m/util/SignalUtil.xtend
index dee9098..1b9f34e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/src/org/eclipse/viatra/examples/cps/xform/m2m/util/SignalUtil.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/src/org/eclipse/viatra/examples/cps/xform/m2m/util/SignalUtil.xtend
@@ -33,7 +33,7 @@
 	@Pure
 	static def getSignalId(String action) {
 		val sendId = sendPattern.getGroupOfMatch(action, 2)
-		if(sendId == null) {
+		if(sendId === null) {
 			waitPattern.getGroupOfMatch(action, 1)
 		} else {
 			sendId
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/src/org/eclipse/viatra/examples/cps/xform/m2t/distributed/Generator.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/src/org/eclipse/viatra/examples/cps/xform/m2t/distributed/Generator.xtend
index 028efa4..6d28a08 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/src/org/eclipse/viatra/examples/cps/xform/m2t/distributed/Generator.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/src/org/eclipse/viatra/examples/cps/xform/m2t/distributed/Generator.xtend
@@ -92,7 +92,7 @@
 			public «appClassName»(Host host) {
 				super(host);
 				
-				«IF app?.behavior?.current != null»
+				«IF app?.behavior?.current !== null»
 				// Set initial State
 				currentState = «behavior».«app.behavior.current.description.purifyAndToUpperCamel»;
 				«ENDIF»
@@ -200,7 +200,7 @@
 	
 	def String calculateSendTriggerParameters(BehaviorState srcState, BehaviorTransition transition){
 		//"152.66.102.5", "IBM System Storage", "ISSReceiving"
-		if(transition != null){
+		if(transition !== null){
 			'''"«transition.trigger.head.host.ip»", "«transition.trigger.head.app.id»", "«transition.trigger.head.name»"'''
 		}else{
 			throw new CPSGeneratorException("#Error: Cannot find transition from " + srcState.name + " to " + transition.to.name)
@@ -209,7 +209,7 @@
 	
 	def DeploymentApplication app(BehaviorTransition transition){
 		val app = transition?.eContainer?.eContainer
-		if(app != null && app instanceof DeploymentApplication){
+		if(app !== null && app instanceof DeploymentApplication){
 			return app as DeploymentApplication
 		}
 		throw new CPSGeneratorException("#Error: Cannot find Application of the Transition (" + transition.name + ")")
@@ -217,7 +217,7 @@
 	
 	def DeploymentHost host(BehaviorTransition transition){
 		val app = transition?.eContainer?.eContainer?.eContainer
-		if(app != null && app instanceof DeploymentHost){
+		if(app !== null && app instanceof DeploymentHost){
 			return app as DeploymentHost
 		}
 		throw new CPSGeneratorException("#Error: Cannot find Host of the Transition (" + transition.name + ")")
@@ -225,7 +225,7 @@
 	
 	def DeploymentApplication app(BehaviorState state){
 		val app = state?.eContainer?.eContainer
-		if(app != null && app instanceof DeploymentApplication){
+		if(app !== null && app instanceof DeploymentApplication){
 			return app as DeploymentApplication
 		}
 		throw new CPSGeneratorException("#Error: Cannot find Application of the State (" + state.name + ")")
@@ -233,7 +233,7 @@
 	
 	def DeploymentHost host(BehaviorState state){
 		val host = state?.eContainer?.eContainer?.eContainer
-		if(host != null && host instanceof DeploymentHost){
+		if(host !== null && host instanceof DeploymentHost){
 			return host as DeploymentHost
 		}
 		throw new CPSGeneratorException("#Error: Cannot find Host of the State (" + state.name + ")")
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/src/org/eclipse/viatra/examples/cps/xform/m2t/jdt/Generator.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/src/org/eclipse/viatra/examples/cps/xform/m2t/jdt/Generator.xtend
index 64980d0..4dc49c1 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/src/org/eclipse/viatra/examples/cps/xform/m2t/jdt/Generator.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/src/org/eclipse/viatra/examples/cps/xform/m2t/jdt/Generator.xtend
@@ -145,7 +145,7 @@
 		]
 		ctorBody.statements += superCall
 
-		if(application?.behavior?.current != null){
+		if(application?.behavior?.current !== null){
 			val currentState = ast.newAssignment => [
 				leftHandSide = ast.newSimpleName("currentState")
 				rightHandSide = ast.newQualifiedName(
@@ -460,7 +460,7 @@
 	}
 
 	def calculateSendTriggerParameters(BehaviorState srcState, BehaviorTransition transition) {
-		if (transition != null) {
+		if (transition !== null) {
 			#[transition.trigger.head.host.ip, transition.trigger.head.app.id, transition.trigger.head.name]
 		} else {
 			throw new CPSGeneratorException(
@@ -470,7 +470,7 @@
 
 	def DeploymentHost host(BehaviorTransition transition) {
 		val app = transition?.eContainer?.eContainer?.eContainer
-		if (app != null && app instanceof DeploymentHost) {
+		if (app !== null && app instanceof DeploymentHost) {
 			return app as DeploymentHost
 		}
 		throw new CPSGeneratorException("#Error: Cannot find Host of the Transition (" + transition.name + ")")
@@ -478,7 +478,7 @@
 
 	def DeploymentApplication app(BehaviorTransition transition) {
 		val app = transition?.eContainer?.eContainer
-		if (app != null && app instanceof DeploymentApplication) {
+		if (app !== null && app instanceof DeploymentApplication) {
 			return app as DeploymentApplication
 		}
 		throw new CPSGeneratorException("#Error: Cannot find Application of the Transition (" + transition.name + ")")