Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2019-04-02 07:30:08 -0400
committerJan Belle2019-04-02 10:11:28 -0400
commitd941d5a98db578e4bff2c284b06a498f1aab1c23 (patch)
tree80f8256a3c51dab667a1a8a62d4fae68fd9b6400 /plugins
parentaf478656675a88011db86ea5a8bfd645e6c63d00 (diff)
downloadorg.eclipse.etrice-d941d5a98db578e4bff2c284b06a498f1aab1c23.tar.gz
org.eclipse.etrice-d941d5a98db578e4bff2c284b06a498f1aab1c23.tar.xz
org.eclipse.etrice-d941d5a98db578e4bff2c284b06a498f1aab1c23.zip
[releng] Migrate to new ci infrastructure
* promote artifacts via scp * increase xtext version to 2.15 Bug 545353 Change-Id: If8f0ab65f52970833861267792ab3b15e8fa07af
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java2
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java10
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java18
3 files changed, 18 insertions, 12 deletions
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
index fc1519aed..56b6bd295 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
@@ -82,7 +82,7 @@ public class ConfigSyntacticSequencer extends AbstractSyntacticSequencer {
/**
* Ambiguous syntax:
- * 'conjugated' | 'conjugate'
+ * 'conjugate' | 'conjugated'
*
* This ambiguous syntax occurs at:
* conjugated=PortClassConfig (ambiguity) conjugated=PortClassConfig
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
index 4b546beb6..ae7f2142a 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
@@ -374,24 +374,24 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
* docu=Documentation?
* base=[ActorClass|FQN]?
* annotations+=Annotation*
- * serviceProvisionPoints+=SPP?
- * (interfacePorts+=Port? serviceProvisionPoints+=SPP?)*
+ * interfacePorts+=Port?
+ * (serviceProvisionPoints+=SPP? interfacePorts+=Port?)*
* structureDocu=Documentation?
* userCode1=DetailCode?
* userCode2=DetailCode?
* userCode3=DetailCode?
- * attributes+=Attribute?
+ * connections+=LayerConnection?
* (
* (
- * connections+=LayerConnection |
* bindings+=Binding |
* serviceImplementations+=ServiceImplementation |
+ * attributes+=Attribute |
* actorRefs+=ActorRef |
* serviceAccessPoints+=SAP |
* internalPorts+=Port |
* externalPorts+=ExternalPort
* )?
- * attributes+=Attribute?
+ * connections+=LayerConnection?
* )*
* behaviorDocu=Documentation?
* behaviorAnnotations+=Annotation*
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 730e723fd..434eae9bc 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
@@ -1777,7 +1777,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ModelComponent");
private final RuleCall cActorClassParserRuleCall = (RuleCall)rule.eContents().get(1);
- //@ Override ModelComponent:
+ //@Override
+ //ModelComponent:
// ActorClass;
@Override public ParserRule getRule() { return rule; }
@@ -3194,7 +3195,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.AbstractInterfaceItem");
private final RuleCall cInterfaceItemParserRuleCall = (RuleCall)rule.eContents().get(1);
- //@ Override AbstractInterfaceItem:
+ //@Override
+ //AbstractInterfaceItem:
// InterfaceItem;
@Override public ParserRule getRule() { return rule; }
@@ -3254,7 +3256,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cTransitionKeyword_10 = (Keyword)cAlternatives.eContents().get(10);
private final Keyword cRoomModelKeyword_11 = (Keyword)cAlternatives.eContents().get(11);
- //@ Override AnnotationTargetType:
+ //@Override
+ //AnnotationTargetType:
// 'DataClass' |
// 'ActorClass' |
// 'ActorBehavior' |
@@ -3998,7 +4001,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
return getOutMessageHandlerAccess().getRule();
}
- //@ Override ModelComponent:
+ //@Override
+ //ModelComponent:
// ActorClass;
public ModelComponentElements getModelComponentAccess() {
return pModelComponent;
@@ -4279,7 +4283,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
return getReferenceTypeAccess().getRule();
}
- //@ Override AbstractInterfaceItem:
+ //@Override
+ //AbstractInterfaceItem:
// InterfaceItem;
public AbstractInterfaceItemElements getAbstractInterfaceItemAccess() {
return pAbstractInterfaceItem;
@@ -4303,7 +4308,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
return getMULTIPLICITYAccess().getRule();
}
- //@ Override AnnotationTargetType:
+ //@Override
+ //AnnotationTargetType:
// 'DataClass' |
// 'ActorClass' |
// 'ActorBehavior' |

Back to the top