optimized length of history array for C generation

Also reduced the number of warnings.

Change-Id: I2316274b4d7ebed7dc38549aa03e7245a84920a4

4 files changed, 8 insertions, 7 deletions

diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend
index 33cab8742..d6ad81747 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/BaseDiagramProvider.xtend
@@ -52,7 +52,7 @@ class BaseDiagramProvider {
 		]
 		baseClasses.reverseView.forEach[ base |
 			val baseDiagram = diagramAccess.getDiagram(base, rs)	
-			if(baseDiagram != null) {
+			if(baseDiagram !== null) {
 				// create mapping from business object to pictogram elements
 				EcoreUtil.ExternalCrossReferencer.find(baseDiagram).forEach [ targetEObj, eFeatureSetting |
 					eFeatureSetting.map[getEObject].filter(PictogramLink).map[pictogramElement].forEach [ pe |
@@ -77,7 +77,7 @@ class BaseDiagramProvider {
 	}
 
 	def Collection<PictogramElement> getPictograms(EObject roomObj) {
-		if(roomObj == null) emptyList else baseDiagramBusinessObjs.get(roomObj)
+		if(roomObj === null) emptyList else baseDiagramBusinessObjs.get(roomObj)
 	}
 
 }
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/GenModelProvider.xtend b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/GenModelProvider.xtend
index 5503e3f53..7b9c50473 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/GenModelProvider.xtend
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/provider/GenModelProvider.xtend
@@ -42,7 +42,7 @@ class GenModelProvider {
 		Graphiti.linkService.getBusinessObjectForLinkedPictogramElement(fsmDiagramProvider.diagram) => [
 			modelInstance = if(it instanceof ModelComponent) builder.createTransformedModel(it) else null
 		]
-		if (modelInstance != null) {
+		if (modelInstance !== null) {
 			graphMap.clear
 			modelInstance.eAllContents.forEach [
 				switch (it) {
@@ -55,7 +55,7 @@ class GenModelProvider {
 	}
 
 	def getModel() {
-		if (modelInstance == null) {
+		if (modelInstance === null) {
 			updateModel()
 		}
 
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/AbstractFSMProviderDispatcher.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/AbstractFSMProviderDispatcher.java
index e08126e73..9fad672db 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/AbstractFSMProviderDispatcher.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/AbstractFSMProviderDispatcher.java
@@ -583,6 +583,7 @@ public class AbstractFSMProviderDispatcher {
 		return featureSwitch.getCreateConnectionFeatures();
 	}
 	
+	@SafeVarargs
 	private static <T> T[] concatAll(T[] first, T[]... rest) {
 		int totalLength = first.length;
 		for (T[] array : rest) {
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend
index c80c570fe..357f254e6 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/util/ModelEditingUtil.xtend
@@ -48,14 +48,14 @@ class ModelEditingUtil {
 				parent =  s.eContainer().eContainer() as State;
 				if (target2rs.containsKey(parent)) {
 					val bestFitting = target2rs.get(parent);
-					if (bestFitting.getSubgraph()==null)
+					if (bestFitting.getSubgraph()===null)
 						bestFitting.setSubgraph(FSMFactory.eINSTANCE.createStateGraph());
 					sg = bestFitting.getSubgraph();
 					break = true;
 				}
 			}
 			
-			if (sg==null)
+			if (sg===null)
 				sg = mc.getStateMachine();
 			
 			rs = FSMFactory.eINSTANCE.createRefinedState();
@@ -70,7 +70,7 @@ class ModelEditingUtil {
 	def static public StateGraph getOrCreateSubGraphOfRefinedStateFor(State s, ModelComponent mc) {
 		val rs = getOrCreateRefinedStateFor(s, mc);
 		
-		if (rs.getSubgraph()==null)
+		if (rs.getSubgraph()===null)
 			rs.setSubgraph(FSMFactory.eINSTANCE.createStateGraph());
 	
 		return rs.getSubgraph();