[core.room] improved validation for DataClass

- readable error message if no attributes
- unique names are checked for attributes

5 files changed, 120 insertions, 129 deletions

diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi
index 3b881a174..b3e79f829 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi
@@ -252,7 +252,7 @@
             <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.60"/>

           </elements>

         </elements>

-        <elements xsi:type="xtext:Assignment" cardinality="+" feature="attributes" operator="+=">

+        <elements xsi:type="xtext:Assignment" cardinality="*" feature="attributes" operator="+=">

           <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.12"/>

         </elements>

         <elements xsi:type="xtext:Assignment" cardinality="*" feature="operations" operator="+=">

diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java
index 19c621654..b62761a48 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java
@@ -166,7 +166,7 @@ protected class RoomModel_Group extends GroupToken {
 
 }
 
-// "RoomModel"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class RoomModel_RoomModelKeyword_0 extends KeywordToken  {
 	
 	public RoomModel_RoomModelKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -187,7 +187,7 @@ protected class RoomModel_RoomModelKeyword_0 extends KeywordToken  {
 
 }
 
-// name=FQN
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class RoomModel_NameAssignment_1 extends AssignmentToken  {
 	
 	public RoomModel_NameAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -221,7 +221,7 @@ protected class RoomModel_NameAssignment_1 extends AssignmentToken  {
 
 }
 
-// docu=Documentation?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class RoomModel_DocuAssignment_2 extends AssignmentToken  {
 	
 	public RoomModel_DocuAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -267,7 +267,7 @@ protected class RoomModel_DocuAssignment_2 extends AssignmentToken  {
 	}	
 }
 
-// "{"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class RoomModel_LeftCurlyBracketKeyword_3 extends KeywordToken  {
 	
 	public RoomModel_LeftCurlyBracketKeyword_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -290,7 +290,7 @@ protected class RoomModel_LeftCurlyBracketKeyword_3 extends KeywordToken  {
 
 }
 
-// imports+=Import*
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class RoomModel_ImportsAssignment_4 extends AssignmentToken  {
 	
 	public RoomModel_ImportsAssignment_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1772,7 +1772,7 @@ protected class PrimitiveType_TypeAssignment_3 extends AssignmentToken  {
 
 }
 
-// "->"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_HyphenMinusGreaterThanSignKeyword_4 extends KeywordToken  {
 	
 	public PrimitiveType_HyphenMinusGreaterThanSignKeyword_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1794,7 +1794,7 @@ protected class PrimitiveType_HyphenMinusGreaterThanSignKeyword_4 extends Keywor
 
 }
 
-// targetName=FQN
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_TargetNameAssignment_5 extends AssignmentToken  {
 	
 	public PrimitiveType_TargetNameAssignment_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1828,7 +1828,7 @@ protected class PrimitiveType_TargetNameAssignment_5 extends AssignmentToken  {
 
 }
 
-// ("(" castName=FQN ")")?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_Group_6 extends GroupToken {
 	
 	public PrimitiveType_Group_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1850,7 +1850,7 @@ protected class PrimitiveType_Group_6 extends GroupToken {
 
 }
 
-// "("
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_LeftParenthesisKeyword_6_0 extends KeywordToken  {
 	
 	public PrimitiveType_LeftParenthesisKeyword_6_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1872,7 +1872,7 @@ protected class PrimitiveType_LeftParenthesisKeyword_6_0 extends KeywordToken  {
 
 }
 
-// castName=FQN
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_CastNameAssignment_6_1 extends AssignmentToken  {
 	
 	public PrimitiveType_CastNameAssignment_6_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1906,7 +1906,7 @@ protected class PrimitiveType_CastNameAssignment_6_1 extends AssignmentToken  {
 
 }
 
-// ")"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_RightParenthesisKeyword_6_2 extends KeywordToken  {
 	
 	public PrimitiveType_RightParenthesisKeyword_6_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1929,7 +1929,7 @@ protected class PrimitiveType_RightParenthesisKeyword_6_2 extends KeywordToken
 }
 
 
-// "default"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_DefaultKeyword_7 extends KeywordToken  {
 	
 	public PrimitiveType_DefaultKeyword_7(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1952,7 +1952,7 @@ protected class PrimitiveType_DefaultKeyword_7 extends KeywordToken  {
 
 }
 
-// defaultValueLiteral=STRING
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_DefaultValueLiteralAssignment_8 extends AssignmentToken  {
 	
 	public PrimitiveType_DefaultValueLiteralAssignment_8(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -1986,7 +1986,7 @@ protected class PrimitiveType_DefaultValueLiteralAssignment_8 extends Assignment
 
 }
 
-// docu=Documentation?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PrimitiveType_DocuAssignment_9 extends AssignmentToken  {
 	
 	public PrimitiveType_DocuAssignment_9(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2038,13 +2038,11 @@ protected class PrimitiveType_DocuAssignment_9 extends AssignmentToken  {
 
 /************ begin Rule ExternalType ****************
  *
- * ExternalType:
- * 
- * 	"ExternalType" name=ID "->" targetName=FQN ("default" defaultValueLiteral=STRING)? docu=Documentation?;
+ * org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
  *
  **/
 
-// "ExternalType" name=ID "->" targetName=FQN ("default" defaultValueLiteral=STRING)? docu=Documentation?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_Group extends GroupToken {
 	
 	public ExternalType_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2075,7 +2073,7 @@ protected class ExternalType_Group extends GroupToken {
 
 }
 
-// "ExternalType"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_ExternalTypeKeyword_0 extends KeywordToken  {
 	
 	public ExternalType_ExternalTypeKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2096,7 +2094,7 @@ protected class ExternalType_ExternalTypeKeyword_0 extends KeywordToken  {
 
 }
 
-// name=ID
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_NameAssignment_1 extends AssignmentToken  {
 	
 	public ExternalType_NameAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2130,7 +2128,7 @@ protected class ExternalType_NameAssignment_1 extends AssignmentToken  {
 
 }
 
-// "->"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_HyphenMinusGreaterThanSignKeyword_2 extends KeywordToken  {
 	
 	public ExternalType_HyphenMinusGreaterThanSignKeyword_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2152,7 +2150,7 @@ protected class ExternalType_HyphenMinusGreaterThanSignKeyword_2 extends Keyword
 
 }
 
-// targetName=FQN
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_TargetNameAssignment_3 extends AssignmentToken  {
 	
 	public ExternalType_TargetNameAssignment_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2186,7 +2184,7 @@ protected class ExternalType_TargetNameAssignment_3 extends AssignmentToken  {
 
 }
 
-// ("default" defaultValueLiteral=STRING)?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_Group_4 extends GroupToken {
 	
 	public ExternalType_Group_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2208,7 +2206,7 @@ protected class ExternalType_Group_4 extends GroupToken {
 
 }
 
-// "default"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_DefaultKeyword_4_0 extends KeywordToken  {
 	
 	public ExternalType_DefaultKeyword_4_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2230,7 +2228,7 @@ protected class ExternalType_DefaultKeyword_4_0 extends KeywordToken  {
 
 }
 
-// defaultValueLiteral=STRING
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_DefaultValueLiteralAssignment_4_1 extends AssignmentToken  {
 	
 	public ExternalType_DefaultValueLiteralAssignment_4_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2265,7 +2263,7 @@ protected class ExternalType_DefaultValueLiteralAssignment_4_1 extends Assignmen
 }
 
 
-// docu=Documentation?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ExternalType_DocuAssignment_5 extends AssignmentToken  {
 	
 	public ExternalType_DocuAssignment_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2318,23 +2316,11 @@ protected class ExternalType_DocuAssignment_5 extends AssignmentToken  {
 
 /************ begin Rule DataClass ****************
  *
- * // TODOHRR: define detail level language?
- * 
- * DataClass:
- * 
- * 	"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1"
- * 
- * 	userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+
- * 
- * 	operations+=StandardOperation* "}";
+ * org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
  *
  **/
 
-// "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1"
-// 
-// userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+
-// 
-// operations+=StandardOperation* "}"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class DataClass_Group extends GroupToken {
 	
 	public DataClass_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2363,7 +2349,7 @@ protected class DataClass_Group extends GroupToken {
 
 }
 
-// "DataClass"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class DataClass_DataClassKeyword_0 extends KeywordToken  {
 	
 	public DataClass_DataClassKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2384,7 +2370,7 @@ protected class DataClass_DataClassKeyword_0 extends KeywordToken  {
 
 }
 
-// name=ID
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class DataClass_NameAssignment_1 extends AssignmentToken  {
 	
 	public DataClass_NameAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2418,7 +2404,7 @@ protected class DataClass_NameAssignment_1 extends AssignmentToken  {
 
 }
 
-// docu=Documentation?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class DataClass_DocuAssignment_2 extends AssignmentToken  {
 	
 	public DataClass_DocuAssignment_2(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2897,7 +2883,7 @@ protected class DataClass_UserCode3Assignment_8_1 extends AssignmentToken  {
 }
 
 
-// attributes+=Attribute+
+// attributes+=Attribute*
 protected class DataClass_AttributesAssignment_9 extends AssignmentToken  {
 	
 	public DataClass_AttributesAssignment_9(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -2919,7 +2905,7 @@ protected class DataClass_AttributesAssignment_9 extends AssignmentToken  {
 
     @Override	
 	public IEObjectConsumer tryConsume() {
-		if((value = eObjectConsumer.getConsumable("attributes",true)) == null) return null;
+		if((value = eObjectConsumer.getConsumable("attributes",false)) == null) return null;
 		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("attributes");
 		if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
 			IEObjectConsumer param = createEObjectConsumer((EObject)value);
@@ -2990,6 +2976,11 @@ protected class DataClass_OperationsAssignment_10 extends AssignmentToken  {
 		switch(index) {
 			case 0: return new DataClass_OperationsAssignment_10(lastRuleCallOrigin, next, actIndex, consumed);
 			case 1: return new DataClass_AttributesAssignment_9(lastRuleCallOrigin, next, actIndex, consumed);
+			case 2: return new DataClass_Group_8(lastRuleCallOrigin, next, actIndex, consumed);
+			case 3: return new DataClass_Group_7(lastRuleCallOrigin, next, actIndex, consumed);
+			case 4: return new DataClass_Group_6(lastRuleCallOrigin, next, actIndex, consumed);
+			case 5: return new DataClass_AnnotationsAssignment_5(lastRuleCallOrigin, next, actIndex, consumed);
+			case 6: return new DataClass_LeftCurlyBracketKeyword_4(lastRuleCallOrigin, next, actIndex, consumed);
 			default: return null;
 		}	
 	}	
@@ -3012,6 +3003,11 @@ protected class DataClass_RightCurlyBracketKeyword_11 extends KeywordToken  {
 		switch(index) {
 			case 0: return new DataClass_OperationsAssignment_10(lastRuleCallOrigin, this, 0, inst);
 			case 1: return new DataClass_AttributesAssignment_9(lastRuleCallOrigin, this, 1, inst);
+			case 2: return new DataClass_Group_8(lastRuleCallOrigin, this, 2, inst);
+			case 3: return new DataClass_Group_7(lastRuleCallOrigin, this, 3, inst);
+			case 4: return new DataClass_Group_6(lastRuleCallOrigin, this, 4, inst);
+			case 5: return new DataClass_AnnotationsAssignment_5(lastRuleCallOrigin, this, 5, inst);
+			case 6: return new DataClass_LeftCurlyBracketKeyword_4(lastRuleCallOrigin, this, 6, inst);
 			default: return null;
 		}	
 	}
@@ -4202,7 +4198,7 @@ protected class PortOperation_LeftParenthesisKeyword_2 extends KeywordToken  {
 
 }
 
-// (arguments+=VarDecl ("," arguments+=VarDecl)*)?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PortOperation_Group_3 extends GroupToken {
 	
 	public PortOperation_Group_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -4225,7 +4221,7 @@ protected class PortOperation_Group_3 extends GroupToken {
 
 }
 
-// arguments+=VarDecl
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PortOperation_ArgumentsAssignment_3_0 extends AssignmentToken  {
 	
 	public PortOperation_ArgumentsAssignment_3_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -4271,7 +4267,7 @@ protected class PortOperation_ArgumentsAssignment_3_0 extends AssignmentToken  {
 	}	
 }
 
-// ("," arguments+=VarDecl)*
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PortOperation_Group_3_1 extends GroupToken {
 	
 	public PortOperation_Group_3_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -4293,7 +4289,7 @@ protected class PortOperation_Group_3_1 extends GroupToken {
 
 }
 
-// ","
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PortOperation_CommaKeyword_3_1_0 extends KeywordToken  {
 	
 	public PortOperation_CommaKeyword_3_1_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -4316,7 +4312,7 @@ protected class PortOperation_CommaKeyword_3_1_0 extends KeywordToken  {
 
 }
 
-// arguments+=VarDecl
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PortOperation_ArgumentsAssignment_3_1_1 extends AssignmentToken  {
 	
 	public PortOperation_ArgumentsAssignment_3_1_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -4364,7 +4360,7 @@ protected class PortOperation_ArgumentsAssignment_3_1_1 extends AssignmentToken
 
 
 
-// ")"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PortOperation_RightParenthesisKeyword_4 extends KeywordToken  {
 	
 	public PortOperation_RightParenthesisKeyword_4(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -4387,7 +4383,7 @@ protected class PortOperation_RightParenthesisKeyword_4 extends KeywordToken  {
 
 }
 
-// (":" ("void" | returntype=RefableType) | "sends" sendsMsg=[Message])?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class PortOperation_Alternatives_5 extends AlternativesToken {
 
 	public PortOperation_Alternatives_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -9054,7 +9050,7 @@ protected class ActorClass_ExtendsKeyword_4_0 extends KeywordToken  {
 
 }
 
-// base=[ActorClass|FQN]
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ActorClass_BaseAssignment_4_1 extends AssignmentToken  {
 	
 	public ActorClass_BaseAssignment_4_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -9092,7 +9088,7 @@ protected class ActorClass_BaseAssignment_4_1 extends AssignmentToken  {
 }
 
 
-// "{"
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ActorClass_LeftCurlyBracketKeyword_5 extends KeywordToken  {
 	
 	public ActorClass_LeftCurlyBracketKeyword_5(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -9116,7 +9112,7 @@ protected class ActorClass_LeftCurlyBracketKeyword_5 extends KeywordToken  {
 
 }
 
-// annotations+=Annotation*
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ActorClass_AnnotationsAssignment_6 extends AssignmentToken  {
 	
 	public ActorClass_AnnotationsAssignment_6(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -9163,7 +9159,7 @@ protected class ActorClass_AnnotationsAssignment_6 extends AssignmentToken  {
 	}	
 }
 
-// ("Interface" "{" ifPorts+=Port* ifSPPs+=SPPRef* "}")?
+// org.eclipse.xtext.resource.ClasspathUriResolutionException: java.lang.IllegalStateException: Couldn't find resource on classpath. URI was 'classpath:/org/eclipse/etrice/core/Room.xtext'
 protected class ActorClass_Group_7 extends GroupToken {
 	
 	public ActorClass_Group_7(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
index 3ab7cd5be..1dc4ef14c 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
@@ -994,7 +994,7 @@ ruleDataClass returns [EObject current=null]
 	    }
 
 )
-)+(
+)*(
 (
 		{ 
 	        newCompositeNode(grammarAccess.getDataClassAccess().getOperationsStandardOperationParserRuleCall_10_0()); 
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
index 17f83e6f1..917dea354 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
@@ -2030,7 +2030,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleDataClass"

-    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:828:1: ruleDataClass returns [EObject current=null] : (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )+ ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}' ) ;

+    // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:828:1: ruleDataClass returns [EObject current=null] : (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )* ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}' ) ;

     public final EObject ruleDataClass() throws RecognitionException {

         EObject current = null;

 

@@ -2060,11 +2060,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
          enterRule(); 

             

         try {

-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:831:28: ( (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )+ ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}' ) )

-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:832:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )+ ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}' )

+            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:831:28: ( (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )* ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}' ) )

+            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:832:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )* ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}' )

             {

-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:832:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )+ ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}' )

-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:832:3: otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )+ ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}'

+            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:832:1: (otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )* ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}' )

+            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:832:3: otherlv_0= 'DataClass' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= 'extends' ( ( ruleFQN ) ) )? otherlv_5= '{' ( (lv_annotations_6_0= ruleAnnotation ) )* (otherlv_7= 'usercode1' ( (lv_userCode1_8_0= ruleDetailCode ) ) )? (otherlv_9= 'usercode2' ( (lv_userCode2_10_0= ruleDetailCode ) ) )? (otherlv_11= 'usercode3' ( (lv_userCode3_12_0= ruleDetailCode ) ) )? ( (lv_attributes_13_0= ruleAttribute ) )* ( (lv_operations_14_0= ruleStandardOperation ) )* otherlv_15= '}'

             {

             otherlv_0=(Token)match(input,22,FOLLOW_22_in_ruleDataClass1682); 

 

@@ -2396,8 +2396,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
 

             }

 

-            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:979:4: ( (lv_attributes_13_0= ruleAttribute ) )+

-            int cnt19=0;

+            // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:979:4: ( (lv_attributes_13_0= ruleAttribute ) )*

             loop19:

             do {

                 int alt19=2;

@@ -2442,12 +2441,8 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             	    break;

 

             	default :

-            	    if ( cnt19 >= 1 ) break loop19;

-                        EarlyExitException eee =

-                            new EarlyExitException(19, input);

-                        throw eee;

+            	    break loop19;

                 }

-                cnt19++;

             } while (true);

 

             // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:997:3: ( (lv_operations_14_0= ruleStandardOperation ) )*

@@ -5585,12 +5580,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             if ( (LA58_0==47) ) {

                 int LA58_1 = input.LA(2);

 

-                if ( (LA58_1==37) ) {

-                    alt58=1;

-                }

-                else if ( (LA58_1==38) ) {

+                if ( (LA58_1==38) ) {

                     alt58=2;

                 }

+                else if ( (LA58_1==37) ) {

+                    alt58=1;

+                }

                 else {

                     NoViableAltException nvae =

                         new NoViableAltException("", 58, 1, input);

@@ -19174,15 +19169,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
     static final String DFA140_eotS =

         "\32\uffff";

     static final String DFA140_eofS =

-        "\13\uffff\1\21\7\uffff\2\21\3\uffff\2\21";

+        "\13\uffff\1\22\7\uffff\3\22\3\uffff\1\22";

     static final String DFA140_minS =

-        "\1\131\1\4\1\16\1\4\1\21\4\4\2\21\1\14\2\4\1\21\1\5\1\15\1\uffff"+

-        "\1\4\2\14\1\5\2\uffff\2\14";

+        "\1\131\1\4\1\16\1\4\1\21\4\4\2\21\1\14\2\4\1\21\1\4\1\5\1\15\1"+

+        "\uffff\3\14\1\5\2\uffff\1\14";

     static final String DFA140_maxS =

-        "\1\131\2\16\1\142\1\76\2\4\1\142\1\4\2\21\1\140\2\4\1\21\1\5\1"+

-        "\137\1\uffff\1\4\2\140\1\35\2\uffff\2\140";

+        "\1\131\2\16\1\142\1\76\2\4\1\142\1\4\2\21\1\140\2\4\1\21\1\4\1"+

+        "\5\1\137\1\uffff\3\140\1\35\2\uffff\1\140";

     static final String DFA140_acceptS =

-        "\21\uffff\1\2\4\uffff\1\1\1\3\2\uffff";

+        "\22\uffff\1\2\4\uffff\1\1\1\3\1\uffff";

     static final String DFA140_specialS =

         "\32\uffff}>";

     static final String[] DFA140_transitionS = {

@@ -19197,25 +19192,25 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             "\1\16",

             "\1\7",

             "\1\7",

-            "\1\20\1\21\16\uffff\1\17\41\uffff\1\22\17\uffff\1\21\4\uffff"+

-            "\7\21\6\uffff\1\21",

+            "\1\21\1\22\16\uffff\1\20\41\uffff\1\17\17\uffff\1\22\4\uffff"+

+            "\7\22\6\uffff\1\22",

             "\1\23",

             "\1\24",

             "\1\7",

             "\1\25",

-            "\1\21\115\uffff\1\21\1\26\1\uffff\1\26\1\27",

+            "\1\26",

+            "\1\22\115\uffff\1\22\1\27\1\uffff\1\27\1\30",

             "",

-            "\1\30",

-            "\1\20\1\21\16\uffff\1\17\61\uffff\1\21\4\uffff\7\21\6\uffff"+

-            "\1\21",

-            "\1\20\1\21\16\uffff\1\17\61\uffff\1\21\4\uffff\7\21\6\uffff"+

-            "\1\21",

-            "\1\25\27\uffff\1\31",

+            "\1\21\1\22\16\uffff\1\20\61\uffff\1\22\4\uffff\7\22\6\uffff"+

+            "\1\22",

+            "\1\21\1\22\16\uffff\1\20\61\uffff\1\22\4\uffff\7\22\6\uffff"+

+            "\1\22",

+            "\1\21\1\22\16\uffff\1\20\61\uffff\1\22\4\uffff\7\22\6\uffff"+

+            "\1\22",

+            "\1\26\27\uffff\1\31",

             "",

             "",

-            "\1\20\1\21\16\uffff\1\17\61\uffff\1\21\4\uffff\7\21\6\uffff"+

-            "\1\21",

-            "\1\20\1\21\100\uffff\1\21\4\uffff\7\21\6\uffff\1\21"

+            "\1\21\1\22\100\uffff\1\22\4\uffff\7\22\6\uffff\1\22"

     };

 

     static final short[] DFA140_eot = DFA.unpackEncodedString(DFA140_eotS);

@@ -19256,13 +19251,13 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
     static final String DFA141_eofS =

         "\31\uffff";

     static final String DFA141_minS =

-        "\1\131\1\4\1\16\1\4\1\21\4\4\2\21\1\14\2\4\1\21\1\4\1\5\1\134\3"+

-        "\14\1\5\2\uffff\1\14";

+        "\1\131\1\4\1\16\1\4\1\21\4\4\2\21\1\14\2\4\1\21\1\5\1\134\1\4\2"+

+        "\14\1\5\2\uffff\2\14";

     static final String DFA141_maxS =

-        "\1\131\2\16\1\142\1\76\2\4\1\142\1\4\2\21\1\76\2\4\1\21\1\4\1\5"+

-        "\1\136\3\34\1\35\2\uffff\1\14";

+        "\1\131\2\16\1\142\1\76\2\4\1\142\1\4\2\21\1\76\2\4\1\21\1\5\1\136"+

+        "\1\4\2\34\1\35\2\uffff\1\34\1\14";

     static final String DFA141_acceptS =

-        "\26\uffff\1\2\1\1\1\uffff";

+        "\25\uffff\1\1\1\2\2\uffff";

     static final String DFA141_specialS =

         "\31\uffff}>";

     static final String[] DFA141_transitionS = {

@@ -19277,20 +19272,20 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
             "\1\16",

             "\1\7",

             "\1\7",

-            "\1\21\17\uffff\1\20\41\uffff\1\17",

+            "\1\20\17\uffff\1\17\41\uffff\1\21",

             "\1\22",

             "\1\23",

             "\1\7",

             "\1\24",

-            "\1\25",

-            "\1\27\1\uffff\1\26",

-            "\1\21\17\uffff\1\20",

-            "\1\21\17\uffff\1\20",

-            "\1\21\17\uffff\1\20",

-            "\1\25\27\uffff\1\30",

+            "\1\25\1\uffff\1\26",

+            "\1\27",

+            "\1\20\17\uffff\1\17",

+            "\1\20\17\uffff\1\17",

+            "\1\24\27\uffff\1\30",

             "",

             "",

-            "\1\21"

+            "\1\20\17\uffff\1\17",

+            "\1\20"

     };

 

     static final short[] DFA141_eot = DFA.unpackEncodedString(DFA141_eotS);

@@ -19398,15 +19393,15 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
     public static final BitSet FOLLOW_ruleDocumentation_in_ruleDataClass1725 = new BitSet(new long[]{0x0000000000801000L});

     public static final BitSet FOLLOW_23_in_ruleDataClass1739 = new BitSet(new long[]{0x0000000000000010L});

     public static final BitSet FOLLOW_ruleFQN_in_ruleDataClass1762 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_12_in_ruleDataClass1776 = new BitSet(new long[]{0x000000000F000000L,0x0000004000000000L});

-    public static final BitSet FOLLOW_ruleAnnotation_in_ruleDataClass1797 = new BitSet(new long[]{0x000000000F000000L,0x0000004000000000L});

+    public static final BitSet FOLLOW_12_in_ruleDataClass1776 = new BitSet(new long[]{0x000000008F002000L,0x0000004000000000L});

+    public static final BitSet FOLLOW_ruleAnnotation_in_ruleDataClass1797 = new BitSet(new long[]{0x000000008F002000L,0x0000004000000000L});

     public static final BitSet FOLLOW_24_in_ruleDataClass1811 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass1832 = new BitSet(new long[]{0x000000000F000000L,0x0000004000000000L});

+    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass1832 = new BitSet(new long[]{0x000000008E002000L});

     public static final BitSet FOLLOW_25_in_ruleDataClass1847 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass1868 = new BitSet(new long[]{0x000000000F000000L,0x0000004000000000L});

+    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass1868 = new BitSet(new long[]{0x000000008C002000L});

     public static final BitSet FOLLOW_26_in_ruleDataClass1883 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass1904 = new BitSet(new long[]{0x000000000F000000L,0x0000004000000000L});

-    public static final BitSet FOLLOW_ruleAttribute_in_ruleDataClass1927 = new BitSet(new long[]{0x000000008F002000L,0x0000004000000000L});

+    public static final BitSet FOLLOW_ruleDetailCode_in_ruleDataClass1904 = new BitSet(new long[]{0x0000000088002000L});

+    public static final BitSet FOLLOW_ruleAttribute_in_ruleDataClass1927 = new BitSet(new long[]{0x0000000088002000L});

     public static final BitSet FOLLOW_ruleStandardOperation_in_ruleDataClass1949 = new BitSet(new long[]{0x0000000080002000L});

     public static final BitSet FOLLOW_13_in_ruleDataClass1962 = new BitSet(new long[]{0x0000000000000002L});

     public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1998 = new BitSet(new long[]{0x0000000000000000L});

@@ -19514,12 +19509,12 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
     public static final BitSet FOLLOW_ruleDocumentation_in_ruleMessage4099 = new BitSet(new long[]{0x0000000000000002L});

     public static final BitSet FOLLOW_rulePortClass_in_entryRulePortClass4136 = new BitSet(new long[]{0x0000000000000000L});

     public static final BitSet FOLLOW_EOF_in_entryRulePortClass4146 = new BitSet(new long[]{0x0000000000000002L});

-    public static final BitSet FOLLOW_12_in_rulePortClass4183 = new BitSet(new long[]{0x0000C0008F000000L,0x0000004000000000L});

+    public static final BitSet FOLLOW_12_in_rulePortClass4183 = new BitSet(new long[]{0x0000C00088000000L});

     public static final BitSet FOLLOW_46_in_rulePortClass4196 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_ruleDetailCode_in_rulePortClass4217 = new BitSet(new long[]{0x0000C0008F000000L,0x0000004000000000L});

-    public static final BitSet FOLLOW_ruleAttribute_in_rulePortClass4241 = new BitSet(new long[]{0x0000C0008F002000L,0x0000004000000000L});

-    public static final BitSet FOLLOW_rulePortOperation_in_rulePortClass4268 = new BitSet(new long[]{0x0000C0008F002000L,0x0000004000000000L});

-    public static final BitSet FOLLOW_ruleMessageHandler_in_rulePortClass4295 = new BitSet(new long[]{0x0000C0008F002000L,0x0000004000000000L});

+    public static final BitSet FOLLOW_ruleDetailCode_in_rulePortClass4217 = new BitSet(new long[]{0x0000C00088000000L});

+    public static final BitSet FOLLOW_ruleAttribute_in_rulePortClass4241 = new BitSet(new long[]{0x0000C00088002000L});

+    public static final BitSet FOLLOW_rulePortOperation_in_rulePortClass4268 = new BitSet(new long[]{0x0000C00088002000L});

+    public static final BitSet FOLLOW_ruleMessageHandler_in_rulePortClass4295 = new BitSet(new long[]{0x0000C00088002000L});

     public static final BitSet FOLLOW_13_in_rulePortClass4309 = new BitSet(new long[]{0x0000000000000002L});

     public static final BitSet FOLLOW_ruleMessageHandler_in_entryRuleMessageHandler4345 = new BitSet(new long[]{0x0000000000000000L});

     public static final BitSet FOLLOW_EOF_in_entryRuleMessageHandler4355 = new BitSet(new long[]{0x0000000000000002L});

@@ -19589,18 +19584,18 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
     public static final BitSet FOLLOW_13_in_ruleActorClass5912 = new BitSet(new long[]{0x00C0000000002000L});

     public static final BitSet FOLLOW_54_in_ruleActorClass5927 = new BitSet(new long[]{0x0000000010001000L});

     public static final BitSet FOLLOW_ruleDocumentation_in_ruleActorClass5948 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_12_in_ruleActorClass5961 = new BitSet(new long[]{0x2F0000000F002000L,0x0000004000001220L});

+    public static final BitSet FOLLOW_12_in_ruleActorClass5961 = new BitSet(new long[]{0x2F0000000F002000L,0x0000000000001220L});

     public static final BitSet FOLLOW_24_in_ruleActorClass5974 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass5995 = new BitSet(new long[]{0x2F0000000F002000L,0x0000004000001220L});

+    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass5995 = new BitSet(new long[]{0x2F0000000E002000L,0x0000000000001220L});

     public static final BitSet FOLLOW_25_in_ruleActorClass6010 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6031 = new BitSet(new long[]{0x2F0000000F002000L,0x0000004000001220L});

+    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6031 = new BitSet(new long[]{0x2F0000000C002000L,0x0000000000001220L});

     public static final BitSet FOLLOW_26_in_ruleActorClass6046 = new BitSet(new long[]{0x0000000000001000L});

-    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6067 = new BitSet(new long[]{0x2F0000000F002000L,0x0000004000001220L});

-    public static final BitSet FOLLOW_rulePort_in_ruleActorClass6091 = new BitSet(new long[]{0x2F0000000F002000L,0x0000004000001220L});

-    public static final BitSet FOLLOW_ruleExternalPort_in_ruleActorClass6118 = new BitSet(new long[]{0x2F0000000F002000L,0x0000004000001220L});

-    public static final BitSet FOLLOW_ruleServiceImplementation_in_ruleActorClass6141 = new BitSet(new long[]{0x280000000F002000L,0x0000004000001220L});

-    public static final BitSet FOLLOW_ruleSAPRef_in_ruleActorClass6163 = new BitSet(new long[]{0x080000000F002000L,0x0000004000001220L});

-    public static final BitSet FOLLOW_ruleAttribute_in_ruleActorClass6185 = new BitSet(new long[]{0x000000000F002000L,0x0000004000001220L});

+    public static final BitSet FOLLOW_ruleDetailCode_in_ruleActorClass6067 = new BitSet(new long[]{0x2F00000008002000L,0x0000000000001220L});

+    public static final BitSet FOLLOW_rulePort_in_ruleActorClass6091 = new BitSet(new long[]{0x2F00000008002000L,0x0000000000001220L});

+    public static final BitSet FOLLOW_ruleExternalPort_in_ruleActorClass6118 = new BitSet(new long[]{0x2F00000008002000L,0x0000000000001220L});

+    public static final BitSet FOLLOW_ruleServiceImplementation_in_ruleActorClass6141 = new BitSet(new long[]{0x2800000008002000L,0x0000000000001220L});

+    public static final BitSet FOLLOW_ruleSAPRef_in_ruleActorClass6163 = new BitSet(new long[]{0x0800000008002000L,0x0000000000001220L});

+    public static final BitSet FOLLOW_ruleAttribute_in_ruleActorClass6185 = new BitSet(new long[]{0x0000000008002000L,0x0000000000001220L});

     public static final BitSet FOLLOW_ruleActorRef_in_ruleActorClass6207 = new BitSet(new long[]{0x0000000000002000L,0x0000000000001220L});

     public static final BitSet FOLLOW_ruleBinding_in_ruleActorClass6229 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000220L});

     public static final BitSet FOLLOW_ruleLayerConnection_in_ruleActorClass6251 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000200L});

diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
index ca406bdeb..dd450b980 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
@@ -513,14 +513,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//
 		//	"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1"
 		//
-		//	userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+
+		//	userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute*
 		//
 		//	operations+=StandardOperation* "}";
 		public ParserRule getRule() { return rule; }
 
 		//"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1"
 		//
-		//userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+
+		//userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute*
 		//
 		//operations+=StandardOperation* "}"
 		public Group getGroup() { return cGroup; }
@@ -600,7 +600,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 		//DetailCode
 		public RuleCall getUserCode3DetailCodeParserRuleCall_8_1_0() { return cUserCode3DetailCodeParserRuleCall_8_1_0; }
 
-		//attributes+=Attribute+
+		//attributes+=Attribute*
 		public Assignment getAttributesAssignment_9() { return cAttributesAssignment_9; }
 
 		//Attribute
@@ -5372,7 +5372,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
 	//
 	//	"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1"
 	//
-	//	userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+
+	//	userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute*
 	//
 	//	operations+=StandardOperation* "}";
 	public DataClassElements getDataClassAccess() {