Bug 544723 - [room] Add annotation for deprecated elements

Change-Id: I36f078ca58c9aff38299ef4024c747ccecfd4b72

4 files changed, 10 insertions, 9 deletions

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
index 9b702edd6..347375f60 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
@@ -46,7 +46,7 @@ class ActorClassGen extends GenericActorClassGenerator {
 	@Inject protected ILogger logger
 
 	def doGenerate(Root root) {
-		for (xpac: root.actorClasses.map[root.getExpandedActorClass(it)]) {
+		root.actorClasses.filter[!isDeprecatedGeneration].map[root.getExpandedActorClass(it)].forEach[xpac |
 			val path = xpac.actorClass.getPath
 			var file = xpac.actorClass.getCHeaderFileName
 
@@ -65,7 +65,7 @@ class ActorClassGen extends GenericActorClassGenerator {
 				file = xpac.actorClass.getCSourceFileName
 				fileIO.generateFile("generating ActorClass source", path + file, root.generateSourceFile(xpac))
 			}
-		}
+		]
 	}
 
 	def protected generateHeaderFile(Root root, ExpandedActorClass xpac) {
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
index 774ace9e6..5e4b83525 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend
@@ -38,7 +38,7 @@ class DataClassGen {
 	@Inject ILogger logger
 	
 	def doGenerate(Root root) {
-		for (dc: root.dataClasses) {
+		root.dataClasses.filter[!isDeprecatedGeneration].forEach[dc |
 			val path = dc.getPath
 			var file = dc.getCHeaderFileName
 
@@ -52,8 +52,7 @@ class DataClassGen {
 			// source file
 			file = dc.getCSourceFileName
 			fileIO.generateFile("generating DataClass source", path + file, root.generateSourceFile(dc))
-			
-		}
+		]
 	}
 	
 	def generateHeaderFile(Root root, DataClass dc) {'''
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.xtend
index a8f88af50..c23be3521 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.xtend
@@ -20,6 +20,7 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root
 import org.eclipse.etrice.core.room.EnumerationType
 import org.eclipse.etrice.generator.base.io.IGeneratorFileIO
 import org.eclipse.etrice.generator.generic.TypeHelpers
+import org.eclipse.etrice.core.room.util.RoomHelpers
 
 /**
  * @author Henrik Rentz-Reichert
@@ -28,12 +29,13 @@ import org.eclipse.etrice.generator.generic.TypeHelpers
 class EnumerationTypeGen {
 
 	@Inject IGeneratorFileIO fileIO
+	@Inject extension RoomHelpers
 	@Inject extension CExtensions
 	@Inject extension RoomExtensions
 	@Inject extension TypeHelpers
 	
 	def doGenerate(Root root) {
-		for (et: root.enumClasses) {
+		root.enumClasses.filter[!isDeprecatedGeneration].forEach[et |
 			val path = et.getPath
 			var file = et.getCHeaderFileName
 
@@ -43,7 +45,7 @@ class EnumerationTypeGen {
 			// header file
 			file = et.getCSourceFileName
 			fileIO.generateFile("generating Enumeration source", path + file, root.generateSourceFile(et))
-		}
+		]
 	}
 	
 	private def generateHeaderFile(Root root, EnumerationType et) {
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
index f6fd647c4..1b6fde86b 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
@@ -45,7 +45,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
 	@Inject ILogger logger
 	
 	def doGenerate(Root root) {
-		for (pc: root.protocolClasses) {
+		root.protocolClasses.filter[!isDeprecatedGeneration].forEach[pc |
 			val path = pc.getPath
 			var file = pc.getCHeaderFileName
 
@@ -59,7 +59,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
 			// source file
 			file = pc.getCSourceFileName
 			fileIO.generateFile("generating ProtocolClass source", path + file, root.generateSourceFile(pc))
-		}
+		]
 	}