added support for annotations

research-iobserve · Feb 28, 2015 · ca65f97d5d3baaa4a61829c9a3c5879e5f4eaac5 · ca65f97
1 parent 335245e
commit ca65f97d5d3baaa4a61829c9a3c5879e5f4eaac5
diff --git a/...ui/src-gen/org/spp/cocome/behavior/ui/contentassist/AbstractBehaviorProposalProvider.java b/...ui/src-gen/org/spp/cocome/behavior/ui/contentassist/AbstractBehaviorProposalProvider.java
@@ -34,6 +34,9 @@ public void completeRepositoryReference_Reference(EObject model, Assignment assi
 	public void completeImport_ImportedNamespace(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
+  
+	public void completeComponentImpl_Kind(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+  
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+  
+	}
 	public void completeComponentImpl_RefComponent(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
 	}
@@ -224,6 +227,9 @@ public void complete_Import(EObject model, RuleCall ruleCall, ContentAssistConte
 	public void complete_ComponentImpl(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+  
+	public void complete_ComponentKind(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+  
+		// subclasses may override
+  
+	}
 	public void complete_VariableDecl(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}

diff --git a/...me.behavior.ui/src-gen/org/spp/cocome/behavior/ui/contentassist/antlr/BehaviorParser.java b/...me.behavior.ui/src-gen/org/spp/cocome/behavior/ui/contentassist/antlr/BehaviorParser.java
@@ -38,7 +38,7 @@ protected String getRuleName(AbstractElement element) {
 				private static final long serialVersionUID = 1L;
 				{
 					put(grammarAccess.getBehaviorModelAccess().getAlternatives_2(), "rule__BehaviorModel__Alternatives_2");
-  
-					put(grammarAccess.getComponentImplAccess().getLocalDeclarationsAlternatives_3_0(), "rule__ComponentImpl__LocalDeclarationsAlternatives_3_0");
+  
+					put(grammarAccess.getComponentImplAccess().getLocalDeclarationsAlternatives_4_0(), "rule__ComponentImpl__LocalDeclarationsAlternatives_4_0");
 					put(grammarAccess.getVariableDeclAccess().getModifierAlternatives_0_0(), "rule__VariableDecl__ModifierAlternatives_0_0");
 					put(grammarAccess.getStatementAccess().getAlternatives(), "rule__Statement__Alternatives");
 					put(grammarAccess.getRelationalExpressionAccess().getFeatureAlternatives_1_0_0_1_0(), "rule__RelationalExpression__FeatureAlternatives_1_0_0_1_0");
@@ -52,6 +52,7 @@ protected String getRuleName(AbstractElement element) {
 					put(grammarAccess.getBOOLEANAccess().getAlternatives(), "rule__BOOLEAN__Alternatives");
 					put(grammarAccess.getNUMBERAccess().getAlternatives(), "rule__NUMBER__Alternatives");
 					put(grammarAccess.getNUMBERAccess().getAlternatives_0_0(), "rule__NUMBER__Alternatives_0_0");
+  
+					put(grammarAccess.getComponentKindAccess().getAlternatives(), "rule__ComponentKind__Alternatives");
 					put(grammarAccess.getBehaviorModelAccess().getGroup(), "rule__BehaviorModel__Group__0");
 					put(grammarAccess.getRepositoryReferenceAccess().getGroup(), "rule__RepositoryReference__Group__0");
 					put(grammarAccess.getImportAccess().getGroup(), "rule__Import__Group__0");
@@ -119,9 +120,10 @@ protected String getRuleName(AbstractElement element) {
 					put(grammarAccess.getBehaviorModelAccess().getComponentImplAssignment_3(), "rule__BehaviorModel__ComponentImplAssignment_3");
 					put(grammarAccess.getRepositoryReferenceAccess().getReferenceAssignment_1(), "rule__RepositoryReference__ReferenceAssignment_1");
 					put(grammarAccess.getImportAccess().getImportedNamespaceAssignment_1(), "rule__Import__ImportedNamespaceAssignment_1");
-  
-					put(grammarAccess.getComponentImplAccess().getRefComponentAssignment_1(), "rule__ComponentImpl__RefComponentAssignment_1");
-  
-					put(grammarAccess.getComponentImplAccess().getLocalDeclarationsAssignment_3(), "rule__ComponentImpl__LocalDeclarationsAssignment_3");
-  
-					put(grammarAccess.getComponentImplAccess().getInterfacesAssignment_4(), "rule__ComponentImpl__InterfacesAssignment_4");
+  
+					put(grammarAccess.getComponentImplAccess().getKindAssignment_1(), "rule__ComponentImpl__KindAssignment_1");
+  
+					put(grammarAccess.getComponentImplAccess().getRefComponentAssignment_2(), "rule__ComponentImpl__RefComponentAssignment_2");
+  
+					put(grammarAccess.getComponentImplAccess().getLocalDeclarationsAssignment_4(), "rule__ComponentImpl__LocalDeclarationsAssignment_4");
+  
+					put(grammarAccess.getComponentImplAccess().getInterfacesAssignment_5(), "rule__ComponentImpl__InterfacesAssignment_5");
 					put(grammarAccess.getVariableDeclAccess().getModifierAssignment_0(), "rule__VariableDecl__ModifierAssignment_0");
 					put(grammarAccess.getVariableDeclAccess().getTypeAssignment_1(), "rule__VariableDecl__TypeAssignment_1");
 					put(grammarAccess.getVariableDeclAccess().getNameAssignment_2(), "rule__VariableDecl__NameAssignment_2");

diff --git a/...ior.ui/src-gen/org/spp/cocome/behavior/ui/contentassist/antlr/internal/InternalBehavior.g b/...ior.ui/src-gen/org/spp/cocome/behavior/ui/contentassist/antlr/internal/InternalBehavior.g
@@ -1150,6 +1150,25 @@ finally {
+  
+// Rule ComponentKind
+  
+ruleComponentKind
+  
+    @init {
+  
+		int stackSize = keepStackSize();
+  
+    }
+  
+:
+  
+(
+  
+{ before(grammarAccess.getComponentKindAccess().getAlternatives()); }
+  
+(rule__ComponentKind__Alternatives)
+  
+{ after(grammarAccess.getComponentKindAccess().getAlternatives()); }
+  
+)
+  
+
+  
+;
+  
+finally {
+  
+	restoreStackSize(stackSize);
+  
+}
+  
+
+  
+
+  
+
 rule__BehaviorModel__Alternatives_2
    @init {
 		int stackSize = keepStackSize();
@@ -1172,21 +1191,21 @@ finally {
 	restoreStackSize(stackSize);
 }
-  
-rule__ComponentImpl__LocalDeclarationsAlternatives_3_0
+  
+rule__ComponentImpl__LocalDeclarationsAlternatives_4_0
    @init {
 		int stackSize = keepStackSize();
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getLocalDeclarationsVariableDeclParserRuleCall_3_0_0()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getLocalDeclarationsVariableDeclParserRuleCall_4_0_0()); }
 	ruleVariableDecl
-  
-{ after(grammarAccess.getComponentImplAccess().getLocalDeclarationsVariableDeclParserRuleCall_3_0_0()); }
+  
+{ after(grammarAccess.getComponentImplAccess().getLocalDeclarationsVariableDeclParserRuleCall_4_0_0()); }
 )
    |(
-  
-{ before(grammarAccess.getComponentImplAccess().getLocalDeclarationsConstantDeclParserRuleCall_3_0_1()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getLocalDeclarationsConstantDeclParserRuleCall_4_0_1()); }
 	ruleConstantDecl
-  
-{ after(grammarAccess.getComponentImplAccess().getLocalDeclarationsConstantDeclParserRuleCall_3_0_1()); }
+  
+{ after(grammarAccess.getComponentImplAccess().getLocalDeclarationsConstantDeclParserRuleCall_4_0_1()); }
 )
 ;
@@ -1586,6 +1605,37 @@ finally {
 	restoreStackSize(stackSize);
 }
+  
+rule__ComponentKind__Alternatives
+  
+    @init {
+  
+		int stackSize = keepStackSize();
+  
+    }
+  
+:
+  
+(
+  
+{ before(grammarAccess.getComponentKindAccess().getSTATELESSEnumLiteralDeclaration_0()); }
+  
+(	'stateless' 
+  
+)
+  
+{ after(grammarAccess.getComponentKindAccess().getSTATELESSEnumLiteralDeclaration_0()); }
+  
+)
+  
+
+  
+    |(
+  
+{ before(grammarAccess.getComponentKindAccess().getSTATEFULEnumLiteralDeclaration_1()); }
+  
+(	'stateful' 
+  
+)
+  
+{ after(grammarAccess.getComponentKindAccess().getSTATEFULEnumLiteralDeclaration_1()); }
+  
+)
+  
+
+  
+    |(
+  
+{ before(grammarAccess.getComponentKindAccess().getSINGLETONEnumLiteralDeclaration_2()); }
+  
+(	'singleton' 
+  
+)
+  
+{ after(grammarAccess.getComponentKindAccess().getSINGLETONEnumLiteralDeclaration_2()); }
+  
+)
+  
+
+  
+;
+  
+finally {
+  
+	restoreStackSize(stackSize);
+  
+}
+  
+
 rule__BehaviorModel__Group__0
@@ -1888,9 +1938,9 @@ rule__ComponentImpl__Group__1__Impl
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getRefComponentAssignment_1()); }
-  
-(rule__ComponentImpl__RefComponentAssignment_1)
-  
-{ after(grammarAccess.getComponentImplAccess().getRefComponentAssignment_1()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getKindAssignment_1()); }
+  
+(rule__ComponentImpl__KindAssignment_1)?
+  
+{ after(grammarAccess.getComponentImplAccess().getKindAssignment_1()); }
 )
 ;
@@ -1917,11 +1967,9 @@ rule__ComponentImpl__Group__2__Impl
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getLeftCurlyBracketKeyword_2()); }
-  
-
-  
-	'{' 
-  
-
-  
-{ after(grammarAccess.getComponentImplAccess().getLeftCurlyBracketKeyword_2()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getRefComponentAssignment_2()); }
+  
+(rule__ComponentImpl__RefComponentAssignment_2)
+  
+{ after(grammarAccess.getComponentImplAccess().getRefComponentAssignment_2()); }
 )
 ;
@@ -1948,9 +1996,11 @@ rule__ComponentImpl__Group__3__Impl
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getLocalDeclarationsAssignment_3()); }
-  
-(rule__ComponentImpl__LocalDeclarationsAssignment_3)*
-  
-{ after(grammarAccess.getComponentImplAccess().getLocalDeclarationsAssignment_3()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getLeftCurlyBracketKeyword_3()); }
+  
+
+  
+	'{' 
+  
+
+  
+{ after(grammarAccess.getComponentImplAccess().getLeftCurlyBracketKeyword_3()); }
 )
 ;
@@ -1977,9 +2027,9 @@ rule__ComponentImpl__Group__4__Impl
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getInterfacesAssignment_4()); }
-  
-(rule__ComponentImpl__InterfacesAssignment_4)*
-  
-{ after(grammarAccess.getComponentImplAccess().getInterfacesAssignment_4()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getLocalDeclarationsAssignment_4()); }
+  
+(rule__ComponentImpl__LocalDeclarationsAssignment_4)*
+  
+{ after(grammarAccess.getComponentImplAccess().getLocalDeclarationsAssignment_4()); }
 )
 ;
@@ -1994,6 +2044,7 @@ rule__ComponentImpl__Group__5
    }
 :
 	rule__ComponentImpl__Group__5__Impl
+  
+	rule__ComponentImpl__Group__6
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -2005,11 +2056,39 @@ rule__ComponentImpl__Group__5__Impl
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getRightCurlyBracketKeyword_5()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getInterfacesAssignment_5()); }
+  
+(rule__ComponentImpl__InterfacesAssignment_5)*
+  
+{ after(grammarAccess.getComponentImplAccess().getInterfacesAssignment_5()); }
+  
+)
+  
+
+  
+;
+  
+finally {
+  
+	restoreStackSize(stackSize);
+  
+}
+  
+
+  
+
+  
+rule__ComponentImpl__Group__6
+  
+    @init {
+  
+		int stackSize = keepStackSize();
+  
+    }
+  
+:
+  
+	rule__ComponentImpl__Group__6__Impl
+  
+;
+  
+finally {
+  
+	restoreStackSize(stackSize);
+  
+}
+  
+
+  
+rule__ComponentImpl__Group__6__Impl
+  
+    @init {
+  
+		int stackSize = keepStackSize();
+  
+    }
+  
+:
+  
+(
+  
+{ before(grammarAccess.getComponentImplAccess().getRightCurlyBracketKeyword_6()); }
 	'}' 
-  
-{ after(grammarAccess.getComponentImplAccess().getRightCurlyBracketKeyword_5()); }
+  
+{ after(grammarAccess.getComponentImplAccess().getRightCurlyBracketKeyword_6()); }
 )
 ;
@@ -2030,6 +2109,8 @@ finally {
+  
+
+  
+
 rule__VariableDecl__Group__0
    @init {
 		int stackSize = keepStackSize();
@@ -6333,49 +6414,64 @@ finally {
 	restoreStackSize(stackSize);
 }
-  
-rule__ComponentImpl__RefComponentAssignment_1
+  
+rule__ComponentImpl__KindAssignment_1
+  
+    @init {
+  
+		int stackSize = keepStackSize();
+  
+    }
+  
+:
+  
+(
+  
+{ before(grammarAccess.getComponentImplAccess().getKindComponentKindEnumRuleCall_1_0()); }
+  
+	ruleComponentKind{ after(grammarAccess.getComponentImplAccess().getKindComponentKindEnumRuleCall_1_0()); }
+  
+)
+  
+
+  
+;
+  
+finally {
+  
+	restoreStackSize(stackSize);
+  
+}
+  
+
+  
+rule__ComponentImpl__RefComponentAssignment_2
    @init {
 		int stackSize = keepStackSize();
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getRefComponentComponentCrossReference_1_0()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getRefComponentComponentCrossReference_2_0()); }
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getRefComponentComponentQualifiedNameParserRuleCall_1_0_1()); }
-  
-	ruleQualifiedName{ after(grammarAccess.getComponentImplAccess().getRefComponentComponentQualifiedNameParserRuleCall_1_0_1()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getRefComponentComponentQualifiedNameParserRuleCall_2_0_1()); }
+  
+	ruleQualifiedName{ after(grammarAccess.getComponentImplAccess().getRefComponentComponentQualifiedNameParserRuleCall_2_0_1()); }
 )
-  
-{ after(grammarAccess.getComponentImplAccess().getRefComponentComponentCrossReference_1_0()); }
+  
+{ after(grammarAccess.getComponentImplAccess().getRefComponentComponentCrossReference_2_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
-  
-rule__ComponentImpl__LocalDeclarationsAssignment_3
+  
+rule__ComponentImpl__LocalDeclarationsAssignment_4
    @init {
 		int stackSize = keepStackSize();
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getLocalDeclarationsAlternatives_3_0()); }
-  
-(rule__ComponentImpl__LocalDeclarationsAlternatives_3_0)
-  
-{ after(grammarAccess.getComponentImplAccess().getLocalDeclarationsAlternatives_3_0()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getLocalDeclarationsAlternatives_4_0()); }
+  
+(rule__ComponentImpl__LocalDeclarationsAlternatives_4_0)
+  
+{ after(grammarAccess.getComponentImplAccess().getLocalDeclarationsAlternatives_4_0()); }
 )
 ;
 finally {
 	restoreStackSize(stackSize);
 }
-  
-rule__ComponentImpl__InterfacesAssignment_4
+  
+rule__ComponentImpl__InterfacesAssignment_5
    @init {
 		int stackSize = keepStackSize();
    }
 :
 (
-  
-{ before(grammarAccess.getComponentImplAccess().getInterfacesInterfaceRealizationParserRuleCall_4_0()); }
-  
-	ruleInterfaceRealization{ after(grammarAccess.getComponentImplAccess().getInterfacesInterfaceRealizationParserRuleCall_4_0()); }
+  
+{ before(grammarAccess.getComponentImplAccess().getInterfacesInterfaceRealizationParserRuleCall_5_0()); }
+  
+	ruleInterfaceRealization{ after(grammarAccess.getComponentImplAccess().getInterfacesInterfaceRealizationParserRuleCall_5_0()); }
 )
 ;