Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2015-08-17 07:49:33 -0400
committerJuergen Haug2015-08-17 07:49:33 -0400
commit27b02924bc1fed8258b7f6f357a29ee39288f7b4 (patch)
treec3b740c7ea0a884f337980a7c4958605c836dcf0
parent0cb48be142ff9b13f146d2a4bf89cf914ea367b1 (diff)
downloadorg.eclipse.etrice-27b02924bc1fed8258b7f6f357a29ee39288f7b4.tar.gz
org.eclipse.etrice-27b02924bc1fed8258b7f6f357a29ee39288f7b4.tar.xz
org.eclipse.etrice-27b02924bc1fed8258b7f6f357a29ee39288f7b4.zip
removed xbase fragment from etmap,etphys and config
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen4
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java2
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g2
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.tokens182
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java42
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java4
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore28
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel2
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbinbin9094 -> 8946 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g2
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.tokens182
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java42
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java96
-rw-r--r--plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe22
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen4
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java2
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g2
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.tokens104
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java42
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java4
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore14
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel2
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xtextbinbin6594 -> 6446 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g2
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.tokens104
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java42
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java26
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe22
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen4
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g2
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens182
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java42
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore10
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel2
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbinbin7630 -> 7482 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g2
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.tokens182
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java42
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java51
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe22
-rw-r--r--plugins/org.eclipse.etrice.core.room/.antlr-generator-3.2.0-patch.jarbin0 -> 1484649 bytes
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/.gitignore8
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java303
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/InternalLogData.java67
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/Log.java217
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java378
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java417
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpControl.java57
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpPayload.java74
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/PTcpControl.java202
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/PTcpPayload.java183
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java281
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/PTimer.java366
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/TimerData.java56
56 files changed, 711 insertions, 3365 deletions
diff --git a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen
index fd680f42d..8800ad445 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen
@@ -250,7 +250,9 @@
<extension
point="org.eclipse.xtext.builder.participant">
<participant
- class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+ fileExtensions="config"
+ >
</participant>
</extension>
<extension
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
index c27802ca5..9d960bb66 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
@@ -60,7 +60,7 @@ public abstract class AbstractConfigUiModule extends DefaultUiModule {
// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
- binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
+ binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
}
// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g
index a1cdcba95..70c3887bc 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g
@@ -8548,7 +8548,7 @@ RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.tokens b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.tokens
index 1121d2279..2d0ca01ca 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.tokens
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.tokens
@@ -1,51 +1,79 @@
-RULE_EXP=7
-RULE_ID=4
-T__29=29
-T__28=28
-T__27=27
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
+'+'=19
+','=45
+'-'=20
+'.'=46
+'.*'=51
+'/'=29
+':'=47
+'='=42
+'ActorClassConfig'=35
+'ActorInstanceConfig'=36
+'Attr'=41
+'ConfigModel'=25
+'InterfaceItem'=40
+'Port'=39
+'ProtocolClassConfig'=37
+'SubSystemConfig'=28
+'['=52
+']'=53
+'attribute'=48
+'conjugate'=13
+'conjugated'=14
+'dynamic configuration'=30
+'false'=18
+'file path'=31
+'from'=50
+'import'=49
+'mandatory'=16
+'max'=44
+'min'=43
+'model'=17
+'ms'=55
+'ns'=57
+'optional'=59
+'polling interval'=34
+'ptBoolean'=21
+'ptCharacter'=24
+'ptInteger'=22
+'ptReal'=23
+'read'=58
+'regular'=38
+'s'=54
+'true'=60
+'us'=56
+'user constructor'=33
+'user import'=32
+'write'=15
+'{'=26
+'}'=27
RULE_ANY_OTHER=12
-T__21=21
-T__20=20
-T__60=60
-T__55=55
-T__56=56
-T__19=19
-T__57=57
+RULE_EXP=7
RULE_HEX=5
-T__58=58
-T__16=16
-T__51=51
-T__52=52
-T__15=15
-T__53=53
-T__18=18
-T__54=54
-T__17=17
-T__14=14
-T__13=13
-T__59=59
+RULE_ID=4
RULE_INT=6
-T__50=50
-T__42=42
-T__43=43
-T__40=40
-T__41=41
-T__46=46
-T__47=47
-T__44=44
-T__45=45
-T__48=48
-T__49=49
-RULE_SL_COMMENT=10
RULE_ML_COMMENT=9
+RULE_SL_COMMENT=10
+RULE_STRING=8
+RULE_WS=11
+T__13=13
+T__14=14
+T__15=15
+T__16=16
+T__17=17
+T__18=18
+T__19=19
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
T__30=30
T__31=31
-RULE_STRING=8
T__32=32
T__33=33
T__34=34
@@ -54,52 +82,24 @@ T__36=36
T__37=37
T__38=38
T__39=39
-RULE_WS=11
-'ns'=57
-'Attr'=41
-'ms'=55
-'/'=29
-'model'=17
-'user import'=32
-'user constructor'=33
-'.*'=51
-'conjugate'=13
-'polling interval'=34
-'='=42
-'Port'=39
-'InterfaceItem'=40
-'+'=19
-'ConfigModel'=25
-'.'=46
-'ProtocolClassConfig'=37
-'regular'=38
-'max'=44
-'import'=49
-'true'=60
-'}'=27
-'us'=56
-'SubSystemConfig'=28
-'ActorClassConfig'=35
-'{'=26
-'dynamic configuration'=30
-'optional'=59
-'write'=15
-'ptCharacter'=24
-'ActorInstanceConfig'=36
-'false'=18
-'s'=54
-':'=47
-'['=52
-'attribute'=48
-'-'=20
-'min'=43
-'conjugated'=14
-','=45
-'ptReal'=23
-'ptBoolean'=21
-'read'=58
-']'=53
-'ptInteger'=22
-'mandatory'=16
-'file path'=31
-'from'=50
+T__40=40
+T__41=41
+T__42=42
+T__43=43
+T__44=44
+T__45=45
+T__46=46
+T__47=47
+T__48=48
+T__49=49
+T__50=50
+T__51=51
+T__52=52
+T__53=53
+T__54=54
+T__55=55
+T__56=56
+T__57=57
+T__58=58
+T__59=59
+T__60=60
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java
index 9a7791819..73bf48788 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfigLexer.java
@@ -1400,10 +1400,10 @@ public class InternalConfigLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1421,10 +1421,10 @@ public class InternalConfigLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop8:
do {
int alt8=3;
@@ -1440,23 +1440,15 @@ public class InternalConfigLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:21: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:66: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -1481,10 +1473,10 @@ public class InternalConfigLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop9:
do {
int alt9=3;
@@ -1500,23 +1492,15 @@ public class InternalConfigLexer extends Lexer {
switch (alt9) {
case 1 :
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:54: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:137: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalConfig.g:8551:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java
index 61110b1ad..0e727c363 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/AbstractConfigRuntimeModule.java
@@ -145,8 +145,8 @@ public abstract class AbstractConfigRuntimeModule extends DefaultRuntimeModule {
}
// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
- public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
- binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+ public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
}
// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore
index 00138255a..ecf70e1f1 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.ecore
@@ -31,7 +31,7 @@
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
- eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import"
+ eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is a list of all imported room models. The config elements reference these imports.&#xD;&#xA;"/>
@@ -53,12 +53,12 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This class defines settings with a sub system scope.&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="root" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalSystem">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="root" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalSystem">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the logical system that contains the {@link org.eclipse.etrice.core.room.SubSystemRef sub system reference}.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="subSystem" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemRef">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subSystem" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemRef">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the sub system reference.&#xD;&#xA;"/>
</eAnnotations>
@@ -99,7 +99,7 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This class models a configuration for an {@link org.eclipse.etrice.core.room.ActorClass actor class}.&#xD;&#xA;The configuration defines the default values for all instances of the {@link #getActor actor}.&#xD;&#xA;The values are applied at generation time.&#xD;&#xA;The config sub elements are:&#xD;&#xA;&lt;ul>&#xD;&#xA;&#x9;&lt;li>{@link AttrClassConfig attribute class config}&lt;/li>&#xD;&#xA;&lt;/ul>&#x9;&#x9;&#x9;&#x9;&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="actor" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="actor" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ActorClass">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the actor class.&#xD;&#xA;"/>
</eAnnotations>
@@ -115,12 +115,12 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This class models a configuration for an {@link org.eclipse.etrice.core.room.ActorRef actor instance}.&#xD;&#xA;The configuration defines values for this actor instance and overrides the default values from the corresponding class config.&#xD;&#xA;The values are applied at generation time.&#xD;&#xA;The config sub elements are:&#xD;&#xA;&lt;ul>&#xD;&#xA;&#x9;&lt;li>{@link AttrInstanceConfig attribute instance config}&lt;/li>&#xD;&#xA;&lt;/ul>&#x9;&#x9;&#x9;&#x9;&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="root" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalSystem">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="root" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalSystem">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the logical system that contains the {@link #getSubSystem sub system}.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="subSystem" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemRef">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subSystem" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemRef">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the sub system that contains the {@link #getPath actor instance}.&#xD;&#xA;"/>
</eAnnotations>
@@ -148,7 +148,7 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This class models a configuration for an {@link org.eclipse.etrice.core.room.ProtocolClass protocol class}.&#xD;&#xA;The config sub elements are:&#xD;&#xA;&lt;ul>&#xD;&#xA;&#x9;&lt;li>a {@link PortClassConfig port class config} for the regular port class&lt;/li>&#xD;&#xA;&#x9;&lt;li>a {@link PortClassConfig port class config} for the conjugate port class&lt;/li>&#xD;&#xA;&lt;/ul>&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ProtocolClass">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//ProtocolClass">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the protocol class.&#xD;&#xA;"/>
</eAnnotations>
@@ -181,7 +181,7 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This class models a configuration for an {@link org.eclipse.etrice.core.room.InterfaceItem interface item} (e.g. port instance).&#xD;&#xA;The configuration defines values for this interface item and overrides the default values from the corresponding class config.&#xD;&#xA;The values are applied at generation time.&#xD;&#xA;The config sub elements are:&#xD;&#xA;&lt;ul>&#xD;&#xA;&#x9;&lt;li>{@link AttrInstanceConfig attribute instance config}&lt;/li>&#xD;&#xA;&lt;/ul>&#x9;&#x9;&#x9;&#x9;&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="item" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//InterfaceItem">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="item" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//InterfaceItem">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the interface item.&#xD;&#xA;"/>
</eAnnotations>
@@ -197,7 +197,7 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>It is the super class of&#xD;&#xA;&lt;ul>&#xD;&#xA;&#x9;&lt;li>{@link AttrClassConfig}&lt;/li>&#xD;&#xA;&#x9;&lt;li>{@link AttrInstanceConfig}&lt;/li>&#xD;&#xA;&lt;/ul>&#x9;&#x9;&#x9;&#x9;&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Attribute">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//Attribute">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the attribute.&#xD;&#xA;"/>
</eAnnotations>
@@ -213,13 +213,13 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This class models a configuration for an {@link org.eclipse.etrice.core.room.Attribute attribute}.&#xD;&#xA;The configuration defines a default value for all instances of the attribute.&#xD;&#xA;The values are applied at generation time.&#xD;&#xA;&lt;br>If the type of the given {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} is&#xD;&#xA;&lt;ul>&#xD;&#xA;&#x9;&lt;li>primitive, then a {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} might exist and {@link #getAttributes attributes} is empty&lt;/li>&#xD;&#xA;&#x9;&lt;li>compound attribute (e.g. {@link org.eclipse.etrice.core.room.DataClass data class}), then {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} is null and configurations for children {@link #getAttributes attributes} might exist&lt;/li>&#xD;&#xA;&lt;/ul>&#x9;&#x9;&#x9;&#x9;&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="min" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//NumberLiteral"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="min" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//NumberLiteral"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the lower bound of {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} , in case the {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} has a numerical value.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="max" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//NumberLiteral"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="max" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//NumberLiteral"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the upper bound of {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} , in case the {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} has a numerical value.&#xD;&#xA;"/>
@@ -259,12 +259,12 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ConfigValue"/>
<eClassifiers xsi:type="ecore:EClass" name="LiteralConfigValue" eSuperTypes="#//ConfigValue">
- <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Literal"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Literal"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EnumConfigValue" eSuperTypes="#//ConfigValue">
- <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//EnumerationType"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//EnumLiteral"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//EnumerationType"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//EnumLiteral"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RefPath">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel
index 2cbc230cc..4473bb37f 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.genmodel
@@ -4,7 +4,7 @@
editorDirectory="/org.eclipse.etrice.core.config.editor/src" modelPluginID="org.eclipse.etrice.core.config"
forceOverwrite="true" modelName="Config" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.config.edit"
- editorPluginID="org.eclipse.etrice.core.config.editor" runtimeVersion="2.9" usedGenPackages="../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base ../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
+ editorPluginID="org.eclipse.etrice.core.config.editor" runtimeVersion="2.10" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
<genPackages prefix="Config" basePackage="org.eclipse.etrice.core" disposableProviderFactory="true"
ecorePackage="Config.ecore#/">
<genClasses ecoreClass="Config.ecore#//ConfigModel">
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbin b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbin
index f609c21d6..a0cd4583b 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbin
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/Config.xtextbin
Binary files differ
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g
index 043129af2..55ee9c3e4 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g
@@ -2892,7 +2892,7 @@ RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.tokens b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.tokens
index dbb93f4a8..a976d77e6 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.tokens
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.tokens
@@ -1,51 +1,79 @@
-RULE_EXP=8
-RULE_ID=4
-T__29=29
-T__28=28
-T__27=27
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
+'+'=55
+','=37
+'-'=56
+'.'=38
+'.*'=46
+'/'=17
+':'=39
+'='=32
+'ActorClassConfig'=23
+'ActorInstanceConfig'=24
+'Attr'=31
+'ConfigModel'=13
+'InterfaceItem'=30
+'Port'=29
+'ProtocolClassConfig'=25
+'SubSystemConfig'=16
+'['=47
+']'=48
+'attribute'=42
+'conjugate'=27
+'conjugated'=28
+'dynamic configuration'=18
+'false'=53
+'file path'=19
+'from'=44
+'import'=43
+'mandatory'=41
+'max'=34
+'min'=33
+'model'=45
+'ms'=50
+'ns'=52
+'optional'=40
+'polling interval'=22
+'ptBoolean'=57
+'ptCharacter'=60
+'ptInteger'=58
+'ptReal'=59
+'read'=35
+'regular'=26
+'s'=49
+'true'=54
+'us'=51
+'user constructor'=21
+'user import'=20
+'write'=36
+'{'=14
+'}'=15
RULE_ANY_OTHER=12
-T__21=21
-T__20=20
-T__60=60
-T__55=55
-T__56=56
-T__19=19
-T__57=57
+RULE_EXP=8
RULE_HEX=7
-T__58=58
-T__16=16
-T__51=51
-T__52=52
-T__15=15
-T__53=53
-T__18=18
-T__54=54
-T__17=17
-T__14=14
-T__13=13
-T__59=59
+RULE_ID=4
RULE_INT=6
-T__50=50
-T__42=42
-T__43=43
-T__40=40
-T__41=41
-T__46=46
-T__47=47
-T__44=44
-T__45=45
-T__48=48
-T__49=49
-RULE_SL_COMMENT=10
RULE_ML_COMMENT=9
+RULE_SL_COMMENT=10
+RULE_STRING=5
+RULE_WS=11
+T__13=13
+T__14=14
+T__15=15
+T__16=16
+T__17=17
+T__18=18
+T__19=19
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
T__30=30
T__31=31
-RULE_STRING=5
T__32=32
T__33=33
T__34=34
@@ -54,52 +82,24 @@ T__36=36
T__37=37
T__38=38
T__39=39
-RULE_WS=11
-'ns'=52
-'Attr'=31
-'ms'=50
-'/'=17
-'model'=45
-'user import'=20
-'user constructor'=21
-'.*'=46
-'conjugate'=27
-'polling interval'=22
-'='=32
-'Port'=29
-'InterfaceItem'=30
-'+'=55
-'ConfigModel'=13
-'.'=38
-'ProtocolClassConfig'=25
-'regular'=26
-'max'=34
-'import'=43
-'true'=54
-'}'=15
-'us'=51
-'ActorClassConfig'=23
-'SubSystemConfig'=16
-'dynamic configuration'=18
-'{'=14
-'optional'=40
-'write'=36
-'ptCharacter'=60
-'ActorInstanceConfig'=24
-'false'=53
-'s'=49
-':'=39
-'-'=56
-'['=47
-'attribute'=42
-'conjugated'=28
-'min'=33
-'ptReal'=59
-','=37
-'ptBoolean'=57
-'ptInteger'=58
-']'=48
-'mandatory'=41
-'file path'=19
-'read'=35
-'from'=44
+T__40=40
+T__41=41
+T__42=42
+T__43=43
+T__44=44
+T__45=45
+T__46=46
+T__47=47
+T__48=48
+T__49=49
+T__50=50
+T__51=51
+T__52=52
+T__53=53
+T__54=54
+T__55=55
+T__56=56
+T__57=57
+T__58=58
+T__59=59
+T__60=60
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java
index c2725b189..803e53cb0 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfigLexer.java
@@ -1400,10 +1400,10 @@ public class InternalConfigLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1421,10 +1421,10 @@ public class InternalConfigLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop8:
do {
int alt8=3;
@@ -1440,23 +1440,15 @@ public class InternalConfigLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:21: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:66: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -1481,10 +1473,10 @@ public class InternalConfigLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop9:
do {
int alt9=3;
@@ -1500,23 +1492,15 @@ public class InternalConfigLexer extends Lexer {
switch (alt9) {
case 1 :
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:54: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:137: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalConfig.g:2895:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java
index 0dd86beec..baef7bad4 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/services/ConfigGrammarAccess.java
@@ -962,34 +962,52 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
}
- private ConfigModelElements pConfigModel;
- private ConfigElementElements pConfigElement;
- private SubSystemConfigElements pSubSystemConfig;
- private DynamicConfigElements pDynamicConfig;
- private ActorClassConfigElements pActorClassConfig;
- private ActorInstanceConfigElements pActorInstanceConfig;
- private ProtocolClassConfigElements pProtocolClassConfig;
- private PortClassConfigElements pPortClassConfig;
- private PortInstanceConfigElements pPortInstanceConfig;
- private AttrConfigElements pAttrConfig;
- private AttrClassConfigElements pAttrClassConfig;
- private AttrInstanceConfigElements pAttrInstanceConfig;
- private ConfigValueArrayElements pConfigValueArray;
- private ConfigValueElements pConfigValue;
- private LiteralConfigValueElements pLiteralConfigValue;
- private EnumConfigValueElements pEnumConfigValue;
- private RefPathElements pRefPath;
- private RefSegmentElements pRefSegment;
+ private final ConfigModelElements pConfigModel;
+ private final ConfigElementElements pConfigElement;
+ private final SubSystemConfigElements pSubSystemConfig;
+ private final DynamicConfigElements pDynamicConfig;
+ private final ActorClassConfigElements pActorClassConfig;
+ private final ActorInstanceConfigElements pActorInstanceConfig;
+ private final ProtocolClassConfigElements pProtocolClassConfig;
+ private final PortClassConfigElements pPortClassConfig;
+ private final PortInstanceConfigElements pPortInstanceConfig;
+ private final AttrConfigElements pAttrConfig;
+ private final AttrClassConfigElements pAttrClassConfig;
+ private final AttrInstanceConfigElements pAttrInstanceConfig;
+ private final ConfigValueArrayElements pConfigValueArray;
+ private final ConfigValueElements pConfigValue;
+ private final LiteralConfigValueElements pLiteralConfigValue;
+ private final EnumConfigValueElements pEnumConfigValue;
+ private final RefPathElements pRefPath;
+ private final RefSegmentElements pRefSegment;
private final Grammar grammar;
- private BaseGrammarAccess gaBase;
+ private final BaseGrammarAccess gaBase;
@Inject
public ConfigGrammarAccess(GrammarProvider grammarProvider,
BaseGrammarAccess gaBase) {
this.grammar = internalFindGrammar(grammarProvider);
this.gaBase = gaBase;
+ this.pConfigModel = new ConfigModelElements();
+ this.pConfigElement = new ConfigElementElements();
+ this.pSubSystemConfig = new SubSystemConfigElements();
+ this.pDynamicConfig = new DynamicConfigElements();
+ this.pActorClassConfig = new ActorClassConfigElements();
+ this.pActorInstanceConfig = new ActorInstanceConfigElements();
+ this.pProtocolClassConfig = new ProtocolClassConfigElements();
+ this.pPortClassConfig = new PortClassConfigElements();
+ this.pPortInstanceConfig = new PortInstanceConfigElements();
+ this.pAttrConfig = new AttrConfigElements();
+ this.pAttrClassConfig = new AttrClassConfigElements();
+ this.pAttrInstanceConfig = new AttrInstanceConfigElements();
+ this.pConfigValueArray = new ConfigValueArrayElements();
+ this.pConfigValue = new ConfigValueElements();
+ this.pLiteralConfigValue = new LiteralConfigValueElements();
+ this.pEnumConfigValue = new EnumConfigValueElements();
+ this.pRefPath = new RefPathElements();
+ this.pRefSegment = new RefSegmentElements();
}
protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -1022,7 +1040,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//ConfigModel:
// "ConfigModel" name=FQN "{" imports+=Import* configElements+=ConfigElement* "}";
public ConfigModelElements getConfigModelAccess() {
- return (pConfigModel != null) ? pConfigModel : (pConfigModel = new ConfigModelElements());
+ return pConfigModel;
}
public ParserRule getConfigModelRule() {
@@ -1032,7 +1050,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//ConfigElement:
// SubSystemConfig | ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig;
public ConfigElementElements getConfigElementAccess() {
- return (pConfigElement != null) ? pConfigElement : (pConfigElement = new ConfigElementElements());
+ return pConfigElement;
}
public ParserRule getConfigElementRule() {
@@ -1042,7 +1060,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//SubSystemConfig:
// "SubSystemConfig" root=[room::LogicalSystem|FQN] "/" subSystem=[room::SubSystemRef] "{" dynConfig=DynamicConfig "}";
public SubSystemConfigElements getSubSystemConfigAccess() {
- return (pSubSystemConfig != null) ? pSubSystemConfig : (pSubSystemConfig = new SubSystemConfigElements());
+ return pSubSystemConfig;
}
public ParserRule getSubSystemConfigRule() {
@@ -1053,7 +1071,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
// "dynamic configuration" "{" (("file path" filePath=STRING | ("user import" userCode1=STRING) ("user constructor"
// userCode2=STRING)) & ("polling interval" polling=TIME)?) "}";
public DynamicConfigElements getDynamicConfigAccess() {
- return (pDynamicConfig != null) ? pDynamicConfig : (pDynamicConfig = new DynamicConfigElements());
+ return pDynamicConfig;
}
public ParserRule getDynamicConfigRule() {
@@ -1063,7 +1081,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//ActorClassConfig:
// "ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}";
public ActorClassConfigElements getActorClassConfigAccess() {
- return (pActorClassConfig != null) ? pActorClassConfig : (pActorClassConfig = new ActorClassConfigElements());
+ return pActorClassConfig;
}
public ParserRule getActorClassConfigRule() {
@@ -1074,7 +1092,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
// "ActorInstanceConfig" root=[room::LogicalSystem|FQN] "/" subSystem=[room::SubSystemRef] "/" path=RefPath "{"
// (attributes+=AttrInstanceConfig* & ports+=PortInstanceConfig*) "}";
public ActorInstanceConfigElements getActorInstanceConfigAccess() {
- return (pActorInstanceConfig != null) ? pActorInstanceConfig : (pActorInstanceConfig = new ActorInstanceConfigElements());
+ return pActorInstanceConfig;
}
public ParserRule getActorInstanceConfigRule() {
@@ -1085,7 +1103,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
// "ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & (("conjugate" |
// "conjugated") conjugated=PortClassConfig)?) "}";
public ProtocolClassConfigElements getProtocolClassConfigAccess() {
- return (pProtocolClassConfig != null) ? pProtocolClassConfig : (pProtocolClassConfig = new ProtocolClassConfigElements());
+ return pProtocolClassConfig;
}
public ParserRule getProtocolClassConfigRule() {
@@ -1095,7 +1113,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//PortClassConfig:
// {PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}";
public PortClassConfigElements getPortClassConfigAccess() {
- return (pPortClassConfig != null) ? pPortClassConfig : (pPortClassConfig = new PortClassConfigElements());
+ return pPortClassConfig;
}
public ParserRule getPortClassConfigRule() {
@@ -1105,7 +1123,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//PortInstanceConfig:
// "InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}";
public PortInstanceConfigElements getPortInstanceConfigAccess() {
- return (pPortInstanceConfig != null) ? pPortInstanceConfig : (pPortInstanceConfig = new PortInstanceConfigElements());
+ return pPortInstanceConfig;
}
public ParserRule getPortInstanceConfigRule() {
@@ -1115,7 +1133,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//AttrConfig:
// AttrClassConfig | AttrInstanceConfig;
public AttrConfigElements getAttrConfigAccess() {
- return (pAttrConfig != null) ? pAttrConfig : (pAttrConfig = new AttrConfigElements());
+ return pAttrConfig;
}
public ParserRule getAttrConfigRule() {
@@ -1126,7 +1144,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
// "Attr" attribute=[room::Attribute] ("=" value=ConfigValueArray)? ("{" (("min" "=" min=NumberLiteral)? ("max" "="
// max=NumberLiteral)? attributes+=AttrClassConfig*) "}")?;
public AttrClassConfigElements getAttrClassConfigAccess() {
- return (pAttrClassConfig != null) ? pAttrClassConfig : (pAttrClassConfig = new AttrClassConfigElements());
+ return pAttrClassConfig;
}
public ParserRule getAttrClassConfigRule() {
@@ -1137,7 +1155,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
// "Attr" attribute=[room::Attribute] ("=" value=ConfigValueArray)? ("{" ((dynConfig?="dynamic configuration"
// (readOnly?="read" | "write"))? attributes+=AttrInstanceConfig*) "}")?;
public AttrInstanceConfigElements getAttrInstanceConfigAccess() {
- return (pAttrInstanceConfig != null) ? pAttrInstanceConfig : (pAttrInstanceConfig = new AttrInstanceConfigElements());
+ return pAttrInstanceConfig;
}
public ParserRule getAttrInstanceConfigRule() {
@@ -1147,7 +1165,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//ConfigValueArray:
// values+=ConfigValue ("," values+=ConfigValue)*;
public ConfigValueArrayElements getConfigValueArrayAccess() {
- return (pConfigValueArray != null) ? pConfigValueArray : (pConfigValueArray = new ConfigValueArrayElements());
+ return pConfigValueArray;
}
public ParserRule getConfigValueArrayRule() {
@@ -1157,7 +1175,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//ConfigValue:
// LiteralConfigValue | EnumConfigValue;
public ConfigValueElements getConfigValueAccess() {
- return (pConfigValue != null) ? pConfigValue : (pConfigValue = new ConfigValueElements());
+ return pConfigValue;
}
public ParserRule getConfigValueRule() {
@@ -1167,7 +1185,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//LiteralConfigValue:
// value=Literal;
public LiteralConfigValueElements getLiteralConfigValueAccess() {
- return (pLiteralConfigValue != null) ? pLiteralConfigValue : (pLiteralConfigValue = new LiteralConfigValueElements());
+ return pLiteralConfigValue;
}
public ParserRule getLiteralConfigValueRule() {
@@ -1177,7 +1195,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//EnumConfigValue:
// type=[room::EnumerationType] "." value=[room::EnumLiteral];
public EnumConfigValueElements getEnumConfigValueAccess() {
- return (pEnumConfigValue != null) ? pEnumConfigValue : (pEnumConfigValue = new EnumConfigValueElements());
+ return pEnumConfigValue;
}
public ParserRule getEnumConfigValueRule() {
@@ -1187,7 +1205,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//RefPath:
// refs+=RefSegment ("/" refs+=RefSegment)*;
public RefPathElements getRefPathAccess() {
- return (pRefPath != null) ? pRefPath : (pRefPath = new RefPathElements());
+ return pRefPath;
}
public ParserRule getRefPathRule() {
@@ -1197,7 +1215,7 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
//RefSegment:
// ref=ID (":" idx=INT)?;
public RefSegmentElements getRefSegmentAccess() {
- return (pRefSegment != null) ? pRefSegment : (pRefSegment = new RefSegmentElements());
+ return pRefSegment;
}
public ParserRule getRefSegmentRule() {
@@ -1547,8 +1565,8 @@ public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
}
//terminal STRING:
- // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
- // "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
+ // "\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
+ // / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
public TerminalRule getSTRINGRule() {
return gaBase.getSTRINGRule();
}
diff --git a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2 b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2
index a90a5658f..79c4ac6a4 100644
--- a/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2
+++ b/plugins/org.eclipse.etrice.core.config/src/org/eclipse/etrice/core/GenerateConfig.mwe2
@@ -142,7 +142,7 @@ Workflow {
// fragment = types.TypesGeneratorFragment {}
// generates the required bindings only if the grammar inherits from Xbase
- fragment = xbase.XbaseGeneratorFragment {}
+ //fragment = xbase.XbaseGeneratorFragment {}
// provides a preference page for template proposals
fragment = templates.CodetemplatesGeneratorFragment {}
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
index 70532929a..259bfd8c6 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
@@ -250,7 +250,9 @@
<extension
point="org.eclipse.xtext.builder.participant">
<participant
- class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
+ class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+ fileExtensions="etmap"
+ >
</participant>
</extension>
<extension
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
index 143595471..da3734499 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
@@ -60,7 +60,7 @@ public abstract class AbstractETMapUiModule extends DefaultUiModule {
// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
- binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
+ binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
}
// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g
index bc73cfd3d..eb5cb2f89 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g
@@ -4391,7 +4391,7 @@ RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.tokens b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.tokens
index a0f80c109..207e22f0c 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.tokens
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.tokens
@@ -1,65 +1,65 @@
+'+'=16
+','=32
+'-'=17
+'->'=26
+'.'=38
+'.*'=35
+':'=31
+'='=29
+'Mapping'=25
+'MappingModel'=22
+'SubSystemMapping'=27
+'ThreadMapping'=28
+'['=36
+']'=37
+'attribute'=30
+'false'=15
+'from'=34
+'import'=33
+'mandatory'=13
+'model'=14
+'optional'=39
+'ptBoolean'=18
+'ptCharacter'=21
+'ptInteger'=19
+'ptReal'=20
+'true'=40
+'{'=23
+'}'=24
+RULE_ANY_OTHER=12
RULE_EXP=7
+RULE_HEX=5
RULE_ID=4
-T__40=40
-T__29=29
-T__28=28
-T__27=27
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
-RULE_ANY_OTHER=12
-T__21=21
-T__20=20
-RULE_SL_COMMENT=10
+RULE_INT=6
RULE_ML_COMMENT=9
-T__30=30
+RULE_SL_COMMENT=10
+RULE_STRING=8
+RULE_WS=11
+T__13=13
+T__14=14
+T__15=15
+T__16=16
+T__17=17
+T__18=18
T__19=19
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
+T__30=30
T__31=31
-RULE_STRING=8
-RULE_HEX=5
T__32=32
T__33=33
-T__16=16
T__34=34
-T__15=15
T__35=35
-T__18=18
T__36=36
-T__17=17
T__37=37
T__38=38
T__39=39
-T__14=14
-T__13=13
-RULE_INT=6
-RULE_WS=11
-'model'=14
-'MappingModel'=22
-'.*'=35
-'='=29
-'+'=16
-'.'=38
-'->'=26
-'import'=33
-'true'=40
-'}'=24
-'{'=23
-'optional'=39
-'ptCharacter'=21
-'SubSystemMapping'=27
-'ThreadMapping'=28
-'false'=15
-'Mapping'=25
-':'=31
-'-'=17
-'attribute'=30
-'['=36
-'ptReal'=20
-','=32
-'ptBoolean'=18
-']'=37
-'ptInteger'=19
-'mandatory'=13
-'from'=34
+T__40=40
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
index a166c041b..c7889f598 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
@@ -962,10 +962,10 @@ public class InternalETMapLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt10=2;
int LA10_0 = input.LA(1);
@@ -983,10 +983,10 @@ public class InternalETMapLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop8:
do {
int alt8=3;
@@ -1002,23 +1002,15 @@ public class InternalETMapLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:21: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:66: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -1043,10 +1035,10 @@ public class InternalETMapLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop9:
do {
int alt9=3;
@@ -1062,23 +1054,15 @@ public class InternalETMapLexer extends Lexer {
switch (alt9) {
case 1 :
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:54: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:137: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMap.g:4394:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
diff --git a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
index 9dcb40ee0..255fd32af 100644
--- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="0.5.0",
org.eclipse.xtext.util;bundle-version="2.6.0",
org.eclipse.emf.ecore,
org.eclipse.emf.common,
- org.antlr.runtime
+ org.antlr.runtime,
+ org.eclipse.xtext.xbase.lib
Import-Package: org.apache.log4j,
org.eclipse.xtext.xbase.lib
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java
index c4b160179..020bbf067 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/AbstractETMapRuntimeModule.java
@@ -140,8 +140,8 @@ public abstract class AbstractETMapRuntimeModule extends DefaultRuntimeModule {
}
// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
- public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
- binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+ public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
}
// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore
index 4bc91c33c..f4c410005 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore
@@ -12,7 +12,7 @@
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
- eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import"
+ eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>A list of all imported models.&#xD;&#xA;"/>
@@ -29,12 +29,12 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the mapping of a logical system (defined in a ROOM model) to a&#xD;&#xA;physical system (defined in a physical model).&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="logicalSys" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalSystem">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="logicalSys" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalSystem">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the logical system being mapped.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="physicalSys" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore#//PhysicalSystem">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="physicalSys" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore#//PhysicalSystem">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the physical system being mapped to.&#xD;&#xA;"/>
</eAnnotations>
@@ -50,12 +50,12 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the mapping of a sub system (defined in a ROOM model) to a&#xD;&#xA;node (defined in a physical model).&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="logicalSubSys" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemRef">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="logicalSubSys" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//SubSystemRef">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the logical sub system being mapped.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore#//NodeRef">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore#//NodeRef">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the node being mapped to.&#xD;&#xA;"/>
</eAnnotations>
@@ -71,12 +71,12 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the mapping of a logical thread (defined in a ROOM model) to a&#xD;&#xA;physical thread (defined in a physical model).&#xD;&#xA;"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="logicalThread" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalThread">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="logicalThread" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalThread">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the logical thread being mapped.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="physicalThread" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore#//PhysicalThread">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="physicalThread" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore#//PhysicalThread">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is the physical thread being mapped to.&#xD;&#xA;"/>
</eAnnotations>
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel
index d9ea22a6e..dc00448a6 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.genmodel
@@ -4,7 +4,7 @@
editorDirectory="/org.eclipse.etrice.core.etmap.editor/src" modelPluginID="org.eclipse.etrice.core.etmap"
forceOverwrite="true" modelName="ETMap" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.etmap.edit"
- editorPluginID="org.eclipse.etrice.core.etmap.editor" runtimeVersion="2.9" usedGenPackages="../../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base ../../../../../../../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel#//eTPhys ../../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
+ editorPluginID="org.eclipse.etrice.core.etmap.editor" runtimeVersion="2.10" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base platform:/resource/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel#//eTPhys platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
<genPackages prefix="ETMap" basePackage="org.eclipse.etrice.core.etmap" disposableProviderFactory="true"
ecorePackage="ETMap.ecore#/">
<genClasses ecoreClass="ETMap.ecore#//MappingModel">
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xtextbin b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xtextbin
index eaa4e2d17..02b3e4fe7 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xtextbin
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xtextbin
Binary files differ
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
index 266794d89..5780e7ec5 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
@@ -1672,7 +1672,7 @@ RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.tokens b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.tokens
index e42a77b5c..9fa5fb43a 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.tokens
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.tokens
@@ -1,65 +1,65 @@
+'+'=34
+','=25
+'-'=35
+'->'=17
+'.'=36
+'.*'=29
+':'=24
+'='=20
+'Mapping'=16
+'MappingModel'=13
+'SubSystemMapping'=18
+'ThreadMapping'=19
+'['=30
+']'=31
+'attribute'=23
+'false'=32
+'from'=27
+'import'=26
+'mandatory'=22
+'model'=28
+'optional'=21
+'ptBoolean'=37
+'ptCharacter'=40
+'ptInteger'=38
+'ptReal'=39
+'true'=33
+'{'=14
+'}'=15
+RULE_ANY_OTHER=12
RULE_EXP=8
+RULE_HEX=7
RULE_ID=4
-T__40=40
-T__29=29
-T__28=28
-T__27=27
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
-RULE_ANY_OTHER=12
-T__21=21
-T__20=20
-RULE_SL_COMMENT=10
+RULE_INT=6
RULE_ML_COMMENT=9
-T__30=30
+RULE_SL_COMMENT=10
+RULE_STRING=5
+RULE_WS=11
+T__13=13
+T__14=14
+T__15=15
+T__16=16
+T__17=17
+T__18=18
T__19=19
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
+T__30=30
T__31=31
-RULE_HEX=7
-RULE_STRING=5
T__32=32
T__33=33
-T__16=16
T__34=34
-T__15=15
T__35=35
-T__18=18
T__36=36
-T__17=17
T__37=37
T__38=38
T__39=39
-T__14=14
-T__13=13
-RULE_INT=6
-RULE_WS=11
-'model'=28
-'MappingModel'=13
-'.*'=29
-'='=20
-'+'=34
-'.'=36
-'->'=17
-'import'=26
-'true'=33
-'}'=15
-'{'=14
-'optional'=21
-'ptCharacter'=40
-'SubSystemMapping'=18
-'ThreadMapping'=19
-'false'=32
-':'=24
-'Mapping'=16
-'attribute'=23
-'['=30
-'-'=35
-'ptReal'=39
-','=25
-'ptBoolean'=37
-'ptInteger'=38
-'mandatory'=22
-']'=31
-'from'=27
+T__40=40
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java
index bbcacd8c0..d2f8cbb59 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapLexer.java
@@ -962,10 +962,10 @@ public class InternalETMapLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt10=2;
int LA10_0 = input.LA(1);
@@ -983,10 +983,10 @@ public class InternalETMapLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop8:
do {
int alt8=3;
@@ -1002,23 +1002,15 @@ public class InternalETMapLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:21: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:66: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -1043,10 +1035,10 @@ public class InternalETMapLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop9:
do {
int alt9=3;
@@ -1062,23 +1054,15 @@ public class InternalETMapLexer extends Lexer {
switch (alt9) {
case 1 :
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:54: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:137: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g:1675:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
index 86acfae7d..fdd8027c6 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
@@ -239,20 +239,24 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
}
- private MappingModelElements pMappingModel;
- private MappingElements pMapping;
- private SubSystemMappingElements pSubSystemMapping;
- private ThreadMappingElements pThreadMapping;
+ private final MappingModelElements pMappingModel;
+ private final MappingElements pMapping;
+ private final SubSystemMappingElements pSubSystemMapping;
+ private final ThreadMappingElements pThreadMapping;
private final Grammar grammar;
- private BaseGrammarAccess gaBase;
+ private final BaseGrammarAccess gaBase;
@Inject
public ETMapGrammarAccess(GrammarProvider grammarProvider,
BaseGrammarAccess gaBase) {
this.grammar = internalFindGrammar(grammarProvider);
this.gaBase = gaBase;
+ this.pMappingModel = new MappingModelElements();
+ this.pMapping = new MappingElements();
+ this.pSubSystemMapping = new SubSystemMappingElements();
+ this.pThreadMapping = new ThreadMappingElements();
}
protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -285,7 +289,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
//MappingModel:
// "MappingModel" name=FQN "{" imports+=Import* mappings+=Mapping* "}";
public MappingModelElements getMappingModelAccess() {
- return (pMappingModel != null) ? pMappingModel : (pMappingModel = new MappingModelElements());
+ return pMappingModel;
}
public ParserRule getMappingModelRule() {
@@ -296,7 +300,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
// "Mapping" logicalSys=[room::LogicalSystem|FQN] "->" physicalSys=[phys::PhysicalSystem|FQN] "{"
// subsysMappings+=SubSystemMapping* "}";
public MappingElements getMappingAccess() {
- return (pMapping != null) ? pMapping : (pMapping = new MappingElements());
+ return pMapping;
}
public ParserRule getMappingRule() {
@@ -307,7 +311,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
// "SubSystemMapping" logicalSubSys=[room::SubSystemRef] "->" node=[phys::NodeRef] ("{" threadMappings+=ThreadMapping*
// "}")?;
public SubSystemMappingElements getSubSystemMappingAccess() {
- return (pSubSystemMapping != null) ? pSubSystemMapping : (pSubSystemMapping = new SubSystemMappingElements());
+ return pSubSystemMapping;
}
public ParserRule getSubSystemMappingRule() {
@@ -317,7 +321,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
//ThreadMapping:
// "ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysicalThread];
public ThreadMappingElements getThreadMappingAccess() {
- return (pThreadMapping != null) ? pThreadMapping : (pThreadMapping = new ThreadMappingElements());
+ return pThreadMapping;
}
public ParserRule getThreadMappingRule() {
@@ -667,8 +671,8 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
}
//terminal STRING:
- // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
- // "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
+ // "\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
+ // / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
public TerminalRule getSTRINGRule() {
return gaBase.getSTRINGRule();
}
diff --git a/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe2 b/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe2
index 2a8b0da1e..b5807be98 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe2
+++ b/plugins/org.eclipse.etrice.core.etmap/src/org/eclipse/etrice/core/etmap/GenerateETMap.mwe2
@@ -138,7 +138,7 @@ Workflow {
//fragment = types.TypesGeneratorFragment {}
// generates the required bindings only if the grammar inherits from Xbase
- fragment = xbase.XbaseGeneratorFragment {}
+ //fragment = xbase.XbaseGeneratorFragment {}
// provides a preference page for template proposals
fragment = templates.CodetemplatesGeneratorFragment {}
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
index 74dd9c681..635e4ec0d 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
@@ -250,7 +250,9 @@
<extension
point="org.eclipse.xtext.builder.participant">
<participant
- class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
+ class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+ fileExtensions="etphys"
+ >
</participant>
</extension>
<extension
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g
index 6466edb01..50e631d21 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g
@@ -6868,7 +6868,7 @@ RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens
index 731b7768b..2e3a34540 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens
@@ -1,51 +1,79 @@
-RULE_EXP=7
-RULE_ID=4
-T__29=29
-T__28=28
-T__27=27
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
+'+'=14
+','=47
+'-'=15
+'.'=57
+'.*'=50
+':'=33
+'='=36
+'DefaultThread'=58
+'NodeClass'=34
+'NodeRef'=32
+'PhysicalModel'=28
+'PhysicalSystem'=31
+'RuntimeClass'=45
+'Thread'=13
+'['=51
+']'=52
+'attribute'=46
+'blocked'=20
+'execmode'=39
+'false'=18
+'from'=49
+'import'=48
+'interval'=40
+'mandatory'=16
+'mixed'=21
+'model'=17
+'ms'=54
+'msgblocksize'=43
+'msgpoolsize'=44
+'multiThreaded'=23
+'ns'=56
+'optional'=59
+'polled'=19
+'prio'=41
+'priomax'=38
+'priomin'=37
+'ptBoolean'=24
+'ptCharacter'=27
+'ptInteger'=25
+'ptReal'=26
+'runtime'=35
+'s'=53
+'singleThreaded'=22
+'stacksize'=42
+'true'=60
+'us'=55
+'{'=29
+'}'=30
RULE_ANY_OTHER=12
-T__21=21
-T__20=20
-T__60=60
-T__55=55
-T__56=56
-T__19=19
-T__57=57
+RULE_EXP=7
RULE_HEX=5
-T__58=58
-T__16=16
-T__51=51
-T__52=52
-T__15=15
-T__53=53
-T__18=18
-T__54=54
-T__17=17
-T__14=14
-T__13=13
-T__59=59
+RULE_ID=4
RULE_INT=6
-T__50=50
-T__42=42
-T__43=43
-T__40=40
-T__41=41
-T__46=46
-T__47=47
-T__44=44
-T__45=45
-T__48=48
-T__49=49
-RULE_SL_COMMENT=10
RULE_ML_COMMENT=9
+RULE_SL_COMMENT=10
+RULE_STRING=8
+RULE_WS=11
+T__13=13
+T__14=14
+T__15=15
+T__16=16
+T__17=17
+T__18=18
+T__19=19
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
T__30=30
T__31=31
-RULE_STRING=8
T__32=32
T__33=33
T__34=34
@@ -54,52 +82,24 @@ T__36=36
T__37=37
T__38=38
T__39=39
-RULE_WS=11
-'ns'=56
-'singleThreaded'=22
-'PhysicalModel'=28
-'NodeRef'=32
-'prio'=41
-'ms'=54
-'model'=17
-'priomax'=38
-'multiThreaded'=23
-'.*'=50
-'msgpoolsize'=44
-'execmode'=39
-'='=36
-'interval'=40
-'mixed'=21
-'+'=14
-'.'=57
-'msgblocksize'=43
-'Thread'=13
-'import'=48
-'true'=60
-'}'=30
-'priomin'=37
-'blocked'=20
-'us'=55
-'runtime'=35
-'DefaultThread'=58
-'stacksize'=42
-'{'=29
-'optional'=59
-'ptCharacter'=27
-'NodeClass'=34
-'false'=18
-'PhysicalSystem'=31
-'s'=53
-'RuntimeClass'=45
-'polled'=19
-':'=33
-'['=51
-'attribute'=46
-'-'=15
-','=47
-'ptReal'=26
-'ptBoolean'=24
-']'=52
-'mandatory'=16
-'ptInteger'=25
-'from'=49
+T__40=40
+T__41=41
+T__42=42
+T__43=43
+T__44=44
+T__45=45
+T__46=46
+T__47=47
+T__48=48
+T__49=49
+T__50=50
+T__51=51
+T__52=52
+T__53=53
+T__54=54
+T__55=55
+T__56=56
+T__57=57
+T__58=58
+T__59=59
+T__60=60
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
index 2975dd192..103dbe5d8 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
@@ -1401,10 +1401,10 @@ public class InternalETPhysLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1422,10 +1422,10 @@ public class InternalETPhysLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop8:
do {
int alt8=3;
@@ -1441,23 +1441,15 @@ public class InternalETPhysLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:21: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:66: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -1482,10 +1474,10 @@ public class InternalETPhysLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop9:
do {
int alt9=3;
@@ -1501,23 +1493,15 @@ public class InternalETPhysLexer extends Lexer {
switch (alt9) {
case 1 :
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:54: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:137: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.g:6871:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
diff --git a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
index 0686babb7..bc99abda8 100644
--- a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.5.0",
org.eclipse.xtext.util;bundle-version="2.6.0",
org.eclipse.emf.ecore,
org.eclipse.emf.common,
- org.eclipse.etrice.core.common;bundle-version="0.5.0"
+ org.eclipse.etrice.core.common;bundle-version="0.5.0",
+ org.eclipse.xtext.xbase.lib
Import-Package: org.apache.log4j,
org.eclipse.xtext.xbase.lib
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore
index d2ca15c92..39c794e94 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore
@@ -12,7 +12,7 @@
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
- eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import"
+ eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Import"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>A list of all imported models.&#xD;&#xA;"/>
@@ -46,7 +46,7 @@
<details key="documentation" value="&lt;br>The name of the physical system by which it is referred to in the model.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
@@ -73,7 +73,7 @@
<details key="documentation" value="&lt;br>The node class of this reference.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
@@ -89,7 +89,7 @@
<details key="documentation" value="&lt;br>The name of the node class by which it is referred to in the model.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
@@ -172,7 +172,7 @@
<details key="documentation" value="&lt;br>The name of the runtime class by which it is referred to in the model.&#xD;&#xA;"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="ecore:EClass platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.ecore#//Documentation"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;br>This is an optional documentation.&#xD;&#xA;"/>
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel
index f909b5049..bc04dcca7 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.genmodel
@@ -4,7 +4,7 @@
editorDirectory="/org.eclipse.etrice.core.etphys.editor/src" modelPluginID="org.eclipse.etrice.core.etphys"
forceOverwrite="true" modelName="ETPhys" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.etphys.edit"
- editorPluginID="org.eclipse.etrice.core.etphys.editor" runtimeVersion="2.9" usedGenPackages="../../../../../../../org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base">
+ editorPluginID="org.eclipse.etrice.core.etphys.editor" runtimeVersion="2.10" usedGenPackages="platform:/resource/org.eclipse.etrice.core.common/src-gen/org/eclipse/etrice/core/common/Base.genmodel#//base">
<genPackages prefix="ETPhys" basePackage="org.eclipse.etrice.core.etphys" disposableProviderFactory="true"
ecorePackage="ETPhys.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="ETPhys.ecore#//ExecMode">
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbin b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbin
index 359facb68..9bc8c3c6e 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbin
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.xtextbin
Binary files differ
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g
index f61095626..7d1994ae4 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g
@@ -2447,7 +2447,7 @@ RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
-RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
+RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.tokens b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.tokens
index 44ddb9d55..06d791ae0 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.tokens
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.tokens
@@ -1,51 +1,79 @@
-RULE_EXP=8
-RULE_ID=4
-T__29=29
-T__28=28
-T__27=27
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
+'+'=34
+','=39
+'-'=35
+'.'=51
+'.*'=42
+':'=18
+'='=21
+'DefaultThread'=24
+'NodeClass'=19
+'NodeRef'=17
+'PhysicalModel'=13
+'PhysicalSystem'=16
+'RuntimeClass'=32
+'Thread'=25
+'['=43
+']'=44
+'attribute'=38
+'blocked'=53
+'execmode'=26
+'false'=49
+'from'=41
+'import'=40
+'interval'=27
+'mandatory'=37
+'mixed'=54
+'model'=33
+'ms'=46
+'msgblocksize'=30
+'msgpoolsize'=31
+'multiThreaded'=56
+'ns'=48
+'optional'=36
+'polled'=52
+'prio'=28
+'priomax'=23
+'priomin'=22
+'ptBoolean'=57
+'ptCharacter'=60
+'ptInteger'=58
+'ptReal'=59
+'runtime'=20
+'s'=45
+'singleThreaded'=55
+'stacksize'=29
+'true'=50
+'us'=47
+'{'=14
+'}'=15
RULE_ANY_OTHER=12
-T__21=21
-T__20=20
-T__60=60
-T__55=55
-T__56=56
-T__19=19
-T__57=57
+RULE_EXP=8
RULE_HEX=7
-T__58=58
-T__16=16
-T__51=51
-T__52=52
-T__15=15
-T__53=53
-T__18=18
-T__54=54
-T__17=17
-T__14=14
-T__13=13
-T__59=59
+RULE_ID=4
RULE_INT=5
-T__50=50
-T__42=42
-T__43=43
-T__40=40
-T__41=41
-T__46=46
-T__47=47
-T__44=44
-T__45=45
-T__48=48
-T__49=49
-RULE_SL_COMMENT=10
RULE_ML_COMMENT=9
+RULE_SL_COMMENT=10
+RULE_STRING=6
+RULE_WS=11
+T__13=13
+T__14=14
+T__15=15
+T__16=16
+T__17=17
+T__18=18
+T__19=19
+T__20=20
+T__21=21
+T__22=22
+T__23=23
+T__24=24
+T__25=25
+T__26=26
+T__27=27
+T__28=28
+T__29=29
T__30=30
T__31=31
-RULE_STRING=6
T__32=32
T__33=33
T__34=34
@@ -54,52 +82,24 @@ T__36=36
T__37=37
T__38=38
T__39=39
-RULE_WS=11
-'singleThreaded'=55
-'ns'=48
-'NodeRef'=17
-'PhysicalModel'=13
-'prio'=28
-'ms'=46
-'model'=33
-'multiThreaded'=56
-'priomax'=23
-'.*'=42
-'msgpoolsize'=31
-'='=21
-'execmode'=26
-'interval'=27
-'mixed'=54
-'+'=34
-'.'=51
-'msgblocksize'=30
-'Thread'=25
-'import'=40
-'true'=50
-'}'=15
-'priomin'=22
-'blocked'=53
-'us'=47
-'runtime'=20
-'DefaultThread'=24
-'stacksize'=29
-'{'=14
-'optional'=36
-'ptCharacter'=60
-'NodeClass'=19
-'false'=49
-'PhysicalSystem'=16
-'polled'=52
-'s'=45
-'RuntimeClass'=32
-':'=18
-'['=43
-'attribute'=38
-'-'=35
-'ptReal'=59
-','=39
-'ptBoolean'=57
-'ptInteger'=58
-']'=44
-'mandatory'=37
-'from'=41
+T__40=40
+T__41=41
+T__42=42
+T__43=43
+T__44=44
+T__45=45
+T__46=46
+T__47=47
+T__48=48
+T__49=49
+T__50=50
+T__51=51
+T__52=52
+T__53=53
+T__54=54
+T__55=55
+T__56=56
+T__57=57
+T__58=58
+T__59=59
+T__60=60
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java
index 3ead001ec..9c48eb600 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhysLexer.java
@@ -1401,10 +1401,10 @@ public class InternalETPhysLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1422,10 +1422,10 @@ public class InternalETPhysLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop8:
do {
int alt8=3;
@@ -1441,23 +1441,15 @@ public class InternalETPhysLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:21: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:66: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -1482,10 +1474,10 @@ public class InternalETPhysLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop9:
do {
int alt9=3;
@@ -1501,23 +1493,15 @@ public class InternalETPhysLexer extends Lexer {
switch (alt9) {
case 1 :
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:54: '\\\\' .
{
match('\\');
- if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
+ matchAny();
}
break;
case 2 :
- // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:137: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/parser/antlr/internal/InternalETPhys.g:2450:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
diff --git a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java
index 696240015..04b4c7d9a 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/services/ETPhysGrammarAccess.java
@@ -624,25 +624,34 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
public Keyword getMULTI_THREADEDMultiThreadedKeyword_1_0() { return cMULTI_THREADEDMultiThreadedKeyword_1_0; }
}
- private PhysicalModelElements pPhysicalModel;
- private PhysicalSystemElements pPhysicalSystem;
- private NodeRefElements pNodeRef;
- private NodeClassElements pNodeClass;
- private PhysicalThreadElements pPhysicalThread;
- private ExecModeElements unknownRuleExecMode;
- private RuntimeClassElements pRuntimeClass;
- private ThreadModelElements unknownRuleThreadModel;
- private PRIOElements pPRIO;
+ private final PhysicalModelElements pPhysicalModel;
+ private final PhysicalSystemElements pPhysicalSystem;
+ private final NodeRefElements pNodeRef;
+ private final NodeClassElements pNodeClass;
+ private final PhysicalThreadElements pPhysicalThread;
+ private final ExecModeElements unknownRuleExecMode;
+ private final RuntimeClassElements pRuntimeClass;
+ private final ThreadModelElements unknownRuleThreadModel;
+ private final PRIOElements pPRIO;
private final Grammar grammar;
- private BaseGrammarAccess gaBase;
+ private final BaseGrammarAccess gaBase;
@Inject
public ETPhysGrammarAccess(GrammarProvider grammarProvider,
BaseGrammarAccess gaBase) {
this.grammar = internalFindGrammar(grammarProvider);
this.gaBase = gaBase;
+ this.pPhysicalModel = new PhysicalModelElements();
+ this.pPhysicalSystem = new PhysicalSystemElements();
+ this.pNodeRef = new NodeRefElements();
+ this.pNodeClass = new NodeClassElements();
+ this.pPhysicalThread = new PhysicalThreadElements();
+ this.unknownRuleExecMode = new ExecModeElements();
+ this.pRuntimeClass = new RuntimeClassElements();
+ this.unknownRuleThreadModel = new ThreadModelElements();
+ this.pPRIO = new PRIOElements();
}
protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -676,7 +685,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
// "PhysicalModel" name=FQN "{" imports+=Import* (systems+=PhysicalSystem | nodeClasses+=NodeClass |
// runtimeClasses+=RuntimeClass)* "}";
public PhysicalModelElements getPhysicalModelAccess() {
- return (pPhysicalModel != null) ? pPhysicalModel : (pPhysicalModel = new PhysicalModelElements());
+ return pPhysicalModel;
}
public ParserRule getPhysicalModelRule() {
@@ -686,7 +695,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
//PhysicalSystem:
// "PhysicalSystem" name=ID docu=Documentation? "{" nodeRefs+=NodeRef* "}";
public PhysicalSystemElements getPhysicalSystemAccess() {
- return (pPhysicalSystem != null) ? pPhysicalSystem : (pPhysicalSystem = new PhysicalSystemElements());
+ return pPhysicalSystem;
}
public ParserRule getPhysicalSystemRule() {
@@ -696,7 +705,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
//NodeRef:
// "NodeRef" name=ID ":" type=[NodeClass|FQN] docu=Documentation?;
public NodeRefElements getNodeRefAccess() {
- return (pNodeRef != null) ? pNodeRef : (pNodeRef = new NodeRefElements());
+ return pNodeRef;
}
public ParserRule getNodeRefRule() {
@@ -707,7 +716,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
// "NodeClass" name=ID docu=Documentation? "{" ("runtime" "=" runtime=[RuntimeClass|FQN] & "priomin" "=" priomin=PRIO &
// "priomax" "=" priomax=PRIO) threads+=PhysicalThread* "}";
public NodeClassElements getNodeClassAccess() {
- return (pNodeClass != null) ? pNodeClass : (pNodeClass = new NodeClassElements());
+ return pNodeClass;
}
public ParserRule getNodeClassRule() {
@@ -719,7 +728,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
// "prio" "=" prio=PRIO & "stacksize" "=" stacksize=INT & "msgblocksize" "=" msgblocksize=INT & "msgpoolsize" "="
// msgpoolsize=INT) "}";
public PhysicalThreadElements getPhysicalThreadAccess() {
- return (pPhysicalThread != null) ? pPhysicalThread : (pPhysicalThread = new PhysicalThreadElements());
+ return pPhysicalThread;
}
public ParserRule getPhysicalThreadRule() {
@@ -729,7 +738,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
//enum ExecMode:
// POLLED="polled" | BLOCKED="blocked" | MIXED="mixed";
public ExecModeElements getExecModeAccess() {
- return (unknownRuleExecMode != null) ? unknownRuleExecMode : (unknownRuleExecMode = new ExecModeElements());
+ return unknownRuleExecMode;
}
public EnumRule getExecModeRule() {
@@ -739,7 +748,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
//RuntimeClass:
// "RuntimeClass" name=ID docu=Documentation? "{" "model" "=" threadModel=ThreadModel "}";
public RuntimeClassElements getRuntimeClassAccess() {
- return (pRuntimeClass != null) ? pRuntimeClass : (pRuntimeClass = new RuntimeClassElements());
+ return pRuntimeClass;
}
public ParserRule getRuntimeClassRule() {
@@ -749,7 +758,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
//enum ThreadModel:
// SINGLE_THREADED="singleThreaded" | MULTI_THREADED="multiThreaded";
public ThreadModelElements getThreadModelAccess() {
- return (unknownRuleThreadModel != null) ? unknownRuleThreadModel : (unknownRuleThreadModel = new ThreadModelElements());
+ return unknownRuleThreadModel;
}
public EnumRule getThreadModelRule() {
@@ -759,7 +768,7 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
//PRIO returns ecore::EInt hidden():
// ("+" | "-")? INT;
public PRIOElements getPRIOAccess() {
- return (pPRIO != null) ? pPRIO : (pPRIO = new PRIOElements());
+ return pPRIO;
}
public ParserRule getPRIORule() {
@@ -1109,8 +1118,8 @@ public class ETPhysGrammarAccess extends AbstractGrammarElementFinder {
}
//terminal STRING:
- // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
- // "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
+ // "\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
+ // / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
public TerminalRule getSTRINGRule() {
return gaBase.getSTRINGRule();
}
diff --git a/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe2 b/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe2
index 09be319c5..79c720827 100644
--- a/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe2
+++ b/plugins/org.eclipse.etrice.core.etphys/src/org/eclipse/etrice/core/etphys/GenerateETPhys.mwe2
@@ -135,7 +135,7 @@ Workflow {
//fragment = types.TypesGeneratorFragment {}
// generates the required bindings only if the grammar inherits from Xbase
- fragment = xbase.XbaseGeneratorFragment {}
+ //fragment = xbase.XbaseGeneratorFragment {}
// provides a preference page for template proposals
fragment = templates.CodetemplatesGeneratorFragment {}
diff --git a/plugins/org.eclipse.etrice.core.room/.antlr-generator-3.2.0-patch.jar b/plugins/org.eclipse.etrice.core.room/.antlr-generator-3.2.0-patch.jar
new file mode 100644
index 000000000..90516fd7a
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.room/.antlr-generator-3.2.0-patch.jar
Binary files differ
diff --git a/runtime/org.eclipse.etrice.modellib.java/.gitignore b/runtime/org.eclipse.etrice.modellib.java/.gitignore
index f30d372e8..db5801d65 100644
--- a/runtime/org.eclipse.etrice.modellib.java/.gitignore
+++ b/runtime/org.eclipse.etrice.modellib.java/.gitignore
@@ -1,6 +1,10 @@
bin
-doc-gen
-target
+src-gen/*
!src-gen/readme.txt
src-gen-info/*
!src-gen-info/readme.txt
+doc-gen/*
+!doc-gen/readme.txt
+log/*
+!log/readme.txt
+target
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java
deleted file mode 100644
index c64760366..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/ALogService.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package room.basic.service.logging;
-
-import org.eclipse.etrice.runtime.java.messaging.*;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.*;
-
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-import room.basic.service.logging.Log.*;
-
-/*--------------------- begin user code ---------------------*/
-import java.io.*;
-import java.util.*;
-/*--------------------- end user code ---------------------*/
-
-
-public class ALogService extends ActorClassBase {
-
- /*--------------------- begin user code ---------------------*/
- FileOutputStream file = null;
- PrintStream p = null;
- static long tStart = System.currentTimeMillis();
- /*--------------------- end user code ---------------------*/
-
- //--------------------- ports
-
- //--------------------- saps
-
- //--------------------- services
- protected LogReplPort log = null;
-
- //--------------------- optional actors
-
- //--------------------- interface item IDs
- public static final int IFITEM_log = 1;
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
- public void destroyUser() {
- if (p!= null) {
- p.flush();
- p.close();
- p=null;
- }
- }
-
- //--------------------- construction
- public ALogService(IRTObject parent, String name) {
- super(parent, name);
- setClassName("ALogService");
-
- // initialize attributes
-
- // own ports
-
- // own saps
-
- // own service implementations
- log = new LogReplPort(this, "log", IFITEM_log);
-
- // sub actors
-
- // wiring
-
-
-
- }
-
- /* --------------------- attribute setters and getters */
-
-
- //--------------------- port getters
- public LogReplPort getLog (){
- return this.log;
- }
-
- //--------------------- lifecycle functions
- public void stop(){
- stopUser();
- super.stop();
- }
-
- public void destroy() {
- DebuggingService.getInstance().addMessageActorDestroy(this);
- super.destroy();
- }
-
- /* state IDs */
- public static final int STATE_closed = 2;
- public static final int STATE_opened = 3;
- public static final int STATE_MAX = 4;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__closed = 1;
- public static final int CHAIN_TRANS_open_FROM_closed_TO_opened_BY_openlog = 2;
- public static final int CHAIN_TRANS_tr0_FROM_opened_TO_closed_BY_closelog = 3;
- public static final int CHAIN_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1 = 4;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_log__open = IFITEM_log + EVT_SHIFT*Log.IN_open;
- public static final int TRIG_log__close = IFITEM_log + EVT_SHIFT*Log.IN_close;
- public static final int TRIG_log__internalLog = IFITEM_log + EVT_SHIFT*Log.IN_internalLog;
-
- // state names
- protected static final String stateStrings[] = {
- "<no state>",
- "<top>",
- "closed",
- "opened"
- };
-
- // history
- protected int history[] = {NO_STATE, NO_STATE, NO_STATE, NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_open_FROM_closed_TO_opened_BY_openlog(InterfaceItemBase ifitem, String fileName) {
- Date d=new Date(tStart);
- try{
- file=new FileOutputStream(fileName);
- p=new PrintStream(file);
- p.println("Log opened at "+ d.toString());
- p.println("--------------------------------------------------");
- } catch (Exception e){
- System.out.println("Log file not opened !");
- }
- }
- protected void action_TRANS_tr0_FROM_opened_TO_closed_BY_closelog(InterfaceItemBase ifitem) {
- p.flush();
- p.close();
- p=null;
- }
- protected void action_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1(InterfaceItemBase ifitem, InternalLogData data) {
- p.println("Timestamp: " + Long.toString(data.timeStamp-tStart) + "ms");
- p.println("SenderInstance: "+ data.sender);
- p.println("UserString: " + data.userString);
- p.println("--------------------------------------------------");
- System.out.printf(data.userString);
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current__et - the current state
- * @param to - the final parent state
- */
- private void exitTo(int current__et, int to) {
- while (current__et!=to) {
- switch (current__et) {
- case STATE_closed:
- this.history[STATE_TOP] = STATE_closed;
- current__et = STATE_TOP;
- break;
- case STATE_opened:
- this.history[STATE_TOP] = STATE_opened;
- current__et = STATE_TOP;
- break;
- default:
- /* should not occur */
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain__et - the chain ID
- * @param generic_data__et - the generic data pointer
- * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
- */
- private int executeTransitionChain(int chain__et, InterfaceItemBase ifitem, Object generic_data__et) {
- switch (chain__et) {
- case CHAIN_TRANS_INITIAL_TO__closed:
- {
- return STATE_closed;
- }
- case CHAIN_TRANS_open_FROM_closed_TO_opened_BY_openlog:
- {
- String fileName = (String) generic_data__et;
- action_TRANS_open_FROM_closed_TO_opened_BY_openlog(ifitem, fileName);
- return STATE_opened;
- }
- case CHAIN_TRANS_tr0_FROM_opened_TO_closed_BY_closelog:
- {
- action_TRANS_tr0_FROM_opened_TO_closed_BY_closelog(ifitem);
- return STATE_closed;
- }
- case CHAIN_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1:
- {
- InternalLogData data = (InternalLogData) generic_data__et;
- action_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1(ifitem, data);
- return STATE_opened;
- }
- default:
- /* should not occur */
- break;
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state__et - the state which is entered
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state__et) {
- boolean skip_entry__et = false;
- if (state__et >= STATE_MAX) {
- state__et = (state__et - STATE_MAX);
- skip_entry__et = true;
- }
- while (true) {
- switch (state__et) {
- case STATE_closed:
- /* in leaf state: return state id */
- return STATE_closed;
- case STATE_opened:
- /* in leaf state: return state id */
- return STATE_opened;
- case STATE_TOP:
- state__et = this.history[STATE_TOP];
- break;
- default:
- /* should not occur */
- break;
- }
- skip_entry__et = false;
- }
- /* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */
- }
-
- public void executeInitTransition() {
- int chain__et = CHAIN_TRANS_INITIAL_TO__closed;
- int next__et = executeTransitionChain(chain__et, null, null);
- next__et = enterHistory(next__et);
- setState(next__et);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data__et) {
- int trigger__et = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain__et = NOT_CAUGHT;
- int catching_state__et = NO_STATE;
-
- if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
- switch (getState()) {
- case STATE_closed:
- switch(trigger__et) {
- case TRIG_log__open:
- {
- chain__et = CHAIN_TRANS_open_FROM_closed_TO_opened_BY_openlog;
- catching_state__et = STATE_TOP;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- break;
- case STATE_opened:
- switch(trigger__et) {
- case TRIG_log__close:
- {
- chain__et = CHAIN_TRANS_tr0_FROM_opened_TO_closed_BY_closelog;
- catching_state__et = STATE_TOP;
- }
- break;
- case TRIG_log__internalLog:
- {
- chain__et = CHAIN_TRANS_tr1_FROM_opened_TO_opened_BY_internalLoglog_tr1;
- catching_state__et = STATE_TOP;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- }
- if (chain__et != NOT_CAUGHT) {
- exitTo(getState(), catching_state__et);
- {
- int next__et = executeTransitionChain(chain__et, ifitem, generic_data__et);
- next__et = enterHistory(next__et);
- setState(next__et);
- }
- }
- }
-
-
-};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/InternalLogData.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/InternalLogData.java
deleted file mode 100644
index e4e1d55ea..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/InternalLogData.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package room.basic.service.logging;
-
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-import java.io.Serializable;
-
-
-
-
-public class InternalLogData implements Serializable {
-
- private static final long serialVersionUID = 463634558L;
-
-
- /*--------------------- attributes ---------------------*/
- String userString;
- String sender;
- long timeStamp;
-
- /* --------------------- attribute setters and getters */
- public void setUserString (String userString) {
- this.userString = userString;
- }
- public String getUserString () {
- return this.userString;
- }
- public void setSender (String sender) {
- this.sender = sender;
- }
- public String getSender () {
- return this.sender;
- }
- public void setTimeStamp (long timeStamp) {
- this.timeStamp = timeStamp;
- }
- public long getTimeStamp () {
- return this.timeStamp;
- }
-
- /*--------------------- operations ---------------------*/
-
- // default constructor
- public InternalLogData() {
- super();
-
- // initialize attributes
- this.setUserString("");
- this.setSender("");
- }
-
- // constructor using fields
- public InternalLogData(String userString, String sender, long timeStamp) {
- super();
-
- this.userString = userString;
- this.sender = sender;
- this.timeStamp = timeStamp;
- }
-
- // deep copy
- public InternalLogData deepCopy() {
- InternalLogData copy = new InternalLogData();
- copy.userString = userString;
- copy.sender = sender;
- copy.timeStamp = timeStamp;
- return copy;
- }
-};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/Log.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/Log.java
deleted file mode 100644
index 988e0e1df..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/logging/Log.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package room.basic.service.logging;
-
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.EventMessage;
-import org.eclipse.etrice.runtime.java.modelbase.EventWithDataMessage;
-import org.eclipse.etrice.runtime.java.modelbase.IInterfaceItemOwner;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.modelbase.PortBase;
-import org.eclipse.etrice.runtime.java.modelbase.ReplicatedPortBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-public class Log {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int IN_open = 1;
- public static final int IN_close = 2;
- public static final int IN_internalLog = 3;
- public static final int MSG_MAX = 4;
-
- /*--------------------- begin user code ---------------------*/
- public static final int LOG_LEVEL_LOW = 1;
- public static final int LOG_LEVEL_MEDIUM = 2;
- public static final int LOG_LEVEL_HIGH = 3;
- /*--------------------- end user code ---------------------*/
-
- private static String messageStrings[] = {"MIN", "open","close","internalLog","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class LogPort extends PortBase {
- // constructors
- public LogPort(IInterfaceItemOwner actor, String name, int localId) {
- this(actor, name, localId, 0);
- }
- public LogPort(IInterfaceItemOwner actor, String name, int localId, int idx) {
- super(actor, name, localId, idx);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- public void destroy() {
- DebuggingService.getInstance().removePortInstance(this);
- super.destroy();
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (0 < msg.getEvtId() && msg.getEvtId() < MSG_MAX) {
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- }
-
- // replicated port class
- static public class LogReplPort extends ReplicatedPortBase {
-
- public LogReplPort(IInterfaceItemOwner actor, String name, int localId) {
- super(actor, name, localId);
- }
-
- public int getReplication() {
- return getNInterfaceItems();
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public LogPort get(int idx) {
- return (LogPort) getInterfaceItem(idx);
- }
-
- protected InterfaceItemBase createInterfaceItem(IInterfaceItemOwner rcv, String name, int lid, int idx) {
- return new LogPort(rcv, name, lid, idx);
- }
-
- // outgoing messages
- }
-
-
- // port class
- static public class LogConjPort extends PortBase {
- /*--------------------- begin user code ---------------------*/
- static int logLevel=0;
- InternalLogData d = new InternalLogData();
- /*--------------------- end user code ---------------------*/
- // constructors
- public LogConjPort(IInterfaceItemOwner actor, String name, int localId) {
- this(actor, name, localId, 0);
- }
- public LogConjPort(IInterfaceItemOwner actor, String name, int localId, int idx) {
- super(actor, name, localId, idx);
- // initialize attributes
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- public void destroy() {
- DebuggingService.getInstance().removePortInstance(this);
- super.destroy();
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (0 < msg.getEvtId() && msg.getEvtId() < MSG_MAX) {
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
- /*--------------------- attributes ---------------------*/
- /* --------------------- attribute setters and getters */
- /*--------------------- operations ---------------------*/
- public void setLogLevel(int l) {
- logLevel=l;
- if (logLevel > LOG_LEVEL_HIGH) logLevel=LOG_LEVEL_HIGH;
- }
- public void log(int logLevel, String userString) {
- if (logLevel>LogConjPort.logLevel){
- d.userString=userString;
- d.timeStamp=System.currentTimeMillis();
- d.sender=getInstancePath();
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalLog, d.deepCopy()));
- }
- }
-
- // sent messages
- public void open(String fileName) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_open]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_open, fileName));
- }
- public void close() {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_close]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_close));
- }
- private void internalLog(InternalLogData data) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_internalLog]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalLog, data.deepCopy()));
- }
- public void internalLog(String userString, String sender, long timeStamp) {
- internalLog(new InternalLogData(userString, sender, timeStamp));
- }
- }
-
- // replicated port class
- static public class LogConjReplPort extends ReplicatedPortBase {
-
- public LogConjReplPort(IInterfaceItemOwner actor, String name, int localId) {
- super(actor, name, localId);
- }
-
- public int getReplication() {
- return getNInterfaceItems();
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public LogConjPort get(int idx) {
- return (LogConjPort) getInterfaceItem(idx);
- }
-
- protected InterfaceItemBase createInterfaceItem(IInterfaceItemOwner rcv, String name, int lid, int idx) {
- return new LogConjPort(rcv, name, lid, idx);
- }
-
- // incoming messages
- public void open(String fileName){
- for (InterfaceItemBase item : getItems()) {
- ((LogConjPort)item).open( fileName);
- }
- }
- public void close(){
- for (InterfaceItemBase item : getItems()) {
- ((LogConjPort)item).close();
- }
- }
- private void internalLog(InternalLogData data){
- for (InterfaceItemBase item : getItems()) {
- ((LogConjPort)item).internalLog( data);
- }
- }
- }
-
-}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java
deleted file mode 100644
index 657334041..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpClient.java
+++ /dev/null
@@ -1,378 +0,0 @@
-package room.basic.service.tcp;
-
-import org.eclipse.etrice.runtime.java.messaging.*;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.*;
-
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-import room.basic.service.tcp.PTcpControl.*;
-import room.basic.service.tcp.PTcpPayload.*;
-
-/*--------------------- begin user code ---------------------*/
-import java.net.Socket;
-import java.io.*;
-
- class ClientRxThread extends Thread{
- private Socket sock;
- PTcpPayloadPort port;
- public ClientRxThread (PTcpPayloadPort port, Socket sock){
- this.sock = sock;
- this.port = port;
- }
- public void run(){
- try{
- InputStream in = sock.getInputStream();
- DTcpPayload d = new DTcpPayload();
- d.setConnectionId(0);
- int c;
- while ((c=in.read(d.getData()))!=-1){
- d.setLength(c);
- port.receive(d);
- }
- }catch (IOException e){
- System.err.println("ClientRx: " + e.toString());
- }
-
- }
- }
-/*--------------------- end user code ---------------------*/
-
-
-public class ATcpClient extends ActorClassBase {
-
- /*--------------------- begin user code ---------------------*/
- Socket socket;
- InputStream in;
- OutputStream out;
- /*--------------------- end user code ---------------------*/
-
- //--------------------- ports
- protected PTcpControlPort ControlPort = null;
- protected PTcpPayloadPort PayloadPort = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- optional actors
-
- //--------------------- interface item IDs
- public static final int IFITEM_ControlPort = 1;
- public static final int IFITEM_PayloadPort = 2;
-
- /*--------------------- attributes ---------------------*/
- int lastError;
- /*--------------------- operations ---------------------*/
- public void stopUser() {
- try{
- if(socket != null){
- socket.close();
- }
- }catch(IOException e){
- System.err.println(e.toString());}
- }
-
- //--------------------- construction
- public ATcpClient(IRTObject parent, String name) {
- super(parent, name);
- setClassName("ATcpClient");
-
- // initialize attributes
- this.setLastError(0);
-
- // own ports
- ControlPort = new PTcpControlPort(this, "ControlPort", IFITEM_ControlPort);
- PayloadPort = new PTcpPayloadPort(this, "PayloadPort", IFITEM_PayloadPort);
-
- // own saps
-
- // own service implementations
-
- // sub actors
-
- // wiring
-
-
-
- }
-
- /* --------------------- attribute setters and getters */
- public void setLastError (int lastError) {
- this.lastError = lastError;
- }
- public int getLastError () {
- return this.lastError;
- }
-
-
- //--------------------- port getters
- public PTcpControlPort getControlPort (){
- return this.ControlPort;
- }
- public PTcpPayloadPort getPayloadPort (){
- return this.PayloadPort;
- }
-
- //--------------------- lifecycle functions
- public void stop(){
- stopUser();
- super.stop();
- }
-
- public void destroy() {
- DebuggingService.getInstance().addMessageActorDestroy(this);
- super.destroy();
- }
-
- /* state IDs */
- public static final int STATE_closed = 2;
- public static final int STATE_opened = 3;
- public static final int STATE_error = 4;
- public static final int STATE_MAX = 5;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__closed = 1;
- public static final int CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort = 2;
- public static final int CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort = 3;
- public static final int CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3 = 4;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_ControlPort__open = IFITEM_ControlPort + EVT_SHIFT*PTcpControl.IN_open;
- public static final int TRIG_ControlPort__close = IFITEM_ControlPort + EVT_SHIFT*PTcpControl.IN_close;
- public static final int TRIG_PayloadPort__send = IFITEM_PayloadPort + EVT_SHIFT*PTcpPayload.IN_send;
-
- // state names
- protected static final String stateStrings[] = {
- "<no state>",
- "<top>",
- "closed",
- "opened",
- "error"
- };
-
- // history
- protected int history[] = {NO_STATE, NO_STATE, NO_STATE, NO_STATE, NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__closed() {
- System.out.println("Client Init !");
- }
- protected void action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(InterfaceItemBase ifitem, DTcpControl data) {
- lastError=0;
- try{
- socket = new Socket(data.IPAddr,data.TcpPort);
- (new ClientRxThread(PayloadPort, socket)).start();
- out = socket.getOutputStream();
- }catch(IOException e){
- System.err.println(e.toString());
- lastError=1;
- }
- }
- protected void action_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort(InterfaceItemBase ifitem) {
- try{
- if (socket!=null){
- socket.close();
- }
- } catch (IOException e){
- System.err.println(e.toString());
- }
- }
- protected void action_TRANS_tr2_FROM_cp0_TO_opened(InterfaceItemBase ifitem, DTcpControl data) {
- ControlPort.established();
- }
- protected void action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(InterfaceItemBase ifitem, DTcpControl data) {
- ControlPort.error();
- try{
- socket.close();
- } catch(IOException e){
- System.err.println(e.toString());
- }
- }
- protected void action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(InterfaceItemBase ifitem, DTcpPayload data) {
- try{
- out.write(data.getData(),0,data.length);
- }catch(IOException e){
- System.err.println(e.toString());
- }
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current__et - the current state
- * @param to - the final parent state
- */
- private void exitTo(int current__et, int to) {
- while (current__et!=to) {
- switch (current__et) {
- case STATE_closed:
- this.history[STATE_TOP] = STATE_closed;
- current__et = STATE_TOP;
- break;
- case STATE_opened:
- this.history[STATE_TOP] = STATE_opened;
- current__et = STATE_TOP;
- break;
- case STATE_error:
- this.history[STATE_TOP] = STATE_error;
- current__et = STATE_TOP;
- break;
- default:
- /* should not occur */
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain__et - the chain ID
- * @param generic_data__et - the generic data pointer
- * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
- */
- private int executeTransitionChain(int chain__et, InterfaceItemBase ifitem, Object generic_data__et) {
- switch (chain__et) {
- case CHAIN_TRANS_INITIAL_TO__closed:
- {
- action_TRANS_INITIAL_TO__closed();
- return STATE_closed;
- }
- case CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort:
- {
- DTcpControl data = (DTcpControl) generic_data__et;
- action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(ifitem, data);
- if (lastError!=0) {
- action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(ifitem, data);
- return STATE_error;}
- else {
- action_TRANS_tr2_FROM_cp0_TO_opened(ifitem, data);
- return STATE_opened;}
- }
- case CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort:
- {
- action_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort(ifitem);
- return STATE_closed;
- }
- case CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3:
- {
- DTcpPayload data = (DTcpPayload) generic_data__et;
- action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(ifitem, data);
- return STATE_opened;
- }
- default:
- /* should not occur */
- break;
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state__et - the state which is entered
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state__et) {
- boolean skip_entry__et = false;
- if (state__et >= STATE_MAX) {
- state__et = (state__et - STATE_MAX);
- skip_entry__et = true;
- }
- while (true) {
- switch (state__et) {
- case STATE_closed:
- /* in leaf state: return state id */
- return STATE_closed;
- case STATE_opened:
- /* in leaf state: return state id */
- return STATE_opened;
- case STATE_error:
- /* in leaf state: return state id */
- return STATE_error;
- case STATE_TOP:
- state__et = this.history[STATE_TOP];
- break;
- default:
- /* should not occur */
- break;
- }
- skip_entry__et = false;
- }
- /* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */
- }
-
- public void executeInitTransition() {
- int chain__et = CHAIN_TRANS_INITIAL_TO__closed;
- int next__et = executeTransitionChain(chain__et, null, null);
- next__et = enterHistory(next__et);
- setState(next__et);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data__et) {
- int trigger__et = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain__et = NOT_CAUGHT;
- int catching_state__et = NO_STATE;
-
- if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
- switch (getState()) {
- case STATE_closed:
- switch(trigger__et) {
- case TRIG_ControlPort__open:
- {
- chain__et = CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
- catching_state__et = STATE_TOP;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- break;
- case STATE_opened:
- switch(trigger__et) {
- case TRIG_ControlPort__close:
- {
- chain__et = CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
- catching_state__et = STATE_TOP;
- }
- break;
- case TRIG_PayloadPort__send:
- {
- chain__et = CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
- catching_state__et = STATE_TOP;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- break;
- case STATE_error:
- break;
- default:
- /* should not occur */
- break;
- }
- }
- if (chain__et != NOT_CAUGHT) {
- exitTo(getState(), catching_state__et);
- {
- int next__et = executeTransitionChain(chain__et, ifitem, generic_data__et);
- next__et = enterHistory(next__et);
- setState(next__et);
- }
- }
- }
-
-
-};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java
deleted file mode 100644
index 40c2fa030..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/ATcpServer.java
+++ /dev/null
@@ -1,417 +0,0 @@
-package room.basic.service.tcp;
-
-import org.eclipse.etrice.runtime.java.messaging.*;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.*;
-
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-import room.basic.service.tcp.PTcpControl.*;
-import room.basic.service.tcp.PTcpPayload.*;
-
-/*--------------------- begin user code ---------------------*/
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.io.*;
-import java.util.*;
-
- class ServerRxThread extends Thread{
- private int connectionId;
- private Socket sock;
- PTcpPayloadPort port;
-
- public ServerRxThread (int connectionId, PTcpPayloadPort port, Socket sock){
- this.sock = sock;
- this.connectionId = connectionId;
- this.port = port;
- }
-
- public void run(){
- try{
- InputStream in = sock.getInputStream();
- DTcpPayload d = new DTcpPayload();
- d.setConnectionId(connectionId);
- int c;
- while ((c=in.read(d.getData()))!=-1){
- d.setLength(c);
- port.receive(d);
- }
- }catch (IOException e){
- System.err.println("ServerRx: " + e.toString());
- }
- }
- }
-
- class ServerAcceptThread extends Thread{
- private ServerSocket sock;
- private PTcpPayloadPort port;
- private ATcpServer parent;
- public ServerAcceptThread (PTcpPayloadPort port, ServerSocket sock, ATcpServer parent){
- this.sock = sock;
- this.port = port;
- this.parent = parent;
- }
- public void run(){
- int cnt=0;
- try{
- while (true){
- Socket s = sock.accept();
- parent.addOutStreamToHashmap(cnt, s.getOutputStream());
- (new ServerRxThread(cnt, port, s)).start();
- cnt++;
- }
- }catch (IOException e){
- System.err.println("Server Accept: " + e.toString());
- }
- }
- }
-
-/*--------------------- end user code ---------------------*/
-
-
-public class ATcpServer extends ActorClassBase {
-
- /*--------------------- begin user code ---------------------*/
- ServerSocket socket = null;
- InputStream in = null;
- OutputStream out = null;
- Hashtable<Integer,OutputStream> outStreams = new Hashtable<Integer,OutputStream>();
-
- synchronized protected void addOutStreamToHashmap(int cnt, OutputStream out){
- outStreams.put(cnt,out);
- }
-
- /*--------------------- end user code ---------------------*/
-
- //--------------------- ports
- protected PTcpControlPort ControlPort = null;
- protected PTcpPayloadPort PayloadPort = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- optional actors
-
- //--------------------- interface item IDs
- public static final int IFITEM_ControlPort = 1;
- public static final int IFITEM_PayloadPort = 2;
-
- /*--------------------- attributes ---------------------*/
- int lastError;
- int payloadPortReplocation;
- /*--------------------- operations ---------------------*/
- public void stopUser() {
- try{
- if(socket != null){
- socket.close();
- }
- }catch(IOException e){
- System.err.println(e.toString());}
- }
-
- //--------------------- construction
- public ATcpServer(IRTObject parent, String name) {
- super(parent, name);
- setClassName("ATcpServer");
-
- // initialize attributes
- this.setLastError(0);
- this.setPayloadPortReplocation(0);
-
- // own ports
- ControlPort = new PTcpControlPort(this, "ControlPort", IFITEM_ControlPort);
- PayloadPort = new PTcpPayloadPort(this, "PayloadPort", IFITEM_PayloadPort);
-
- // own saps
-
- // own service implementations
-
- // sub actors
-
- // wiring
-
-
-
- }
-
- /* --------------------- attribute setters and getters */
- public void setLastError (int lastError) {
- this.lastError = lastError;
- }
- public int getLastError () {
- return this.lastError;
- }
- public void setPayloadPortReplocation (int payloadPortReplocation) {
- this.payloadPortReplocation = payloadPortReplocation;
- }
- public int getPayloadPortReplocation () {
- return this.payloadPortReplocation;
- }
-
-
- //--------------------- port getters
- public PTcpControlPort getControlPort (){
- return this.ControlPort;
- }
- public PTcpPayloadPort getPayloadPort (){
- return this.PayloadPort;
- }
-
- //--------------------- lifecycle functions
- public void stop(){
- stopUser();
- super.stop();
- }
-
- public void destroy() {
- DebuggingService.getInstance().addMessageActorDestroy(this);
- super.destroy();
- }
-
- /* state IDs */
- public static final int STATE_closed = 2;
- public static final int STATE_opened = 3;
- public static final int STATE_error = 4;
- public static final int STATE_MAX = 5;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__closed = 1;
- public static final int CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort = 2;
- public static final int CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort = 3;
- public static final int CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3 = 4;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_ControlPort__open = IFITEM_ControlPort + EVT_SHIFT*PTcpControl.IN_open;
- public static final int TRIG_ControlPort__close = IFITEM_ControlPort + EVT_SHIFT*PTcpControl.IN_close;
- public static final int TRIG_PayloadPort__send = IFITEM_PayloadPort + EVT_SHIFT*PTcpPayload.IN_send;
-
- // state names
- protected static final String stateStrings[] = {
- "<no state>",
- "<top>",
- "closed",
- "opened",
- "error"
- };
-
- // history
- protected int history[] = {NO_STATE, NO_STATE, NO_STATE, NO_STATE, NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(InterfaceItemBase ifitem, DTcpControl data) {
- lastError=0;
- try{
- socket = new ServerSocket(data.TcpPort);
- (new ServerAcceptThread(PayloadPort, socket, this)).start();
- }catch(IOException e){
- System.err.println(e.toString());
- lastError=1;
- }
- }
- protected void action_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort(InterfaceItemBase ifitem) {
- try{
- if(socket!=null){
- socket.close();
- }
- }catch(IOException e){
- System.err.println(e.toString());
- }
- }
- protected void action_TRANS_tr2_FROM_cp0_TO_opened(InterfaceItemBase ifitem, DTcpControl data) {
- ControlPort.established();
- }
- protected void action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(InterfaceItemBase ifitem, DTcpControl data) {
- ControlPort.error();
- try{
- socket.close();
- } catch(IOException e){
- System.err.println(e.toString());
- }
- }
- protected void action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(InterfaceItemBase ifitem, DTcpPayload data) {
- try{
- outStreams.get(data.getConnectionId()).write(data.getData(),0,data.length);
- }catch(IOException e){
- System.err.println(e.toString());
- }
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current__et - the current state
- * @param to - the final parent state
- */
- private void exitTo(int current__et, int to) {
- while (current__et!=to) {
- switch (current__et) {
- case STATE_closed:
- this.history[STATE_TOP] = STATE_closed;
- current__et = STATE_TOP;
- break;
- case STATE_opened:
- this.history[STATE_TOP] = STATE_opened;
- current__et = STATE_TOP;
- break;
- case STATE_error:
- this.history[STATE_TOP] = STATE_error;
- current__et = STATE_TOP;
- break;
- default:
- /* should not occur */
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain__et - the chain ID
- * @param generic_data__et - the generic data pointer
- * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
- */
- private int executeTransitionChain(int chain__et, InterfaceItemBase ifitem, Object generic_data__et) {
- switch (chain__et) {
- case CHAIN_TRANS_INITIAL_TO__closed:
- {
- return STATE_closed;
- }
- case CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort:
- {
- DTcpControl data = (DTcpControl) generic_data__et;
- action_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort(ifitem, data);
- if (lastError!=0) {
- action_TRANS_socketError_FROM_cp0_TO_error_COND_socketError(ifitem, data);
- return STATE_error;}
- else {
- action_TRANS_tr2_FROM_cp0_TO_opened(ifitem, data);
- return STATE_opened;}
- }
- case CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort:
- {
- action_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort(ifitem);
- return STATE_closed;
- }
- case CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3:
- {
- DTcpPayload data = (DTcpPayload) generic_data__et;
- action_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3(ifitem, data);
- return STATE_opened;
- }
- default:
- /* should not occur */
- break;
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state__et - the state which is entered
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state__et) {
- boolean skip_entry__et = false;
- if (state__et >= STATE_MAX) {
- state__et = (state__et - STATE_MAX);
- skip_entry__et = true;
- }
- while (true) {
- switch (state__et) {
- case STATE_closed:
- /* in leaf state: return state id */
- return STATE_closed;
- case STATE_opened:
- /* in leaf state: return state id */
- return STATE_opened;
- case STATE_error:
- /* in leaf state: return state id */
- return STATE_error;
- case STATE_TOP:
- state__et = this.history[STATE_TOP];
- break;
- default:
- /* should not occur */
- break;
- }
- skip_entry__et = false;
- }
- /* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */
- }
-
- public void executeInitTransition() {
- int chain__et = CHAIN_TRANS_INITIAL_TO__closed;
- int next__et = executeTransitionChain(chain__et, null, null);
- next__et = enterHistory(next__et);
- setState(next__et);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data__et) {
- int trigger__et = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain__et = NOT_CAUGHT;
- int catching_state__et = NO_STATE;
-
- if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
- switch (getState()) {
- case STATE_closed:
- switch(trigger__et) {
- case TRIG_ControlPort__open:
- {
- chain__et = CHAIN_TRANS_tr0_FROM_closed_TO_cp0_BY_openControlPort;
- catching_state__et = STATE_TOP;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- break;
- case STATE_opened:
- switch(trigger__et) {
- case TRIG_ControlPort__close:
- {
- chain__et = CHAIN_TRANS_tr1_FROM_opened_TO_closed_BY_closeControlPort;
- catching_state__et = STATE_TOP;
- }
- break;
- case TRIG_PayloadPort__send:
- {
- chain__et = CHAIN_TRANS_tr3_FROM_opened_TO_opened_BY_sendPayloadPort_tr3;
- catching_state__et = STATE_TOP;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- break;
- case STATE_error:
- break;
- default:
- /* should not occur */
- break;
- }
- }
- if (chain__et != NOT_CAUGHT) {
- exitTo(getState(), catching_state__et);
- {
- int next__et = executeTransitionChain(chain__et, ifitem, generic_data__et);
- next__et = enterHistory(next__et);
- setState(next__et);
- }
- }
- }
-
-
-};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpControl.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpControl.java
deleted file mode 100644
index d943fe9c4..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpControl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package room.basic.service.tcp;
-
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-import java.io.Serializable;
-
-
-
-
-public class DTcpControl implements Serializable {
-
- private static final long serialVersionUID = -156692117L;
-
-
- /*--------------------- attributes ---------------------*/
- String IPAddr;
- int TcpPort;
-
- /* --------------------- attribute setters and getters */
- public void setIPAddr (String IPAddr) {
- this.IPAddr = IPAddr;
- }
- public String getIPAddr () {
- return this.IPAddr;
- }
- public void setTcpPort (int TcpPort) {
- this.TcpPort = TcpPort;
- }
- public int getTcpPort () {
- return this.TcpPort;
- }
-
- /*--------------------- operations ---------------------*/
-
- // default constructor
- public DTcpControl() {
- super();
-
- // initialize attributes
- this.setIPAddr("");
- }
-
- // constructor using fields
- public DTcpControl(String IPAddr, int TcpPort) {
- super();
-
- this.IPAddr = IPAddr;
- this.TcpPort = TcpPort;
- }
-
- // deep copy
- public DTcpControl deepCopy() {
- DTcpControl copy = new DTcpControl();
- copy.IPAddr = IPAddr;
- copy.TcpPort = TcpPort;
- return copy;
- }
-};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpPayload.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpPayload.java
deleted file mode 100644
index a724f7df9..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/DTcpPayload.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package room.basic.service.tcp;
-
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-import java.io.Serializable;
-
-
-
-
-public class DTcpPayload implements Serializable {
-
- private static final long serialVersionUID = -1894937188L;
-
-
- /*--------------------- attributes ---------------------*/
- int connectionId;
- int length;
- byte data[];
-
- /* --------------------- attribute setters and getters */
- public void setConnectionId (int connectionId) {
- this.connectionId = connectionId;
- }
- public int getConnectionId () {
- return this.connectionId;
- }
- public void setLength (int length) {
- this.length = length;
- }
- public int getLength () {
- return this.length;
- }
- public void setData (byte[] data) {
- this.data = data;
- }
- public byte[] getData () {
- return this.data;
- }
-
- /*--------------------- operations ---------------------*/
-
- // default constructor
- public DTcpPayload() {
- super();
-
- // initialize attributes
- {
- byte[] array = new byte[1000];
- for (int i=0;i<1000;i++){
- array[i] = (byte)0;
- }
- this.setData(array);
- }
- }
-
- // constructor using fields
- public DTcpPayload(int connectionId, int length, byte[] data) {
- super();
-
- this.connectionId = connectionId;
- this.length = length;
- this.data = data;
- }
-
- // deep copy
- public DTcpPayload deepCopy() {
- DTcpPayload copy = new DTcpPayload();
- copy.connectionId = connectionId;
- copy.length = length;
- for (int i=0;i<data.length;i++){
- copy.data[i] = data[i];
- }
- return copy;
- }
-};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/PTcpControl.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/PTcpControl.java
deleted file mode 100644
index 7575e548b..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/PTcpControl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package room.basic.service.tcp;
-
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.EventMessage;
-import org.eclipse.etrice.runtime.java.modelbase.EventWithDataMessage;
-import org.eclipse.etrice.runtime.java.modelbase.IInterfaceItemOwner;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.modelbase.PortBase;
-import org.eclipse.etrice.runtime.java.modelbase.ReplicatedPortBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-public class PTcpControl {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int OUT_established = 1;
- public static final int OUT_error = 2;
- public static final int IN_open = 3;
- public static final int IN_close = 4;
- public static final int MSG_MAX = 5;
-
-
- private static String messageStrings[] = {"MIN", "established","error", "open","close","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class PTcpControlPort extends PortBase {
- // constructors
- public PTcpControlPort(IInterfaceItemOwner actor, String name, int localId) {
- this(actor, name, localId, 0);
- }
- public PTcpControlPort(IInterfaceItemOwner actor, String name, int localId, int idx) {
- super(actor, name, localId, idx);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- public void destroy() {
- DebuggingService.getInstance().removePortInstance(this);
- super.destroy();
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (0 < msg.getEvtId() && msg.getEvtId() < MSG_MAX) {
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void established() {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_established]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), OUT_established));
- }
- public void error() {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_error]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), OUT_error));
- }
- }
-
- // replicated port class
- static public class PTcpControlReplPort extends ReplicatedPortBase {
-
- public PTcpControlReplPort(IInterfaceItemOwner actor, String name, int localId) {
- super(actor, name, localId);
- }
-
- public int getReplication() {
- return getNInterfaceItems();
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PTcpControlPort get(int idx) {
- return (PTcpControlPort) getInterfaceItem(idx);
- }
-
- protected InterfaceItemBase createInterfaceItem(IInterfaceItemOwner rcv, String name, int lid, int idx) {
- return new PTcpControlPort(rcv, name, lid, idx);
- }
-
- // outgoing messages
- public void established(){
- for (InterfaceItemBase item : getItems()) {
- ((PTcpControlPort)item).established();
- }
- }
- public void error(){
- for (InterfaceItemBase item : getItems()) {
- ((PTcpControlPort)item).error();
- }
- }
- }
-
-
- // port class
- static public class PTcpControlConjPort extends PortBase {
- // constructors
- public PTcpControlConjPort(IInterfaceItemOwner actor, String name, int localId) {
- this(actor, name, localId, 0);
- }
- public PTcpControlConjPort(IInterfaceItemOwner actor, String name, int localId, int idx) {
- super(actor, name, localId, idx);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- public void destroy() {
- DebuggingService.getInstance().removePortInstance(this);
- super.destroy();
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (0 < msg.getEvtId() && msg.getEvtId() < MSG_MAX) {
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void open(DTcpControl data) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_open]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_open, data.deepCopy()));
- }
- public void open(String IPAddr, int TcpPort) {
- open(new DTcpControl(IPAddr, TcpPort));
- }
- public void close() {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_close]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_close));
- }
- }
-
- // replicated port class
- static public class PTcpControlConjReplPort extends ReplicatedPortBase {
-
- public PTcpControlConjReplPort(IInterfaceItemOwner actor, String name, int localId) {
- super(actor, name, localId);
- }
-
- public int getReplication() {
- return getNInterfaceItems();
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PTcpControlConjPort get(int idx) {
- return (PTcpControlConjPort) getInterfaceItem(idx);
- }
-
- protected InterfaceItemBase createInterfaceItem(IInterfaceItemOwner rcv, String name, int lid, int idx) {
- return new PTcpControlConjPort(rcv, name, lid, idx);
- }
-
- // incoming messages
- public void open(DTcpControl data){
- for (InterfaceItemBase item : getItems()) {
- ((PTcpControlConjPort)item).open( data);
- }
- }
- public void close(){
- for (InterfaceItemBase item : getItems()) {
- ((PTcpControlConjPort)item).close();
- }
- }
- }
-
-}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/PTcpPayload.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/PTcpPayload.java
deleted file mode 100644
index 7b29bcab2..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/tcp/PTcpPayload.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package room.basic.service.tcp;
-
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.EventMessage;
-import org.eclipse.etrice.runtime.java.modelbase.EventWithDataMessage;
-import org.eclipse.etrice.runtime.java.modelbase.IInterfaceItemOwner;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.modelbase.PortBase;
-import org.eclipse.etrice.runtime.java.modelbase.ReplicatedPortBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-public class PTcpPayload {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int OUT_receive = 1;
- public static final int IN_send = 2;
- public static final int MSG_MAX = 3;
-
-
- private static String messageStrings[] = {"MIN", "receive", "send","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class PTcpPayloadPort extends PortBase {
- // constructors
- public PTcpPayloadPort(IInterfaceItemOwner actor, String name, int localId) {
- this(actor, name, localId, 0);
- }
- public PTcpPayloadPort(IInterfaceItemOwner actor, String name, int localId, int idx) {
- super(actor, name, localId, idx);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- public void destroy() {
- DebuggingService.getInstance().removePortInstance(this);
- super.destroy();
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (0 < msg.getEvtId() && msg.getEvtId() < MSG_MAX) {
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void receive(DTcpPayload data) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_receive]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), OUT_receive, data.deepCopy()));
- }
- public void receive(int connectionId, int length, byte[] data) {
- receive(new DTcpPayload(connectionId, length, data));
- }
- }
-
- // replicated port class
- static public class PTcpPayloadReplPort extends ReplicatedPortBase {
-
- public PTcpPayloadReplPort(IInterfaceItemOwner actor, String name, int localId) {
- super(actor, name, localId);
- }
-
- public int getReplication() {
- return getNInterfaceItems();
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PTcpPayloadPort get(int idx) {
- return (PTcpPayloadPort) getInterfaceItem(idx);
- }
-
- protected InterfaceItemBase createInterfaceItem(IInterfaceItemOwner rcv, String name, int lid, int idx) {
- return new PTcpPayloadPort(rcv, name, lid, idx);
- }
-
- // outgoing messages
- public void receive(DTcpPayload data){
- for (InterfaceItemBase item : getItems()) {
- ((PTcpPayloadPort)item).receive( data);
- }
- }
- }
-
-
- // port class
- static public class PTcpPayloadConjPort extends PortBase {
- // constructors
- public PTcpPayloadConjPort(IInterfaceItemOwner actor, String name, int localId) {
- this(actor, name, localId, 0);
- }
- public PTcpPayloadConjPort(IInterfaceItemOwner actor, String name, int localId, int idx) {
- super(actor, name, localId, idx);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- public void destroy() {
- DebuggingService.getInstance().removePortInstance(this);
- super.destroy();
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (0 < msg.getEvtId() && msg.getEvtId() < MSG_MAX) {
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void send(DTcpPayload data) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_send]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_send, data.deepCopy()));
- }
- public void send(int connectionId, int length, byte[] data) {
- send(new DTcpPayload(connectionId, length, data));
- }
- }
-
- // replicated port class
- static public class PTcpPayloadConjReplPort extends ReplicatedPortBase {
-
- public PTcpPayloadConjReplPort(IInterfaceItemOwner actor, String name, int localId) {
- super(actor, name, localId);
- }
-
- public int getReplication() {
- return getNInterfaceItems();
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PTcpPayloadConjPort get(int idx) {
- return (PTcpPayloadConjPort) getInterfaceItem(idx);
- }
-
- protected InterfaceItemBase createInterfaceItem(IInterfaceItemOwner rcv, String name, int lid, int idx) {
- return new PTcpPayloadConjPort(rcv, name, lid, idx);
- }
-
- // incoming messages
- public void send(DTcpPayload data){
- for (InterfaceItemBase item : getItems()) {
- ((PTcpPayloadConjPort)item).send( data);
- }
- }
- }
-
-}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java
deleted file mode 100644
index deaec2deb..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/ATimingService.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package room.basic.service.timing;
-
-import org.eclipse.etrice.runtime.java.messaging.*;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.*;
-
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-import room.basic.service.timing.PTimer.*;
-
-/*--------------------- begin user code ---------------------*/
-import java.util.Timer;
-/*--------------------- end user code ---------------------*/
-
-
-public class ATimingService extends ActorClassBase {
-
- /*--------------------- begin user code ---------------------*/
- private Timer timerService = null;
- private int taskCount = 0;
- private static final int PURGE_LIMIT = 1000;
- /*--------------------- end user code ---------------------*/
-
- //--------------------- ports
-
- //--------------------- saps
-
- //--------------------- services
- protected PTimerReplPort timer = null;
-
- //--------------------- optional actors
-
- //--------------------- interface item IDs
- public static final int IFITEM_timer = 1;
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
- public void stop() {
- System.out.println(toString() + "::stop()");
- timerService.cancel();
- timerService = null;
- }
-
- //--------------------- construction
- public ATimingService(IRTObject parent, String name) {
- super(parent, name);
- setClassName("ATimingService");
-
- // initialize attributes
-
- // own ports
-
- // own saps
-
- // own service implementations
- timer = new PTimerReplPort(this, "timer", IFITEM_timer);
-
- // sub actors
-
- // wiring
-
-
-
- }
-
- /* --------------------- attribute setters and getters */
-
-
- //--------------------- port getters
- public PTimerReplPort getTimer (){
- return this.timer;
- }
-
- //--------------------- lifecycle functions
-
- public void destroy() {
- DebuggingService.getInstance().addMessageActorDestroy(this);
- super.destroy();
- }
-
- /* state IDs */
- public static final int STATE_Operational = 2;
- public static final int STATE_MAX = 3;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__Operational = 1;
- public static final int CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1 = 2;
- public static final int CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3 = 3;
- public static final int CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4 = 4;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_timer__kill = IFITEM_timer + EVT_SHIFT*PTimer.IN_kill;
- public static final int TRIG_timer__internalStartTimer = IFITEM_timer + EVT_SHIFT*PTimer.IN_internalStartTimer;
- public static final int TRIG_timer__internalStartTimeout = IFITEM_timer + EVT_SHIFT*PTimer.IN_internalStartTimeout;
-
- // state names
- protected static final String stateStrings[] = {
- "<no state>",
- "<top>",
- "Operational"
- };
-
- // history
- protected int history[] = {NO_STATE, NO_STATE, NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
- protected void entry_Operational() {
- // prepare
- }
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__Operational() {
- timerService = new Timer();
- }
- protected void action_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1(InterfaceItemBase ifitem, TimerData td) {
- // start timer
- taskCount++;
- if (taskCount>PURGE_LIMIT) timerService.purge();
- int t = td.getTime();
- timerService.scheduleAtFixedRate(((PTimerPort)ifitem).getTask(),t,t);
- }
- protected void action_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3(InterfaceItemBase ifitem, TimerData td) {
- // start timeout
- taskCount++;
- if (taskCount>PURGE_LIMIT) timerService.purge();
- timerService.schedule(((PTimerPort)ifitem).getTask(), ((TimerData)td).getTime());
- }
- protected void action_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4(InterfaceItemBase ifitem) {
- // nothing to do to kill timer (handled by timer)
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current__et - the current state
- * @param to - the final parent state
- */
- private void exitTo(int current__et, int to) {
- while (current__et!=to) {
- switch (current__et) {
- case STATE_Operational:
- this.history[STATE_TOP] = STATE_Operational;
- current__et = STATE_TOP;
- break;
- default:
- /* should not occur */
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain__et - the chain ID
- * @param generic_data__et - the generic data pointer
- * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
- */
- private int executeTransitionChain(int chain__et, InterfaceItemBase ifitem, Object generic_data__et) {
- switch (chain__et) {
- case CHAIN_TRANS_INITIAL_TO__Operational:
- {
- action_TRANS_INITIAL_TO__Operational();
- return STATE_Operational;
- }
- case CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1:
- {
- TimerData td = (TimerData) generic_data__et;
- action_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1(ifitem, td);
- return STATE_Operational;
- }
- case CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3:
- {
- TimerData td = (TimerData) generic_data__et;
- action_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3(ifitem, td);
- return STATE_Operational;
- }
- case CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4:
- {
- action_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4(ifitem);
- return STATE_Operational;
- }
- default:
- /* should not occur */
- break;
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state__et - the state which is entered
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state__et) {
- boolean skip_entry__et = false;
- if (state__et >= STATE_MAX) {
- state__et = (state__et - STATE_MAX);
- skip_entry__et = true;
- }
- while (true) {
- switch (state__et) {
- case STATE_Operational:
- if (!(skip_entry__et)) entry_Operational();
- /* in leaf state: return state id */
- return STATE_Operational;
- case STATE_TOP:
- state__et = this.history[STATE_TOP];
- break;
- default:
- /* should not occur */
- break;
- }
- skip_entry__et = false;
- }
- /* return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true) */
- }
-
- public void executeInitTransition() {
- int chain__et = CHAIN_TRANS_INITIAL_TO__Operational;
- int next__et = executeTransitionChain(chain__et, null, null);
- next__et = enterHistory(next__et);
- setState(next__et);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data__et) {
- int trigger__et = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain__et = NOT_CAUGHT;
- int catching_state__et = NO_STATE;
-
- if (!handleSystemEvent(ifitem, evt, generic_data__et)) {
- switch (getState()) {
- case STATE_Operational:
- switch(trigger__et) {
- case TRIG_timer__internalStartTimer:
- {
- chain__et = CHAIN_TRANS_tr1_FROM_Operational_TO_Operational_BY_internalStartTimertimer_tr1;
- catching_state__et = STATE_TOP;
- }
- break;
- case TRIG_timer__internalStartTimeout:
- {
- chain__et = CHAIN_TRANS_tr3_FROM_Operational_TO_Operational_BY_internalStartTimeouttimer_tr3;
- catching_state__et = STATE_TOP;
- }
- break;
- case TRIG_timer__kill:
- {
- chain__et = CHAIN_TRANS_tr4_FROM_Operational_TO_Operational_BY_killtimer_tr4;
- catching_state__et = STATE_TOP;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- break;
- default:
- /* should not occur */
- break;
- }
- }
- if (chain__et != NOT_CAUGHT) {
- exitTo(getState(), catching_state__et);
- {
- int next__et = executeTransitionChain(chain__et, ifitem, generic_data__et);
- next__et = enterHistory(next__et);
- setState(next__et);
- }
- }
- }
-
-
-};
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/PTimer.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/PTimer.java
deleted file mode 100644
index 807ec0c72..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/PTimer.java
+++ /dev/null
@@ -1,366 +0,0 @@
-package room.basic.service.timing;
-
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.EventMessage;
-import org.eclipse.etrice.runtime.java.modelbase.EventWithDataMessage;
-import org.eclipse.etrice.runtime.java.modelbase.IInterfaceItemOwner;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.modelbase.PortBase;
-import org.eclipse.etrice.runtime.java.modelbase.ReplicatedPortBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-/*--------------------- begin user code ---------------------*/
-import java.util.TimerTask;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class PTimer {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int OUT_timeout = 1;
- public static final int OUT_internalTimer = 2;
- public static final int OUT_internalTimeout = 3;
- public static final int IN_kill = 4;
- public static final int IN_internalStartTimer = 5;
- public static final int IN_internalStartTimeout = 6;
- public static final int MSG_MAX = 7;
-
- /*--------------------- begin user code ---------------------*/
- static protected class FireTimeoutTask extends TimerTask {
-
- private int time;
- private int id;
- private boolean periodic;
- private PTimerPort port;
-
- public FireTimeoutTask(int time, int id, boolean periodic, PTimerPort port) {
- this.time = time;
- this.id = id;
- this.periodic = periodic;
- this.port = port;
- }
-
- @Override
- public void run() {
- TimerData td = new TimerData(0,id);
- if (periodic)
- port.internalTimer(td);
- else
- port.internalTimeout(td);
- }
-
- public int getTime() {
- return time;
- }
-
- public int getId() {
- return id;
- }
- }
-
- /*--------------------- end user code ---------------------*/
-
- private static String messageStrings[] = {"MIN", "timeout","internalTimer","internalTimeout", "kill","internalStartTimer","internalStartTimeout","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class PTimerPort extends PortBase {
- /*--------------------- begin user code ---------------------*/
- private FireTimeoutTask task = null;
-
- public TimerTask getTask() { return task; }
- /*--------------------- end user code ---------------------*/
- // constructors
- public PTimerPort(IInterfaceItemOwner actor, String name, int localId) {
- this(actor, name, localId, 0);
- }
- public PTimerPort(IInterfaceItemOwner actor, String name, int localId, int idx) {
- super(actor, name, localId, idx);
- // initialize attributes
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- public void destroy() {
- DebuggingService.getInstance().removePortInstance(this);
- super.destroy();
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (0 < msg.getEvtId() && msg.getEvtId() < MSG_MAX) {
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- switch (msg.getEvtId()) {
- case IN_internalStartTimer:
- {
-
- EventWithDataMessage dataMsg = (EventWithDataMessage) msg;
- TimerData td = (TimerData)dataMsg.getData();
- task = new FireTimeoutTask(td.time, td.id, true, this);
- getActor().receiveEvent(this, IN_internalStartTimer, td);
- }
- break;
- case IN_internalStartTimeout:
- {
-
- EventWithDataMessage dataMsg = (EventWithDataMessage) msg;
- TimerData td = (TimerData)dataMsg.getData();
- task = new FireTimeoutTask(td.time, td.id, false, this);
- getActor().receiveEvent(this, IN_internalStartTimeout, td);
- }
- break;
- case IN_kill:
- {
- //regular PortClass handle kill
- EventWithDataMessage dataMsg = (EventWithDataMessage) msg;
- TimerData td = (TimerData)dataMsg.getData();
- if (task!=null && task.getId()==td.getId()) {
- task.cancel();
- }
- }
- break;
- default:
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
- }
-
- /*--------------------- attributes ---------------------*/
- /* --------------------- attribute setters and getters */
- /*--------------------- operations ---------------------*/
-
- // sent messages
- public void timeout() {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_timeout]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), OUT_timeout));
- }
- private void internalTimer(TimerData td) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_internalTimer]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), OUT_internalTimer, td.deepCopy()));
- }
- public void internalTimer(int time, int id) {
- internalTimer(new TimerData(time, id));
- }
- private void internalTimeout(TimerData td) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_internalTimeout]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), OUT_internalTimeout, td.deepCopy()));
- }
- public void internalTimeout(int time, int id) {
- internalTimeout(new TimerData(time, id));
- }
- }
-
- // replicated port class
- static public class PTimerReplPort extends ReplicatedPortBase {
-
- public PTimerReplPort(IInterfaceItemOwner actor, String name, int localId) {
- super(actor, name, localId);
- }
-
- public int getReplication() {
- return getNInterfaceItems();
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PTimerPort get(int idx) {
- return (PTimerPort) getInterfaceItem(idx);
- }
-
- protected InterfaceItemBase createInterfaceItem(IInterfaceItemOwner rcv, String name, int lid, int idx) {
- return new PTimerPort(rcv, name, lid, idx);
- }
-
- // outgoing messages
- public void timeout(){
- for (InterfaceItemBase item : getItems()) {
- ((PTimerPort)item).timeout();
- }
- }
- private void internalTimer(TimerData td){
- for (InterfaceItemBase item : getItems()) {
- ((PTimerPort)item).internalTimer( td);
- }
- }
- private void internalTimeout(TimerData td){
- for (InterfaceItemBase item : getItems()) {
- ((PTimerPort)item).internalTimeout( td);
- }
- }
- }
-
-
- // port class
- static public class PTimerConjPort extends PortBase {
- /*--------------------- begin user code ---------------------*/
- private int currentId = 0;
- private boolean active = false;
- /*--------------------- end user code ---------------------*/
- // constructors
- public PTimerConjPort(IInterfaceItemOwner actor, String name, int localId) {
- this(actor, name, localId, 0);
- }
- public PTimerConjPort(IInterfaceItemOwner actor, String name, int localId, int idx) {
- super(actor, name, localId, idx);
- // initialize attributes
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- public void destroy() {
- DebuggingService.getInstance().removePortInstance(this);
- super.destroy();
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (0 < msg.getEvtId() && msg.getEvtId() < MSG_MAX) {
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- switch (msg.getEvtId()) {
- case OUT_internalTimer:
- {
- //conjugated PortClass handle timer
- EventWithDataMessage dataMsg = (EventWithDataMessage) msg;
- TimerData td = (TimerData) dataMsg.getData();
- if (active && td.getId()==currentId) {
- getActor().receiveEvent(this, OUT_timeout, null);
- }
- }
- break;
- case OUT_internalTimeout:
- {
- //conjugated PortClass handle timeout
- EventWithDataMessage dataMsg = (EventWithDataMessage) msg;
- TimerData td = (TimerData) dataMsg.getData();
- if (active && td.getId()==currentId) {
- active = false;
- getActor().receiveEvent(this, OUT_timeout, null);
- }
- }
- break;
- default:
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
- }
-
- /*--------------------- attributes ---------------------*/
- /* --------------------- attribute setters and getters */
- /*--------------------- operations ---------------------*/
- public void startTimer(int time_ms) {
-
- if (active) return;
- active = true;
-
- if (RTServices.getInstance().getSubSystem().hasGeneratedMSCInstrumentation())
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_internalStartTimer]);
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalStartTimer, new TimerData(time_ms,++currentId)));
- }
- public void startTimeout(int time_ms) {
-
- if (active) return;
- active = true;
-
- if (RTServices.getInstance().getSubSystem().hasGeneratedMSCInstrumentation())
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_internalStartTimeout]);
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalStartTimeout, new TimerData(time_ms,++currentId)));
- }
-
- // sent messages
- public void kill() {
- //conjugated PortClass kill
- if (active) {
- active = false;
- TimerData td = new TimerData();
- td.setId(currentId);
- getPeerMsgReceiver().receive(
- new EventWithDataMessage(getPeerAddress(), IN_kill, td));
- }
- }
- private void internalStartTimer(TimerData td) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_internalStartTimer]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalStartTimer, td.deepCopy()));
- }
- public void internalStartTimer(int time, int id) {
- internalStartTimer(new TimerData(time, id));
- }
- private void internalStartTimeout(TimerData td) {
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_internalStartTimeout]);
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalStartTimeout, td.deepCopy()));
- }
- public void internalStartTimeout(int time, int id) {
- internalStartTimeout(new TimerData(time, id));
- }
- }
-
- // replicated port class
- static public class PTimerConjReplPort extends ReplicatedPortBase {
-
- public PTimerConjReplPort(IInterfaceItemOwner actor, String name, int localId) {
- super(actor, name, localId);
- }
-
- public int getReplication() {
- return getNInterfaceItems();
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PTimerConjPort get(int idx) {
- return (PTimerConjPort) getInterfaceItem(idx);
- }
-
- protected InterfaceItemBase createInterfaceItem(IInterfaceItemOwner rcv, String name, int lid, int idx) {
- return new PTimerConjPort(rcv, name, lid, idx);
- }
-
- // incoming messages
- public void kill(){
- for (InterfaceItemBase item : getItems()) {
- ((PTimerConjPort)item).kill();
- }
- }
- private void internalStartTimer(TimerData td){
- for (InterfaceItemBase item : getItems()) {
- ((PTimerConjPort)item).internalStartTimer( td);
- }
- }
- private void internalStartTimeout(TimerData td){
- for (InterfaceItemBase item : getItems()) {
- ((PTimerConjPort)item).internalStartTimeout( td);
- }
- }
- }
-
-}
diff --git a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/TimerData.java b/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/TimerData.java
deleted file mode 100644
index 158115272..000000000
--- a/runtime/org.eclipse.etrice.modellib.java/src-gen/room/basic/service/timing/TimerData.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package room.basic.service.timing;
-
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-import java.io.Serializable;
-
-
-
-
-public class TimerData implements Serializable {
-
- private static final long serialVersionUID = 633780889L;
-
-
- /*--------------------- attributes ---------------------*/
- int time;
- int id;
-
- /* --------------------- attribute setters and getters */
- public void setTime (int time) {
- this.time = time;
- }
- public int getTime () {
- return this.time;
- }
- public void setId (int id) {
- this.id = id;
- }
- public int getId () {
- return this.id;
- }
-
- /*--------------------- operations ---------------------*/
-
- // default constructor
- public TimerData() {
- super();
-
- // initialize attributes
- }
-
- // constructor using fields
- public TimerData(int time, int id) {
- super();
-
- this.time = time;
- this.id = id;
- }
-
- // deep copy
- public TimerData deepCopy() {
- TimerData copy = new TimerData();
- copy.time = time;
- copy.id = id;
- return copy;
- }
-};

Back to the top