diff options
Diffstat (limited to 'plugins')
308 files changed, 6118 insertions, 7280 deletions
diff --git a/plugins/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java b/plugins/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java index a7c3c34a0..87a596f46 100644 --- a/plugins/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java +++ b/plugins/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java @@ -1,38 +1,45 @@ -/* -* generated by Xtext -*/ -package org.eclipse.etrice.core; - -import org.eclipse.xtext.junit4.GlobalRegistries; -import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento; -import org.eclipse.xtext.junit4.IInjectorProvider; -import org.eclipse.xtext.junit4.IRegistryConfigurator; - -import com.google.inject.Injector; - -public class ConfigInjectorProvider implements IInjectorProvider, IRegistryConfigurator { - protected GlobalStateMemento globalStateMemento; - protected Injector injector; - - static { - GlobalRegistries.initializeDefaults(); - } - - public Injector getInjector() { - if (injector == null) { - this.injector = new ConfigStandaloneSetup().createInjectorAndDoEMFRegistration(); - } - return injector; - } - - public void restoreRegistry() { - globalStateMemento.restoreGlobalState(); - } - - public void setupRegistry() { - globalStateMemento = GlobalRegistries.makeCopyOfGlobalState(); - if (injector != null) - new ConfigStandaloneSetup().register(injector); - } - -} +/*
+* generated by Xtext
+*/
+package org.eclipse.etrice.core;
+
+import org.eclipse.xtext.junit4.GlobalRegistries;
+import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
+import org.eclipse.xtext.junit4.IInjectorProvider;
+import org.eclipse.xtext.junit4.IRegistryConfigurator;
+
+import com.google.inject.Injector;
+
+public class ConfigInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
+
+ protected GlobalStateMemento stateBeforeInjectorCreation;
+ protected GlobalStateMemento stateAfterInjectorCreation;
+ protected Injector injector;
+
+ static {
+ GlobalRegistries.initializeDefaults();
+ }
+
+ public Injector getInjector()
+ {
+ if (injector == null) {
+ stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+ this.injector = internalCreateInjector();
+ stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+ }
+ return injector;
+ }
+
+ protected Injector internalCreateInjector() {
+ return new ConfigStandaloneSetup().createInjectorAndDoEMFRegistration();
+ }
+
+ public void restoreRegistry() {
+ stateBeforeInjectorCreation.restoreGlobalState();
+ }
+
+ public void setupRegistry() {
+ getInjector();
+ stateAfterInjectorCreation.restoreGlobalState();
+ }
+}
diff --git a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF index 7b357891d..70fae8bab 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF @@ -21,5 +21,6 @@ Import-Package: org.apache.log4j, org.apache.commons.logging
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.etrice.core.ui.contentassist.antlr,
- org.eclipse.etrice.core.ui.internal
+ org.eclipse.etrice.core.ui.internal,
+ org.eclipse.etrice.core.ui.contentassist
Bundle-Activator: org.eclipse.etrice.core.ui.internal.ConfigActivator
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 88804d58a..dd4224394 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen +++ b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen @@ -1,281 +1,323 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> - -<plugin> - - <extension - point="org.eclipse.ui.editors"> - <editor - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor" - contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor" - default="true" - extensions="config" - id="org.eclipse.etrice.core.Config" - name="Config Editor"> - </editor> - </extension> - <extension - point="org.eclipse.ui.handlers"> - <handler - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler" - commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration"> - <activeWhen> - <reference - definitionId="org.eclipse.etrice.core.Config.Editor.opened"> - </reference> - </activeWhen> - </handler> - <handler - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler" - commandId="org.eclipse.etrice.core.Config.validate"> - <activeWhen> - <reference - definitionId="org.eclipse.etrice.core.Config.Editor.opened"> - </reference> - </activeWhen> - </handler> - </extension> - <extension point="org.eclipse.core.expressions.definitions"> - <definition id="org.eclipse.etrice.core.Config.Editor.opened"> - <and> - <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/> - <with variable="activeEditor"> - <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" - value="org.eclipse.etrice.core.Config" - forcePluginActivation="true"/> - </with> - </and> - </definition> - </extension> - <extension - point="org.eclipse.ui.preferencePages"> - <page - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage" - id="org.eclipse.etrice.core.Config" - name="Config"> - <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/> - </page> - <page - category="org.eclipse.etrice.core.Config" - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage" - id="org.eclipse.etrice.core.Config.coloring" - name="Syntax Coloring"> - <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/> - </page> - <page - category="org.eclipse.etrice.core.Config" - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage" - id="org.eclipse.etrice.core.Config.templates" - name="Templates"> - <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/> - </page> - </extension> - <extension - point="org.eclipse.ui.propertyPages"> - <page - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage" - id="org.eclipse.etrice.core.Config" - name="Config"> - <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/> - <enabledWhen> - <adapt type="org.eclipse.core.resources.IProject"/> - </enabledWhen> - <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/> - </page> - </extension> - <extension - point="org.eclipse.ui.keywords"> - <keyword - id="org.eclipse.etrice.core.ui.keyword_Config" - label="Config"/> - </extension> - <extension - point="org.eclipse.ui.commands"> - <command - description="Trigger expensive validation" - id="org.eclipse.etrice.core.Config.validate" - name="Validate"> - </command> - </extension> - <extension point="org.eclipse.ui.menus"> - <menuContribution - locationURI="popup:#TextEditorContext?after=group.edit"> - <command - commandId="org.eclipse.etrice.core.Config.validate" - style="push" - tooltip="Trigger expensive validation"> - <visibleWhen checkEnabled="false"> - <reference - definitionId="org.eclipse.etrice.core.Config.Editor.opened"> - </reference> - </visibleWhen> - </command> - </menuContribution> - </extension> - <extension point="org.eclipse.ui.menus"> - <menuContribution locationURI="popup:#TextEditorContext?endof=group.find"> - <command commandId="org.eclipse.xtext.ui.editor.FindReferences"> - <visibleWhen checkEnabled="false"> - <reference definitionId="org.eclipse.etrice.core.Config.Editor.opened"> - </reference> - </visibleWhen> - </command> - </menuContribution> - </extension> - <extension point="org.eclipse.ui.handlers"> - <handler - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler" - commandId="org.eclipse.xtext.ui.editor.FindReferences"> - <activeWhen> - <reference - definitionId="org.eclipse.etrice.core.Config.Editor.opened"> - </reference> - </activeWhen> - </handler> - </extension> - -<!-- adding resource factories --> - - <extension - point="org.eclipse.emf.ecore.extension_parser"> - <parser - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory" - type="config"> - </parser> - </extension> - <extension point="org.eclipse.xtext.extension_resourceServiceProvider"> - <resourceServiceProvider - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider" - uriExtension="config"> - </resourceServiceProvider> - </extension> - - - - <extension - point="org.eclipse.xtext.builder.participant"> - <participant - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"> - </participant> - </extension> - <extension - point="org.eclipse.ui.preferencePages"> - <page - category="org.eclipse.etrice.core.Config" - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage" - id="org.eclipse.etrice.core.Config.compiler.preferencePage" - name="Compiler"> - <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/> - </page> - </extension> - <extension - point="org.eclipse.ui.propertyPages"> - <page - category="org.eclipse.etrice.core.Config" - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage" - id="org.eclipse.etrice.core.Config.compiler.propertyPage" - name="Compiler"> - <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/> - <enabledWhen> - <adapt type="org.eclipse.core.resources.IProject"/> - </enabledWhen> - <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/> - </page> - </extension> - - <!-- Quick Outline --> - <extension - point="org.eclipse.ui.handlers"> - <handler - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler" - commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"> - <activeWhen> - <reference - definitionId="org.eclipse.etrice.core.Config.Editor.opened"> - </reference> - </activeWhen> - </handler> - </extension> - <extension - point="org.eclipse.ui.commands"> - <command - description="Open the quick outline." - id="org.eclipse.xtext.ui.editor.outline.QuickOutline" - name="Quick Outline"> - </command> - </extension> - <extension point="org.eclipse.ui.menus"> - <menuContribution - locationURI="popup:#TextEditorContext?after=group.open"> - <command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline" - style="push" - tooltip="Open Quick Outline"> - <visibleWhen checkEnabled="false"> - <reference definitionId="org.eclipse.etrice.core.Config.Editor.opened"/> - </visibleWhen> - </command> - </menuContribution> - </extension> - <!-- quickfix marker resolution generator --> - <extension - point="org.eclipse.ui.ide.markerResolution"> - <markerResolutionGenerator - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"> - </markerResolutionGenerator> - </extension> - <!-- Rename Refactoring --> - <extension point="org.eclipse.ui.handlers"> - <handler - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler" - commandId="org.eclipse.xtext.ui.refactoring.RenameElement"> - <activeWhen> - <reference - definitionId="org.eclipse.etrice.core.Config.Editor.opened"> - </reference> - </activeWhen> - </handler> - </extension> - <extension point="org.eclipse.ui.menus"> - <menuContribution - locationURI="popup:#TextEditorContext?after=group.edit"> - <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement" - style="push"> - <visibleWhen checkEnabled="false"> - <reference - definitionId="org.eclipse.etrice.core.Config.Editor.opened"> - </reference> - </visibleWhen> - </command> - </menuContribution> - </extension> - <extension point="org.eclipse.ui.preferencePages"> - <page - category="org.eclipse.etrice.core.Config" - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage" - id="org.eclipse.etrice.core.Config.refactoring" - name="Refactoring"> - <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/> - </page> - </extension> - - - <extension point="org.eclipse.compare.contentViewers"> - <viewer id="org.eclipse.etrice.core.Config.compare.contentViewers" - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" - extensions="config"> - </viewer> - </extension> - <extension point="org.eclipse.compare.contentMergeViewers"> - <viewer id="org.eclipse.etrice.core.Config.compare.contentMergeViewers" - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" - extensions="config" label="Config Compare"> - </viewer> - </extension> - <extension point="org.eclipse.ui.editors.documentProviders"> - <provider id="org.eclipse.etrice.core.Config.editors.documentProviders" - class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider" - extensions="config"> - </provider> - </extension> - -</plugin> +<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+ contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+ default="true"
+ extensions="config"
+ id="org.eclipse.etrice.core.Config"
+ name="Config Editor">
+ </editor>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+ commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+ <activeWhen>
+ <reference
+ definitionId="org.eclipse.etrice.core.Config.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+ commandId="org.eclipse.etrice.core.Config.validate">
+ <activeWhen>
+ <reference
+ definitionId="org.eclipse.etrice.core.Config.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension point="org.eclipse.core.expressions.definitions">
+ <definition id="org.eclipse.etrice.core.Config.Editor.opened">
+ <and>
+ <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.eclipse.etrice.core.Config"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
+ </extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+ id="org.eclipse.etrice.core.Config"
+ name="Config">
+ <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/>
+ </page>
+ <page
+ category="org.eclipse.etrice.core.Config"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+ id="org.eclipse.etrice.core.Config.coloring"
+ name="Syntax Coloring">
+ <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/>
+ </page>
+ <page
+ category="org.eclipse.etrice.core.Config"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+ id="org.eclipse.etrice.core.Config.templates"
+ name="Templates">
+ <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/>
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+ id="org.eclipse.etrice.core.Config"
+ name="Config">
+ <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/>
+ <enabledWhen>
+ <adapt type="org.eclipse.core.resources.IProject"/>
+ </enabledWhen>
+ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="org.eclipse.etrice.core.ui.keyword_Config"
+ label="Config"/>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="Trigger expensive validation"
+ id="org.eclipse.etrice.core.Config.validate"
+ name="Validate">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:#TextEditorContext?after=group.edit">
+ <command
+ commandId="org.eclipse.etrice.core.Config.validate"
+ style="push"
+ tooltip="Trigger expensive validation">
+ <visibleWhen checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.etrice.core.Config.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+ <command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.Config.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+ commandId="org.eclipse.xtext.ui.editor.FindReferences">
+ <activeWhen>
+ <reference
+ definitionId="org.eclipse.etrice.core.Config.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ </extension>
+
+<!-- adding resource factories -->
+
+ <extension
+ point="org.eclipse.emf.ecore.extension_parser">
+ <parser
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
+ type="config">
+ </parser>
+ </extension>
+ <extension point="org.eclipse.xtext.extension_resourceServiceProvider">
+ <resourceServiceProvider
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
+ uriExtension="config">
+ </resourceServiceProvider>
+ </extension>
+
+
+ <!-- marker definitions for org.eclipse.etrice.core.Config -->
+ <extension
+ id="config.check.fast"
+ name="Config Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.fast"/>
+ <persistent value="true"/>
+ </extension>
+ <extension
+ id="config.check.normal"
+ name="Config Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.normal"/>
+ <persistent value="true"/>
+ </extension>
+ <extension
+ id="config.check.expensive"
+ name="Config Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.expensive"/>
+ <persistent value="true"/>
+ </extension>
+
+ <extension
+ point="org.eclipse.xtext.builder.participant">
+ <participant
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
+ </participant>
+ </extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.eclipse.etrice.core.Config"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+ id="org.eclipse.etrice.core.Config.compiler.preferencePage"
+ name="Compiler">
+ <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/>
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
+ category="org.eclipse.etrice.core.Config"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+ id="org.eclipse.etrice.core.Config.compiler.propertyPage"
+ name="Compiler">
+ <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/>
+ <enabledWhen>
+ <adapt type="org.eclipse.core.resources.IProject"/>
+ </enabledWhen>
+ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+ </page>
+ </extension>
+
+ <!-- Quick Outline -->
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+ commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+ <activeWhen>
+ <reference
+ definitionId="org.eclipse.etrice.core.Config.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="Open the quick outline."
+ id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+ name="Quick Outline">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:#TextEditorContext?after=group.open">
+ <command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+ style="push"
+ tooltip="Open Quick Outline">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.Config.Editor.opened"/>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <!-- quickfix marker resolution generator for org.eclipse.etrice.core.Config -->
+ <extension
+ point="org.eclipse.ui.ide.markerResolution">
+ <markerResolutionGenerator
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.eclipse.etrice.core.ui.config.check.fast">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ <markerResolutionGenerator
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.eclipse.etrice.core.ui.config.check.normal">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ <markerResolutionGenerator
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.eclipse.etrice.core.ui.config.check.expensive">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ </extension>
+ <!-- Rename Refactoring -->
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler"
+ commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
+ <activeWhen>
+ <reference
+ definitionId="org.eclipse.etrice.core.Config.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:#TextEditorContext?after=group.edit">
+ <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
+ style="push">
+ <visibleWhen checkEnabled="false">
+ <reference
+ definitionId="org.eclipse.etrice.core.Config.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.eclipse.etrice.core.Config"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
+ id="org.eclipse.etrice.core.Config.refactoring"
+ name="Refactoring">
+ <keywordReference id="org.eclipse.etrice.core.ui.keyword_Config"/>
+ </page>
+ </extension>
+
+ <extension point="org.eclipse.compare.contentViewers">
+ <viewer id="org.eclipse.etrice.core.Config.compare.contentViewers"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+ extensions="config">
+ </viewer>
+ </extension>
+ <extension point="org.eclipse.compare.contentMergeViewers">
+ <viewer id="org.eclipse.etrice.core.Config.compare.contentMergeViewers"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+ extensions="config" label="Config Compare">
+ </viewer>
+ </extension>
+ <extension point="org.eclipse.ui.editors.documentProviders">
+ <provider id="org.eclipse.etrice.core.Config.editors.documentProviders"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
+ extensions="config">
+ </provider>
+ </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/ConfigExecutableExtensionFactory.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/ConfigExecutableExtensionFactory.java index 492ef4f22..6695a3260 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/ConfigExecutableExtensionFactory.java +++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/ConfigExecutableExtensionFactory.java @@ -1,27 +1,29 @@ -/* - * generated by Xtext - */ -package org.eclipse.etrice.core.ui; - -import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; -import org.osgi.framework.Bundle; - -import com.google.inject.Injector; - -/** - * This class was generated. Customizations should only happen in a newly - * introduced subclass. - */ -public class ConfigExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory { - - @Override - protected Bundle getBundle() { - return org.eclipse.etrice.core.ui.internal.ConfigActivator.getInstance().getBundle(); - } - - @Override - protected Injector getInjector() { - return org.eclipse.etrice.core.ui.internal.ConfigActivator.getInstance().getInjector("org.eclipse.etrice.core.Config"); - } - -} +/*
+ * generated by Xtext
+ */
+package org.eclipse.etrice.core.ui;
+
+import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
+import org.osgi.framework.Bundle;
+
+import com.google.inject.Injector;
+
+import org.eclipse.etrice.core.ui.internal.ConfigActivator;
+
+/**
+ * This class was generated. Customizations should only happen in a newly
+ * introduced subclass.
+ */
+public class ConfigExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
+
+ @Override
+ protected Bundle getBundle() {
+ return ConfigActivator.getInstance().getBundle();
+ }
+
+ @Override
+ protected Injector getInjector() {
+ return ConfigActivator.getInstance().getInjector(ConfigActivator.ORG_ECLIPSE_ETRICE_CORE_CONFIG);
+ }
+
+}
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/internal/ConfigActivator.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/internal/ConfigActivator.java index 6d008c213..be11391da 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/internal/ConfigActivator.java +++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/internal/ConfigActivator.java @@ -1,82 +1,95 @@ -/* - * generated by Xtext - */ -package org.eclipse.etrice.core.ui.internal; - -import static com.google.inject.util.Modules.override; -import static com.google.inject.Guice.createInjector; - -import org.apache.log4j.Logger; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -import com.google.inject.Injector; -import com.google.inject.Module; - -import java.util.Map; -import java.util.HashMap; - -/** - * This class was generated. Customizations should only happen in a newly - * introduced subclass. - */ -public class ConfigActivator extends AbstractUIPlugin { - - private Map<String,Injector> injectors = new HashMap<String,Injector>(); - private static ConfigActivator INSTANCE; - - public Injector getInjector(String languageName) { - return injectors.get(languageName); - } - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - INSTANCE = this; - try { - registerInjectorFor("org.eclipse.etrice.core.Config"); - - } catch (Exception e) { - Logger.getLogger(getClass()).error(e.getMessage(), e); - throw e; - } - } - - protected void registerInjectorFor(String language) throws Exception { - injectors.put(language, createInjector( - override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language)))); - } - - @Override - public void stop(BundleContext context) throws Exception { - injectors.clear(); - INSTANCE = null; - super.stop(context); - } - - public static ConfigActivator getInstance() { - return INSTANCE; - } - - protected Module getRuntimeModule(String grammar) { - if ("org.eclipse.etrice.core.Config".equals(grammar)) { - return new org.eclipse.etrice.core.ConfigRuntimeModule(); - } - - throw new IllegalArgumentException(grammar); - } - - protected Module getUiModule(String grammar) { - if ("org.eclipse.etrice.core.Config".equals(grammar)) { - return new org.eclipse.etrice.core.ui.ConfigUiModule(this); - } - - throw new IllegalArgumentException(grammar); - } - - protected Module getSharedStateModule() { - return new org.eclipse.xtext.ui.shared.SharedStateModule(); - } - -} +/*
+ * generated by Xtext
+ */
+package org.eclipse.etrice.core.ui.internal;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.xtext.ui.shared.SharedStateModule;
+import org.eclipse.xtext.util.Modules2;
+import org.osgi.framework.BundleContext;
+
+import com.google.common.collect.Maps;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+
+/**
+ * This class was generated. Customizations should only happen in a newly
+ * introduced subclass.
+ */
+public class ConfigActivator extends AbstractUIPlugin {
+
+ public static final String ORG_ECLIPSE_ETRICE_CORE_CONFIG = "org.eclipse.etrice.core.Config";
+
+ private static final Logger logger = Logger.getLogger(ConfigActivator.class);
+
+ private static ConfigActivator INSTANCE;
+
+ private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ INSTANCE = this;
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ injectors.clear();
+ INSTANCE = null;
+ super.stop(context);
+ }
+
+ public static ConfigActivator getInstance() {
+ return INSTANCE;
+ }
+
+ public Injector getInjector(String language) {
+ synchronized (injectors) {
+ Injector injector = injectors.get(language);
+ if (injector == null) {
+ injectors.put(language, injector = createInjector(language));
+ }
+ return injector;
+ }
+ }
+
+ protected Injector createInjector(String language) {
+ try {
+ Module runtimeModule = getRuntimeModule(language);
+ Module sharedStateModule = getSharedStateModule();
+ Module uiModule = getUiModule(language);
+ Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);
+ return Guice.createInjector(mergedModule);
+ } catch (Exception e) {
+ logger.error("Failed to create injector for " + language);
+ logger.error(e.getMessage(), e);
+ throw new RuntimeException("Failed to create injector for " + language, e);
+ }
+ }
+
+ protected Module getRuntimeModule(String grammar) {
+ if (ORG_ECLIPSE_ETRICE_CORE_CONFIG.equals(grammar)) {
+ return new org.eclipse.etrice.core.ConfigRuntimeModule();
+ }
+
+ throw new IllegalArgumentException(grammar);
+ }
+
+ protected Module getUiModule(String grammar) {
+ if (ORG_ECLIPSE_ETRICE_CORE_CONFIG.equals(grammar)) {
+ return new org.eclipse.etrice.core.ui.ConfigUiModule(this);
+ }
+
+ throw new IllegalArgumentException(grammar);
+ }
+
+ protected Module getSharedStateModule() {
+ return new SharedStateModule();
+ }
+
+}
diff --git a/plugins/org.eclipse.etrice.core.config/.gitignore b/plugins/org.eclipse.etrice.core.config/.gitignore index a25460a14..e5b341a3a 100644 --- a/plugins/org.eclipse.etrice.core.config/.gitignore +++ b/plugins/org.eclipse.etrice.core.config/.gitignore @@ -1,2 +1,3 @@ bin
+*._trace
.antlr-generator-3.2.0.jar
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF index fd7d10ea9..83f6f9205 100644 --- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF @@ -14,15 +14,16 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.1.1";visibility:=reexport, org.eclipse.emf.mwe.utils;resolution:=optional,
org.eclipse.emf.mwe2.launch;resolution:=optional,
org.eclipse.xtext.util;bundle-version="2.1.1",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
org.eclipse.xtext.xbase.lib;bundle-version="2.1.1",
org.eclipse.emf.ecore,
org.eclipse.emf.common,
org.antlr.runtime,
org.eclipse.xtext.common.types;bundle-version="2.1.1",
org.eclipse.etrice.core.room;bundle-version="0.2.0"
-Import-Package: org.apache.commons.logging,
- org.apache.log4j
+Import-Package: org.apache.log4j,
+ org.apache.commons.logging,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.etrice.core,
org.eclipse.etrice.core.services,
diff --git a/plugins/org.eclipse.etrice.core.config/plugin.xml_gen b/plugins/org.eclipse.etrice.core.config/plugin.xml_gen index fc1516a0f..e1d038f34 100644 --- a/plugins/org.eclipse.etrice.core.config/plugin.xml_gen +++ b/plugins/org.eclipse.etrice.core.config/plugin.xml_gen @@ -1,18 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> - -<plugin> - - <extension point="org.eclipse.emf.ecore.generated_package"> - <package - uri = "http://www.eclipse.org/etrice/core/Config" - class = "org.eclipse.etrice.core.config.ConfigPackage" - genModel = "org/eclipse/etrice/core/Config.genmodel" /> - - </extension> - - - - - -</plugin> +<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <package
+ uri = "http://www.eclipse.org/etrice/core/Config"
+ class = "org.eclipse.etrice.core.config.ConfigPackage"
+ genModel = "org/eclipse/etrice/core/Config.genmodel" />
+
+ </extension>
+
+
+
+
+</plugin>
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 62629fabd..c1bdce9cb 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 @@ -1,157 +1,162 @@ -/* - * generated by Xtext - */ -package org.eclipse.etrice.core; - -import java.util.Properties; - -import org.eclipse.xtext.Constants; -import org.eclipse.xtext.service.DefaultRuntimeModule; - -import com.google.inject.Binder; -import com.google.inject.name.Names; - -/** - * Manual modifications go to {org.eclipse.etrice.core.ConfigRuntimeModule} - */ - @SuppressWarnings("all") -public abstract class AbstractConfigRuntimeModule extends DefaultRuntimeModule { - - protected Properties properties = null; - - @Override - public void configure(Binder binder) { - properties = tryBindProperties(binder, "org/eclipse/etrice/core/Config.properties"); - super.configure(binder); - } - - public void configureLanguageName(Binder binder) { - binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.etrice.core.Config"); - } - - public void configureFileExtensions(Binder binder) { - if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null) - binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("config"); - } - - // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment - public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() { - return org.eclipse.etrice.core.services.ConfigGrammarAccess.class; - } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() { - return org.eclipse.etrice.core.serializer.AbstractConfigSemanticSequencer.class; - } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() { - return org.eclipse.etrice.core.serializer.AbstractConfigSyntacticSequencer.class; - } - - // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment - public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() { - return org.eclipse.xtext.serializer.impl.Serializer.class; - } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() { - return org.eclipse.etrice.core.parser.antlr.ConfigParser.class; - } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() { - return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class; - } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() { - return org.eclipse.etrice.core.parser.antlr.ConfigAntlrTokenFileProvider.class; - } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() { - return org.eclipse.etrice.core.parser.antlr.internal.InternalConfigLexer.class; - } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public com.google.inject.Provider<org.eclipse.etrice.core.parser.antlr.internal.InternalConfigLexer> provideInternalConfigLexer() { - return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.etrice.core.parser.antlr.internal.InternalConfigLexer.class); - } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public void configureRuntimeLexer(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.etrice.core.parser.antlr.internal.InternalConfigLexer.class); - } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() { - return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class; - } - - // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment - public Class<? extends org.eclipse.xtext.parser.antlr.IUnorderedGroupHelper> bindIUnorderedGroupHelper() { - return org.eclipse.xtext.parser.antlr.UnorderedGroupHelper.class; - } - - // contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment - @org.eclipse.xtext.service.SingletonBinding(eager=true) public Class<? extends org.eclipse.etrice.core.validation.ConfigJavaValidator> bindConfigJavaValidator() { - return org.eclipse.etrice.core.validation.ConfigJavaValidator.class; - } - - // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment - public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() { - return org.eclipse.etrice.core.scoping.ConfigScopeProvider.class; - } - - // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment - public void configureIScopeProviderDelegate(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class); - } - - // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment - public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() { - return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class; - } - - // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment - public void configureIgnoreCaseLinking(com.google.inject.Binder binder) { - binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false); - } - - // contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment - public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() { - return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() { - return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() { - return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class; - } - - // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment - public void configureIResourceDescriptions(com.google.inject.Binder binder) { - binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class); - } - - // 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); - } - - // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment - public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() { - return org.eclipse.etrice.core.generator.ConfigGenerator.class; - } - - // contributed by org.eclipse.xtext.generator.formatting.FormatterFragment - public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() { - return org.eclipse.etrice.core.formatting.ConfigFormatter.class; - } - -} +/*
+ * generated by Xtext
+ */
+package org.eclipse.etrice.core;
+
+import java.util.Properties;
+
+import org.eclipse.xtext.Constants;
+import org.eclipse.xtext.service.DefaultRuntimeModule;
+
+import com.google.inject.Binder;
+import com.google.inject.name.Names;
+
+/**
+ * Manual modifications go to {org.eclipse.etrice.core.ConfigRuntimeModule}
+ */
+ @SuppressWarnings("all")
+public abstract class AbstractConfigRuntimeModule extends DefaultRuntimeModule {
+
+ protected Properties properties = null;
+
+ @Override
+ public void configure(Binder binder) {
+ properties = tryBindProperties(binder, "org/eclipse/etrice/core/Config.properties");
+ super.configure(binder);
+ }
+
+ public void configureLanguageName(Binder binder) {
+ binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.eclipse.etrice.core.Config");
+ }
+
+ public void configureFileExtensions(Binder binder) {
+ if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null)
+ binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("config");
+ }
+
+ // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+ public java.lang.ClassLoader bindClassLoaderToInstance() {
+ return getClass().getClassLoader();
+ }
+
+ // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+ public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
+ return org.eclipse.etrice.core.services.ConfigGrammarAccess.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+ public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {
+ return org.eclipse.etrice.core.serializer.ConfigSemanticSequencer.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+ public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
+ return org.eclipse.etrice.core.serializer.ConfigSyntacticSequencer.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
+ public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() {
+ return org.eclipse.xtext.serializer.impl.Serializer.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+ public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
+ return org.eclipse.etrice.core.parser.antlr.ConfigParser.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+ public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
+ return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+ public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
+ return org.eclipse.etrice.core.parser.antlr.ConfigAntlrTokenFileProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+ public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
+ return org.eclipse.etrice.core.parser.antlr.internal.InternalConfigLexer.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+ public com.google.inject.Provider<org.eclipse.etrice.core.parser.antlr.internal.InternalConfigLexer> provideInternalConfigLexer() {
+ return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.eclipse.etrice.core.parser.antlr.internal.InternalConfigLexer.class);
+ }
+
+ // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+ public void configureRuntimeLexer(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.eclipse.etrice.core.parser.antlr.internal.InternalConfigLexer.class);
+ }
+
+ // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+ public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
+ return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
+ public Class<? extends org.eclipse.xtext.parser.antlr.IUnorderedGroupHelper> bindIUnorderedGroupHelper() {
+ return org.eclipse.xtext.parser.antlr.UnorderedGroupHelper.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.validation.JavaValidatorFragment
+ @org.eclipse.xtext.service.SingletonBinding(eager=true) public Class<? extends org.eclipse.etrice.core.validation.ConfigJavaValidator> bindConfigJavaValidator() {
+ return org.eclipse.etrice.core.validation.ConfigJavaValidator.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+ public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() {
+ return org.eclipse.etrice.core.scoping.ConfigScopeProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+ public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider.class);
+ }
+
+ // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+ public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
+ return org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+ public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
+ binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
+ }
+
+ // contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
+ public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
+ return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+ public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() {
+ return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+ public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() {
+ return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
+ public void configureIResourceDescriptions(com.google.inject.Binder binder) {
+ binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
+ }
+
+ // 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);
+ }
+
+ // contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
+ public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() {
+ return org.eclipse.etrice.core.generator.ConfigGenerator.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.formatting.FormatterFragment
+ public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {
+ return org.eclipse.etrice.core.formatting.ConfigFormatter.class;
+ }
+
+}
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 564faf105..9d60629e8 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 @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="config"
- nsURI="http://www.eclipse.org/etrice/core/Config" nsPrefix="config">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="config" nsURI="http://www.eclipse.org/etrice/core/Config" nsPrefix="config">
<eClassifiers xsi:type="ecore:EClass" name="ConfigModel">
<eOperations name="getActorClassConfigs" upperBound="-1" eType="#//ActorClassConfig">
<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 6c8e52d53..d65a29062 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 @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.config/src-gen"
- editDirectory="/org.eclipse.etrice.core.config.edit/src" 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"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.config/src-gen" editDirectory="/org.eclipse.etrice.core.config.edit/src"
+ 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" usedGenPackages="../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel#//room">
+ editorPluginID="org.eclipse.etrice.core.config.editor" runtimeVersion="2.8" usedGenPackages="../../../../../../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/ConfigStandaloneSetupGenerated.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java index aa48b185e..d31b31c64 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/ConfigStandaloneSetupGenerated.java @@ -1,44 +1,43 @@ - -package org.eclipse.etrice.core; - -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.xtext.ISetup; -import org.eclipse.emf.ecore.resource.Resource; - -import com.google.inject.Guice; -import com.google.inject.Injector; - -/** - * Generated from StandaloneSetup.xpt! - */ -@SuppressWarnings("all") -public class ConfigStandaloneSetupGenerated implements ISetup { - - public Injector createInjectorAndDoEMFRegistration() { - org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup(); - - Injector injector = createInjector(); - register(injector); - return injector; - } - - public Injector createInjector() { - return Guice.createInjector(new org.eclipse.etrice.core.ConfigRuntimeModule()); - } - - public void register(Injector injector) { - if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/etrice/core/Config")) { - EPackage.Registry.INSTANCE.put("http://www.eclipse.org/etrice/core/Config", org.eclipse.etrice.core.config.ConfigPackage.eINSTANCE); - } - - org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class); - org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class); - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("config", resourceFactory); - org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("config", serviceProvider); - - - - - - } -} +
+package org.eclipse.etrice.core;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.ISetup;
+import org.eclipse.emf.ecore.resource.Resource;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * Generated from StandaloneSetup.xpt!
+ */
+@SuppressWarnings("all")
+public class ConfigStandaloneSetupGenerated implements ISetup {
+
+ public Injector createInjectorAndDoEMFRegistration() {
+ org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
+
+ Injector injector = createInjector();
+ register(injector);
+ return injector;
+ }
+
+ public Injector createInjector() {
+ return Guice.createInjector(new org.eclipse.etrice.core.ConfigRuntimeModule());
+ }
+
+ public void register(Injector injector) {
+ if (!EPackage.Registry.INSTANCE.containsKey("http://www.eclipse.org/etrice/core/Config")) {
+ EPackage.Registry.INSTANCE.put("http://www.eclipse.org/etrice/core/Config", org.eclipse.etrice.core.config.ConfigPackage.eINSTANCE);
+ }
+
+ org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
+ org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
+ Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("config", resourceFactory);
+ org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("config", serviceProvider);
+
+
+
+
+ }
+}
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java index 0e6d91c5b..204549fd3 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorClassConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java index 9adbc13de..c287b81a7 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ActorInstanceConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java index f9f9fd8b3..4c1a167b2 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrClassConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java index a57bcc7a2..593ddc202 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java index 2caaad75f..b9750bb19 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/AttrInstanceConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/BooleanLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/BooleanLiteral.java index 87fe90860..be596d60f 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/BooleanLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/BooleanLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigElement.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigElement.java index cb8e913ef..0947cf678 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigElement.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigElement.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigFactory.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigFactory.java index 9313feb2b..9490d0e47 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigFactory.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigFactory.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java index 74481ea13..dd2539827 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigModel.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigPackage.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigPackage.java index 3c4c1e860..fa8c4dcbd 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigPackage.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ConfigPackage.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Import.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Import.java index 41e340a6c..065a725f5 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Import.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Import.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/IntLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/IntLiteral.java index d20edffaa..c3904f137 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/IntLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/IntLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Literal.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Literal.java index 7d91b19a1..01f5ed2c7 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Literal.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/Literal.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralArray.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralArray.java index 96ace1424..684ba279f 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralArray.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/LiteralArray.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/NumberLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/NumberLiteral.java index e3f819a33..7d460e3c5 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/NumberLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/NumberLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java index 6041023cf..c6524ac29 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortClassConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java index 15de2b5f9..b0d95a7c6 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/PortInstanceConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java index cdaf63618..86e385f93 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/ProtocolClassConfig.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RealLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RealLiteral.java index 785450d9b..299ce9870 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RealLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RealLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java index 961a1c97a..1e2afb6d6 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/RefPath.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/StringLiteral.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/StringLiteral.java index 1baefaeb8..d38bc73dc 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/StringLiteral.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/StringLiteral.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java index 2d4ec73fd..960e7a879 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorClassConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java index e063b02d0..e4d4fe31d 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ActorInstanceConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java index 1467d622b..6da8632ee 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrClassConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java index ebc0f0477..1d21f952c 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java index 9c3388fe3..e1e26984d 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/AttrInstanceConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/BooleanLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/BooleanLiteralImpl.java index 8a3e86415..886e74824 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/BooleanLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/BooleanLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java index b6b21c28e..af2e436b2 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigElementImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigFactoryImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigFactoryImpl.java index 3d95aa14f..3f9571218 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigFactoryImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigFactoryImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java index cee85b1e7..bd9377e3a 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigModelImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigPackageImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigPackageImpl.java index 3e46fb475..5a50f70a3 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigPackageImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ConfigPackageImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ImportImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ImportImpl.java index ae852a322..7e6ca1ef6 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ImportImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ImportImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/IntLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/IntLiteralImpl.java index 34f0c6c1d..5f3084db1 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/IntLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/IntLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralArrayImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralArrayImpl.java index 06d0a0675..d34deedc7 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralArrayImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralArrayImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralImpl.java index 38d74d581..68618b637 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/LiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/NumberLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/NumberLiteralImpl.java index bb0954791..e844fdd6e 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/NumberLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/NumberLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java index 1b8a98616..156cf19f1 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortClassConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java index abd628923..31178530d 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/PortInstanceConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java index 4ee488add..eb390ff1e 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/ProtocolClassConfigImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RealLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RealLiteralImpl.java index 468cd3e37..91c660a80 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RealLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RealLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java index 83ffa3a80..4d1c97ac6 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/RefPathImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/StringLiteralImpl.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/StringLiteralImpl.java index 784f68e57..d9f598fe9 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/StringLiteralImpl.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/impl/StringLiteralImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.impl;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigAdapterFactory.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigAdapterFactory.java index 8f62360de..ff95dcf08 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigAdapterFactory.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigAdapterFactory.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.util;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java index a3073d32f..ab7d81a01 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/config/util/ConfigSwitch.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.config.util;
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/AbstractConfigSemanticSequencer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSemanticSequencer.java index f7f789dd7..7c6fe60ee 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/AbstractConfigSemanticSequencer.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSemanticSequencer.java @@ -24,38 +24,18 @@ import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor; import org.eclipse.xtext.serializer.acceptor.SequenceFeeder; import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider; import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor; -import org.eclipse.xtext.serializer.sequencer.AbstractSemanticSequencer; +import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer; import org.eclipse.xtext.serializer.sequencer.GenericSequencer; import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider; import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; import org.eclipse.xtext.serializer.sequencer.ITransientValueService; import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient; -@SuppressWarnings("restriction")
-public class AbstractConfigSemanticSequencer extends AbstractSemanticSequencer {
+@SuppressWarnings("all")
+public class ConfigSemanticSequencer extends AbstractDelegatingSemanticSequencer {
@Inject
- protected ConfigGrammarAccess grammarAccess;
-
- @Inject
- protected ISemanticSequencerDiagnosticProvider diagnosticProvider;
-
- @Inject
- protected ITransientValueService transientValues;
-
- @Inject
- @GenericSequencer
- protected Provider<ISemanticSequencer> genericSequencerProvider;
-
- protected ISemanticSequencer genericSequencer;
-
-
- @Override
- public void init(ISemanticSequencer sequencer, ISemanticSequenceAcceptor sequenceAcceptor, Acceptor errorAcceptor) {
- super.init(sequencer, sequenceAcceptor, errorAcceptor);
- this.genericSequencer = genericSequencerProvider.get();
- this.genericSequencer.init(sequencer, sequenceAcceptor, errorAcceptor);
- }
+ private ConfigGrammarAccess grammarAccess;
public void createSequence(EObject context, EObject semanticObject) {
if(semanticObject.eClass().getEPackage() == ConfigPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/AbstractConfigSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java index 0d927a00e..15a0879a3 100644 --- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/AbstractConfigSyntacticSequencer.java +++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java @@ -14,8 +14,8 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition; import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer; -@SuppressWarnings("restriction")
-public class AbstractConfigSyntacticSequencer extends AbstractSyntacticSequencer {
+@SuppressWarnings("all")
+public class ConfigSyntacticSequencer extends AbstractSyntacticSequencer {
protected ConfigGrammarAccess grammarAccess;
protected AbstractElementAlias match_AttrClassConfig___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;
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 e5f0d5019..e9fb70202 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 @@ -1,1546 +1,1661 @@ -/* -* generated by Xtext -*/ - -package org.eclipse.etrice.core.services; - -import com.google.inject.Singleton; -import com.google.inject.Inject; - -import org.eclipse.xtext.*; -import org.eclipse.xtext.service.GrammarProvider; -import org.eclipse.xtext.service.AbstractElementFinder.*; - -import org.eclipse.xtext.common.services.TerminalsGrammarAccess; - -@Singleton -public class ConfigGrammarAccess extends AbstractGrammarElementFinder { - - - public class ConfigModelElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfigModel"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Assignment cImportsAssignment_0 = (Assignment)cGroup.eContents().get(0); - private final RuleCall cImportsImportParserRuleCall_0_0 = (RuleCall)cImportsAssignment_0.eContents().get(0); - private final Assignment cConfigElementsAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final RuleCall cConfigElementsConfigElementParserRuleCall_1_0 = (RuleCall)cConfigElementsAssignment_1.eContents().get(0); - - /// * - // * Postprocessor: - // * getActor(Class|Instance)Config() - // * / ConfigModel: - // imports+=Import* configElements+=ConfigElement*; - public ParserRule getRule() { return rule; } - - //imports+=Import* configElements+=ConfigElement* - public Group getGroup() { return cGroup; } - - //imports+=Import* - public Assignment getImportsAssignment_0() { return cImportsAssignment_0; } - - //Import - public RuleCall getImportsImportParserRuleCall_0_0() { return cImportsImportParserRuleCall_0_0; } - - //configElements+=ConfigElement* - public Assignment getConfigElementsAssignment_1() { return cConfigElementsAssignment_1; } - - //ConfigElement - public RuleCall getConfigElementsConfigElementParserRuleCall_1_0() { return cConfigElementsConfigElementParserRuleCall_1_0; } - } - - public class ConfigElementElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfigElement"); - private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); - private final RuleCall cActorClassConfigParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall cActorInstanceConfigParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); - private final RuleCall cProtocolClassConfigParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); - - //ConfigElement: - // ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig; - public ParserRule getRule() { return rule; } - - //ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig - public Alternatives getAlternatives() { return cAlternatives; } - - //ActorClassConfig - public RuleCall getActorClassConfigParserRuleCall_0() { return cActorClassConfigParserRuleCall_0; } - - //ActorInstanceConfig - public RuleCall getActorInstanceConfigParserRuleCall_1() { return cActorInstanceConfigParserRuleCall_1; } - - //ProtocolClassConfig - public RuleCall getProtocolClassConfigParserRuleCall_2() { return cProtocolClassConfigParserRuleCall_2; } - } - - public class ActorClassConfigElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorClassConfig"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cActorClassConfigKeyword_0 = (Keyword)cGroup.eContents().get(0); - private final Assignment cActorAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final CrossReference cActorActorClassCrossReference_1_0 = (CrossReference)cActorAssignment_1.eContents().get(0); - private final RuleCall cActorActorClassFQNParserRuleCall_1_0_1 = (RuleCall)cActorActorClassCrossReference_1_0.eContents().get(1); - private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2); - private final Assignment cAttributesAssignment_3 = (Assignment)cGroup.eContents().get(3); - private final RuleCall cAttributesAttrClassConfigParserRuleCall_3_0 = (RuleCall)cAttributesAssignment_3.eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); - - /// * - // * Validation: - // * duplicates config, attributes - // * / ActorClassConfig: - // "ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}"; - public ParserRule getRule() { return rule; } - - //"ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}" - public Group getGroup() { return cGroup; } - - //"ActorClassConfig" - public Keyword getActorClassConfigKeyword_0() { return cActorClassConfigKeyword_0; } - - //actor=[room::ActorClass|FQN] - public Assignment getActorAssignment_1() { return cActorAssignment_1; } - - //[room::ActorClass|FQN] - public CrossReference getActorActorClassCrossReference_1_0() { return cActorActorClassCrossReference_1_0; } - - //FQN - public RuleCall getActorActorClassFQNParserRuleCall_1_0_1() { return cActorActorClassFQNParserRuleCall_1_0_1; } - - //"{" - public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; } - - //attributes+=AttrClassConfig* - public Assignment getAttributesAssignment_3() { return cAttributesAssignment_3; } - - //AttrClassConfig - public RuleCall getAttributesAttrClassConfigParserRuleCall_3_0() { return cAttributesAttrClassConfigParserRuleCall_3_0; } - - //"}" - public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; } - } - - public class ActorInstanceConfigElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorInstanceConfig"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cActorInstanceConfigKeyword_0 = (Keyword)cGroup.eContents().get(0); - private final Assignment cRootAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final CrossReference cRootSubSystemClassCrossReference_1_0 = (CrossReference)cRootAssignment_1.eContents().get(0); - private final RuleCall cRootSubSystemClassFQNParserRuleCall_1_0_1 = (RuleCall)cRootSubSystemClassCrossReference_1_0.eContents().get(1); - private final Keyword cSolidusKeyword_2 = (Keyword)cGroup.eContents().get(2); - private final Assignment cPathAssignment_3 = (Assignment)cGroup.eContents().get(3); - private final RuleCall cPathRefPathParserRuleCall_3_0 = (RuleCall)cPathAssignment_3.eContents().get(0); - private final Keyword cLeftCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); - private final Assignment cAttributesAssignment_5 = (Assignment)cGroup.eContents().get(5); - private final RuleCall cAttributesAttrInstanceConfigParserRuleCall_5_0 = (RuleCall)cAttributesAssignment_5.eContents().get(0); - private final Assignment cPortsAssignment_6 = (Assignment)cGroup.eContents().get(6); - private final RuleCall cPortsPortInstanceConfigParserRuleCall_6_0 = (RuleCall)cPortsAssignment_6.eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_7 = (Keyword)cGroup.eContents().get(7); - - /// * - // * Validation: - // * duplicates config, attributes - // * valid instance reference - // * Proposal: - // * attributes - // * / ActorInstanceConfig: - // "ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig* - // ports+=PortInstanceConfig* "}"; - public ParserRule getRule() { return rule; } - - //"ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig* - //ports+=PortInstanceConfig* "}" - public Group getGroup() { return cGroup; } - - //"ActorInstanceConfig" - public Keyword getActorInstanceConfigKeyword_0() { return cActorInstanceConfigKeyword_0; } - - //root=[room::SubSystemClass|FQN] - public Assignment getRootAssignment_1() { return cRootAssignment_1; } - - //[room::SubSystemClass|FQN] - public CrossReference getRootSubSystemClassCrossReference_1_0() { return cRootSubSystemClassCrossReference_1_0; } - - //FQN - public RuleCall getRootSubSystemClassFQNParserRuleCall_1_0_1() { return cRootSubSystemClassFQNParserRuleCall_1_0_1; } - - //"/" - public Keyword getSolidusKeyword_2() { return cSolidusKeyword_2; } - - //path=RefPath - public Assignment getPathAssignment_3() { return cPathAssignment_3; } - - //RefPath - public RuleCall getPathRefPathParserRuleCall_3_0() { return cPathRefPathParserRuleCall_3_0; } - - //"{" - public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; } - - //attributes+=AttrInstanceConfig* - public Assignment getAttributesAssignment_5() { return cAttributesAssignment_5; } - - //AttrInstanceConfig - public RuleCall getAttributesAttrInstanceConfigParserRuleCall_5_0() { return cAttributesAttrInstanceConfigParserRuleCall_5_0; } - - //ports+=PortInstanceConfig* - public Assignment getPortsAssignment_6() { return cPortsAssignment_6; } - - //PortInstanceConfig - public RuleCall getPortsPortInstanceConfigParserRuleCall_6_0() { return cPortsPortInstanceConfigParserRuleCall_6_0; } - - //"}" - public Keyword getRightCurlyBracketKeyword_7() { return cRightCurlyBracketKeyword_7; } - } - - public class ProtocolClassConfigElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ProtocolClassConfig"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cProtocolClassConfigKeyword_0 = (Keyword)cGroup.eContents().get(0); - private final Assignment cProtocolAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final CrossReference cProtocolProtocolClassCrossReference_1_0 = (CrossReference)cProtocolAssignment_1.eContents().get(0); - private final RuleCall cProtocolProtocolClassFQNParserRuleCall_1_0_1 = (RuleCall)cProtocolProtocolClassCrossReference_1_0.eContents().get(1); - private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2); - private final UnorderedGroup cUnorderedGroup_3 = (UnorderedGroup)cGroup.eContents().get(3); - private final Group cGroup_3_0 = (Group)cUnorderedGroup_3.eContents().get(0); - private final Keyword cRegularKeyword_3_0_0 = (Keyword)cGroup_3_0.eContents().get(0); - private final Assignment cRegularAssignment_3_0_1 = (Assignment)cGroup_3_0.eContents().get(1); - private final RuleCall cRegularPortClassConfigParserRuleCall_3_0_1_0 = (RuleCall)cRegularAssignment_3_0_1.eContents().get(0); - private final Group cGroup_3_1 = (Group)cUnorderedGroup_3.eContents().get(1); - private final Keyword cConjugateKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0); - private final Assignment cConjugatedAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1); - private final RuleCall cConjugatedPortClassConfigParserRuleCall_3_1_1_0 = (RuleCall)cConjugatedAssignment_3_1_1.eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); - - //ProtocolClassConfig: - // "ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate" - // conjugated=PortClassConfig)?) "}"; - public ParserRule getRule() { return rule; } - - //"ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate" - //conjugated=PortClassConfig)?) "}" - public Group getGroup() { return cGroup; } - - //"ProtocolClassConfig" - public Keyword getProtocolClassConfigKeyword_0() { return cProtocolClassConfigKeyword_0; } - - //protocol=[room::ProtocolClass|FQN] - public Assignment getProtocolAssignment_1() { return cProtocolAssignment_1; } - - //[room::ProtocolClass|FQN] - public CrossReference getProtocolProtocolClassCrossReference_1_0() { return cProtocolProtocolClassCrossReference_1_0; } - - //FQN - public RuleCall getProtocolProtocolClassFQNParserRuleCall_1_0_1() { return cProtocolProtocolClassFQNParserRuleCall_1_0_1; } - - //"{" - public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; } - - //("regular" regular=PortClassConfig)? & ("conjugate" conjugated=PortClassConfig)? - public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; } - - //("regular" regular=PortClassConfig)? - public Group getGroup_3_0() { return cGroup_3_0; } - - //"regular" - public Keyword getRegularKeyword_3_0_0() { return cRegularKeyword_3_0_0; } - - //regular=PortClassConfig - public Assignment getRegularAssignment_3_0_1() { return cRegularAssignment_3_0_1; } - - //PortClassConfig - public RuleCall getRegularPortClassConfigParserRuleCall_3_0_1_0() { return cRegularPortClassConfigParserRuleCall_3_0_1_0; } - - //("conjugate" conjugated=PortClassConfig)? - public Group getGroup_3_1() { return cGroup_3_1; } - - //"conjugate" - public Keyword getConjugateKeyword_3_1_0() { return cConjugateKeyword_3_1_0; } - - //conjugated=PortClassConfig - public Assignment getConjugatedAssignment_3_1_1() { return cConjugatedAssignment_3_1_1; } - - //PortClassConfig - public RuleCall getConjugatedPortClassConfigParserRuleCall_3_1_1_0() { return cConjugatedPortClassConfigParserRuleCall_3_1_1_0; } - - //"}" - public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; } - } - - public class PortClassConfigElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PortClassConfig"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cPortClassConfigAction_0 = (Action)cGroup.eContents().get(0); - private final Keyword cPortKeyword_1 = (Keyword)cGroup.eContents().get(1); - private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2); - private final Assignment cAttributesAssignment_3 = (Assignment)cGroup.eContents().get(3); - private final RuleCall cAttributesAttrClassConfigParserRuleCall_3_0 = (RuleCall)cAttributesAssignment_3.eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); - - //PortClassConfig: - // {PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}"; - public ParserRule getRule() { return rule; } - - //{PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}" - public Group getGroup() { return cGroup; } - - //{PortClassConfig} - public Action getPortClassConfigAction_0() { return cPortClassConfigAction_0; } - - //"Port" - public Keyword getPortKeyword_1() { return cPortKeyword_1; } - - //"{" - public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; } - - //attributes+=AttrClassConfig* - public Assignment getAttributesAssignment_3() { return cAttributesAssignment_3; } - - //AttrClassConfig - public RuleCall getAttributesAttrClassConfigParserRuleCall_3_0() { return cAttributesAttrClassConfigParserRuleCall_3_0; } - - //"}" - public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; } - } - - public class PortInstanceConfigElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PortInstanceConfig"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cInterfaceItemKeyword_0 = (Keyword)cGroup.eContents().get(0); - private final Assignment cItemAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final CrossReference cItemInterfaceItemCrossReference_1_0 = (CrossReference)cItemAssignment_1.eContents().get(0); - private final RuleCall cItemInterfaceItemIDTerminalRuleCall_1_0_1 = (RuleCall)cItemInterfaceItemCrossReference_1_0.eContents().get(1); - private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2); - private final Assignment cAttributesAssignment_3 = (Assignment)cGroup.eContents().get(3); - private final RuleCall cAttributesAttrInstanceConfigParserRuleCall_3_0 = (RuleCall)cAttributesAssignment_3.eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); - - //PortInstanceConfig: - // "InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}"; - public ParserRule getRule() { return rule; } - - //"InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}" - public Group getGroup() { return cGroup; } - - //"InterfaceItem" - public Keyword getInterfaceItemKeyword_0() { return cInterfaceItemKeyword_0; } - - //item=[room::InterfaceItem] - public Assignment getItemAssignment_1() { return cItemAssignment_1; } - - //[room::InterfaceItem] - public CrossReference getItemInterfaceItemCrossReference_1_0() { return cItemInterfaceItemCrossReference_1_0; } - - //ID - public RuleCall getItemInterfaceItemIDTerminalRuleCall_1_0_1() { return cItemInterfaceItemIDTerminalRuleCall_1_0_1; } - - //"{" - public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; } - - //attributes+=AttrInstanceConfig* - public Assignment getAttributesAssignment_3() { return cAttributesAssignment_3; } - - //AttrInstanceConfig - public RuleCall getAttributesAttrInstanceConfigParserRuleCall_3_0() { return cAttributesAttrInstanceConfigParserRuleCall_3_0; } - - //"}" - public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; } - } - - public class AttrConfigElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrConfig"); - private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); - private final RuleCall cAttrClassConfigParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall cAttrInstanceConfigParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); - - /// * - // * Validation: - // * correct value type - // * Proposal: - // * correct Literal - // * / AttrConfig: - // AttrClassConfig | AttrInstanceConfig; - public ParserRule getRule() { return rule; } - - //AttrClassConfig | AttrInstanceConfig - public Alternatives getAlternatives() { return cAlternatives; } - - //AttrClassConfig - public RuleCall getAttrClassConfigParserRuleCall_0() { return cAttrClassConfigParserRuleCall_0; } - - //AttrInstanceConfig - public RuleCall getAttrInstanceConfigParserRuleCall_1() { return cAttrInstanceConfigParserRuleCall_1; } - } - - public class AttrClassConfigElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrClassConfig"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cAttrKeyword_0 = (Keyword)cGroup.eContents().get(0); - private final Assignment cAttributeAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final CrossReference cAttributeAttributeCrossReference_1_0 = (CrossReference)cAttributeAssignment_1.eContents().get(0); - private final RuleCall cAttributeAttributeIDTerminalRuleCall_1_0_1 = (RuleCall)cAttributeAttributeCrossReference_1_0.eContents().get(1); - private final Group cGroup_2 = (Group)cGroup.eContents().get(2); - private final Keyword cEqualsSignKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0); - private final Assignment cValueAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1); - private final RuleCall cValueLiteralArrayParserRuleCall_2_1_0 = (RuleCall)cValueAssignment_2_1.eContents().get(0); - private final Group cGroup_3 = (Group)cGroup.eContents().get(3); - private final Keyword cLeftCurlyBracketKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0); - private final UnorderedGroup cUnorderedGroup_3_1 = (UnorderedGroup)cGroup_3.eContents().get(1); - private final Group cGroup_3_1_0 = (Group)cUnorderedGroup_3_1.eContents().get(0); - private final Keyword cMinKeyword_3_1_0_0 = (Keyword)cGroup_3_1_0.eContents().get(0); - private final Keyword cEqualsSignKeyword_3_1_0_1 = (Keyword)cGroup_3_1_0.eContents().get(1); - private final Assignment cMinAssignment_3_1_0_2 = (Assignment)cGroup_3_1_0.eContents().get(2); - private final RuleCall cMinNumberLiteralParserRuleCall_3_1_0_2_0 = (RuleCall)cMinAssignment_3_1_0_2.eContents().get(0); - private final Group cGroup_3_1_1 = (Group)cUnorderedGroup_3_1.eContents().get(1); - private final Keyword cMaxKeyword_3_1_1_0 = (Keyword)cGroup_3_1_1.eContents().get(0); - private final Keyword cEqualsSignKeyword_3_1_1_1 = (Keyword)cGroup_3_1_1.eContents().get(1); - private final Assignment cMaxAssignment_3_1_1_2 = (Assignment)cGroup_3_1_1.eContents().get(2); - private final RuleCall cMaxNumberLiteralParserRuleCall_3_1_1_2_0 = (RuleCall)cMaxAssignment_3_1_1_2.eContents().get(0); - private final Keyword cRightCurlyBracketKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2); - - /// * - // * Validation: - // * correct min, max type + available - // * min <= value <= max - // * if !value -> min <= attribute.defaultValue <= max - // * character length - // * - // * / AttrClassConfig: - // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "=" - // max=NumberLiteral)?) "}")?; - public ParserRule getRule() { return rule; } - - //"Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "=" - //max=NumberLiteral)?) "}")? - public Group getGroup() { return cGroup; } - - //"Attr" - public Keyword getAttrKeyword_0() { return cAttrKeyword_0; } - - //attribute=[room::Attribute] - public Assignment getAttributeAssignment_1() { return cAttributeAssignment_1; } - - //[room::Attribute] - public CrossReference getAttributeAttributeCrossReference_1_0() { return cAttributeAttributeCrossReference_1_0; } - - //ID - public RuleCall getAttributeAttributeIDTerminalRuleCall_1_0_1() { return cAttributeAttributeIDTerminalRuleCall_1_0_1; } - - //("=" value=LiteralArray)? - public Group getGroup_2() { return cGroup_2; } - - //"=" - public Keyword getEqualsSignKeyword_2_0() { return cEqualsSignKeyword_2_0; } - - //value=LiteralArray - public Assignment getValueAssignment_2_1() { return cValueAssignment_2_1; } - - //LiteralArray - public RuleCall getValueLiteralArrayParserRuleCall_2_1_0() { return cValueLiteralArrayParserRuleCall_2_1_0; } - - //("{" (("min" "=" min=NumberLiteral)? & ("max" "=" max=NumberLiteral)?) "}")? - public Group getGroup_3() { return cGroup_3; } - - //"{" - public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; } - - //("min" "=" min=NumberLiteral)? & ("max" "=" max=NumberLiteral)? - public UnorderedGroup getUnorderedGroup_3_1() { return cUnorderedGroup_3_1; } - - //("min" "=" min=NumberLiteral)? - public Group getGroup_3_1_0() { return cGroup_3_1_0; } - - //"min" - public Keyword getMinKeyword_3_1_0_0() { return cMinKeyword_3_1_0_0; } - - //"=" - public Keyword getEqualsSignKeyword_3_1_0_1() { return cEqualsSignKeyword_3_1_0_1; } - - //min=NumberLiteral - public Assignment getMinAssignment_3_1_0_2() { return cMinAssignment_3_1_0_2; } - - //NumberLiteral - public RuleCall getMinNumberLiteralParserRuleCall_3_1_0_2_0() { return cMinNumberLiteralParserRuleCall_3_1_0_2_0; } - - //("max" "=" max=NumberLiteral)? - public Group getGroup_3_1_1() { return cGroup_3_1_1; } - - //"max" - public Keyword getMaxKeyword_3_1_1_0() { return cMaxKeyword_3_1_1_0; } - - //"=" - public Keyword getEqualsSignKeyword_3_1_1_1() { return cEqualsSignKeyword_3_1_1_1; } - - //max=NumberLiteral - public Assignment getMaxAssignment_3_1_1_2() { return cMaxAssignment_3_1_1_2; } - - //NumberLiteral - public RuleCall getMaxNumberLiteralParserRuleCall_3_1_1_2_0() { return cMaxNumberLiteralParserRuleCall_3_1_1_2_0; } - - //"}" - public Keyword getRightCurlyBracketKeyword_3_2() { return cRightCurlyBracketKeyword_3_2; } - } - - public class AttrInstanceConfigElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrInstanceConfig"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cAttrKeyword_0 = (Keyword)cGroup.eContents().get(0); - private final Assignment cAttributeAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final CrossReference cAttributeAttributeCrossReference_1_0 = (CrossReference)cAttributeAssignment_1.eContents().get(0); - private final RuleCall cAttributeAttributeIDTerminalRuleCall_1_0_1 = (RuleCall)cAttributeAttributeCrossReference_1_0.eContents().get(1); - private final Group cGroup_2 = (Group)cGroup.eContents().get(2); - private final Keyword cEqualsSignKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0); - private final Assignment cValueAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1); - private final RuleCall cValueLiteralArrayParserRuleCall_2_1_0 = (RuleCall)cValueAssignment_2_1.eContents().get(0); - - //AttrInstanceConfig: - // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)?; - public ParserRule getRule() { return rule; } - - //"Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? - public Group getGroup() { return cGroup; } - - //"Attr" - public Keyword getAttrKeyword_0() { return cAttrKeyword_0; } - - //attribute=[room::Attribute] - public Assignment getAttributeAssignment_1() { return cAttributeAssignment_1; } - - //[room::Attribute] - public CrossReference getAttributeAttributeCrossReference_1_0() { return cAttributeAttributeCrossReference_1_0; } - - //ID - public RuleCall getAttributeAttributeIDTerminalRuleCall_1_0_1() { return cAttributeAttributeIDTerminalRuleCall_1_0_1; } - - //("=" value=LiteralArray)? - public Group getGroup_2() { return cGroup_2; } - - //"=" - public Keyword getEqualsSignKeyword_2_0() { return cEqualsSignKeyword_2_0; } - - //value=LiteralArray - public Assignment getValueAssignment_2_1() { return cValueAssignment_2_1; } - - //LiteralArray - public RuleCall getValueLiteralArrayParserRuleCall_2_1_0() { return cValueLiteralArrayParserRuleCall_2_1_0; } - } - - public class RefPathElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefPath"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Assignment cRefsAssignment_0 = (Assignment)cGroup.eContents().get(0); - private final RuleCall cRefsIDTerminalRuleCall_0_0 = (RuleCall)cRefsAssignment_0.eContents().get(0); - private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Keyword cSolidusKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0); - private final Assignment cRefsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); - private final RuleCall cRefsIDTerminalRuleCall_1_1_0 = (RuleCall)cRefsAssignment_1_1.eContents().get(0); - - /// * - // * Proposal: - // * for ActorInstanceConfig - // * / RefPath: - // refs+=ID ("/" refs+=ID)*; - public ParserRule getRule() { return rule; } - - //refs+=ID ("/" refs+=ID)* - public Group getGroup() { return cGroup; } - - //refs+=ID - public Assignment getRefsAssignment_0() { return cRefsAssignment_0; } - - //ID - public RuleCall getRefsIDTerminalRuleCall_0_0() { return cRefsIDTerminalRuleCall_0_0; } - - //("/" refs+=ID)* - public Group getGroup_1() { return cGroup_1; } - - //"/" - public Keyword getSolidusKeyword_1_0() { return cSolidusKeyword_1_0; } - - //refs+=ID - public Assignment getRefsAssignment_1_1() { return cRefsAssignment_1_1; } - - //ID - public RuleCall getRefsIDTerminalRuleCall_1_1_0() { return cRefsIDTerminalRuleCall_1_1_0; } - } - - public class ImportElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Import"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cImportKeyword_0 = (Keyword)cGroup.eContents().get(0); - private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1); - private final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0); - private final Assignment cImportedNamespaceAssignment_1_0_0 = (Assignment)cGroup_1_0.eContents().get(0); - private final RuleCall cImportedNamespaceImportedFQNParserRuleCall_1_0_0_0 = (RuleCall)cImportedNamespaceAssignment_1_0_0.eContents().get(0); - private final Keyword cFromKeyword_1_0_1 = (Keyword)cGroup_1_0.eContents().get(1); - private final Keyword cModelKeyword_1_1 = (Keyword)cAlternatives_1.eContents().get(1); - private final Assignment cImportURIAssignment_2 = (Assignment)cGroup.eContents().get(2); - private final RuleCall cImportURISTRINGTerminalRuleCall_2_0 = (RuleCall)cImportURIAssignment_2.eContents().get(0); - - //// -------------------- from org.eclipse.etrice.core.Room.xtext --------------- - //Import: - // "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING; - public ParserRule getRule() { return rule; } - - //"import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING - public Group getGroup() { return cGroup; } - - //"import" - public Keyword getImportKeyword_0() { return cImportKeyword_0; } - - //importedNamespace=ImportedFQN "from" | "model" - public Alternatives getAlternatives_1() { return cAlternatives_1; } - - //importedNamespace=ImportedFQN "from" - public Group getGroup_1_0() { return cGroup_1_0; } - - //importedNamespace=ImportedFQN - public Assignment getImportedNamespaceAssignment_1_0_0() { return cImportedNamespaceAssignment_1_0_0; } - - //ImportedFQN - public RuleCall getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0() { return cImportedNamespaceImportedFQNParserRuleCall_1_0_0_0; } - - //"from" - public Keyword getFromKeyword_1_0_1() { return cFromKeyword_1_0_1; } - - //"model" - public Keyword getModelKeyword_1_1() { return cModelKeyword_1_1; } - - //importURI=STRING - public Assignment getImportURIAssignment_2() { return cImportURIAssignment_2; } - - //STRING - public RuleCall getImportURISTRINGTerminalRuleCall_2_0() { return cImportURISTRINGTerminalRuleCall_2_0; } - } - - public class ImportedFQNElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ImportedFQN"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final RuleCall cFQNParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0); - private final Keyword cFullStopAsteriskKeyword_1 = (Keyword)cGroup.eContents().get(1); - - //ImportedFQN: - // FQN ".*"?; - public ParserRule getRule() { return rule; } - - //FQN ".*"? - public Group getGroup() { return cGroup; } - - //FQN - public RuleCall getFQNParserRuleCall_0() { return cFQNParserRuleCall_0; } - - //".*"? - public Keyword getFullStopAsteriskKeyword_1() { return cFullStopAsteriskKeyword_1; } - } - - public class FQNElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FQN"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0); - private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Keyword cFullStopKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0); - private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1); - - //FQN: - // ID ("." ID)*; - public ParserRule getRule() { return rule; } - - //ID ("." ID)* - public Group getGroup() { return cGroup; } - - //ID - public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; } - - //("." ID)* - public Group getGroup_1() { return cGroup_1; } - - //"." - public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; } - - //ID - public RuleCall getIDTerminalRuleCall_1_1() { return cIDTerminalRuleCall_1_1; } - } - - public class LiteralArrayElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LiteralArray"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Assignment cLiteralsAssignment_0 = (Assignment)cGroup.eContents().get(0); - private final RuleCall cLiteralsLiteralParserRuleCall_0_0 = (RuleCall)cLiteralsAssignment_0.eContents().get(0); - private final Group cGroup_1 = (Group)cGroup.eContents().get(1); - private final Keyword cCommaKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0); - private final Assignment cLiteralsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); - private final RuleCall cLiteralsLiteralParserRuleCall_1_1_0 = (RuleCall)cLiteralsAssignment_1_1.eContents().get(0); - - //// ----------------------------------------------------------------------------- - ////enum Unit: - //// N| - //// W| - //// S = 's'| - //// KG = 'kg'| - //// M = 'm'| - //// C| - //// NM| - //// RPM| - //// V| - //// A| - //// HZ = 'Hz'| - //// KW - ////; - //LiteralArray: - // literals+=Literal ("," literals+=Literal)*; - public ParserRule getRule() { return rule; } - - //literals+=Literal ("," literals+=Literal)* - public Group getGroup() { return cGroup; } - - //literals+=Literal - public Assignment getLiteralsAssignment_0() { return cLiteralsAssignment_0; } - - //Literal - public RuleCall getLiteralsLiteralParserRuleCall_0_0() { return cLiteralsLiteralParserRuleCall_0_0; } - - //("," literals+=Literal)* - public Group getGroup_1() { return cGroup_1; } - - //"," - public Keyword getCommaKeyword_1_0() { return cCommaKeyword_1_0; } - - //literals+=Literal - public Assignment getLiteralsAssignment_1_1() { return cLiteralsAssignment_1_1; } - - //Literal - public RuleCall getLiteralsLiteralParserRuleCall_1_1_0() { return cLiteralsLiteralParserRuleCall_1_1_0; } - } - - public class LiteralElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Literal"); - private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); - private final RuleCall cBooleanLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall cNumberLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); - private final RuleCall cStringLiteralParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); - - //// Value Types for Attributes - //Literal: - // BooleanLiteral | NumberLiteral | StringLiteral; - public ParserRule getRule() { return rule; } - - //BooleanLiteral | NumberLiteral | StringLiteral - public Alternatives getAlternatives() { return cAlternatives; } - - //BooleanLiteral - public RuleCall getBooleanLiteralParserRuleCall_0() { return cBooleanLiteralParserRuleCall_0; } - - //NumberLiteral - public RuleCall getNumberLiteralParserRuleCall_1() { return cNumberLiteralParserRuleCall_1; } - - //StringLiteral - public RuleCall getStringLiteralParserRuleCall_2() { return cStringLiteralParserRuleCall_2; } - } - - public class BooleanLiteralElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BooleanLiteral"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cBooleanLiteralAction_0 = (Action)cGroup.eContents().get(0); - private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1); - private final Keyword cFalseKeyword_1_0 = (Keyword)cAlternatives_1.eContents().get(0); - private final Assignment cIsTrueAssignment_1_1 = (Assignment)cAlternatives_1.eContents().get(1); - private final Keyword cIsTrueTrueKeyword_1_1_0 = (Keyword)cIsTrueAssignment_1_1.eContents().get(0); - - //BooleanLiteral: - // {BooleanLiteral} ("false" | isTrue?="true"); - public ParserRule getRule() { return rule; } - - //{BooleanLiteral} ("false" | isTrue?="true") - public Group getGroup() { return cGroup; } - - //{BooleanLiteral} - public Action getBooleanLiteralAction_0() { return cBooleanLiteralAction_0; } - - //"false" | isTrue?="true" - public Alternatives getAlternatives_1() { return cAlternatives_1; } - - //"false" - public Keyword getFalseKeyword_1_0() { return cFalseKeyword_1_0; } - - //isTrue?="true" - public Assignment getIsTrueAssignment_1_1() { return cIsTrueAssignment_1_1; } - - //"true" - public Keyword getIsTrueTrueKeyword_1_1_0() { return cIsTrueTrueKeyword_1_1_0; } - } - - public class NumberLiteralElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NumberLiteral"); - private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); - private final RuleCall cIntLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall cRealLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); - - //NumberLiteral: - // IntLiteral | RealLiteral; - public ParserRule getRule() { return rule; } - - //IntLiteral | RealLiteral - public Alternatives getAlternatives() { return cAlternatives; } - - //IntLiteral - public RuleCall getIntLiteralParserRuleCall_0() { return cIntLiteralParserRuleCall_0; } - - //RealLiteral - public RuleCall getRealLiteralParserRuleCall_1() { return cRealLiteralParserRuleCall_1; } - } - - public class RealLiteralElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RealLiteral"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cRealLiteralAction_0 = (Action)cGroup.eContents().get(0); - private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final RuleCall cValueRealParserRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0); - - //RealLiteral: - // {RealLiteral} value=Real; - public ParserRule getRule() { return rule; } - - //{RealLiteral} value=Real - public Group getGroup() { return cGroup; } - - //{RealLiteral} - public Action getRealLiteralAction_0() { return cRealLiteralAction_0; } - - //value=Real - public Assignment getValueAssignment_1() { return cValueAssignment_1; } - - //Real - public RuleCall getValueRealParserRuleCall_1_0() { return cValueRealParserRuleCall_1_0; } - } - - public class IntLiteralElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IntLiteral"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cIntLiteralAction_0 = (Action)cGroup.eContents().get(0); - private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final RuleCall cValueIntegerParserRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0); - - //IntLiteral: - // {IntLiteral} value=Integer; - public ParserRule getRule() { return rule; } - - //{IntLiteral} value=Integer - public Group getGroup() { return cGroup; } - - //{IntLiteral} - public Action getIntLiteralAction_0() { return cIntLiteralAction_0; } - - //value=Integer - public Assignment getValueAssignment_1() { return cValueAssignment_1; } - - //Integer - public RuleCall getValueIntegerParserRuleCall_1_0() { return cValueIntegerParserRuleCall_1_0; } - } - - public class StringLiteralElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StringLiteral"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Action cStringLiteralAction_0 = (Action)cGroup.eContents().get(0); - private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final RuleCall cValueSTRINGTerminalRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0); - - //StringLiteral: - // {StringLiteral} value=STRING; - public ParserRule getRule() { return rule; } - - //{StringLiteral} value=STRING - public Group getGroup() { return cGroup; } - - //{StringLiteral} - public Action getStringLiteralAction_0() { return cStringLiteralAction_0; } - - //value=STRING - public Assignment getValueAssignment_1() { return cValueAssignment_1; } - - //STRING - public RuleCall getValueSTRINGTerminalRuleCall_1_0() { return cValueSTRINGTerminalRuleCall_1_0; } - } - - public class IntegerElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Integer"); - private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); - private final RuleCall cSignedIntegerParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall cHexadecimalParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); - - //Integer returns ecore::EInt: - // SignedInteger | Hexadecimal; - public ParserRule getRule() { return rule; } - - //SignedInteger | Hexadecimal - public Alternatives getAlternatives() { return cAlternatives; } - - //SignedInteger - public RuleCall getSignedIntegerParserRuleCall_0() { return cSignedIntegerParserRuleCall_0; } - - //Hexadecimal - public RuleCall getHexadecimalParserRuleCall_1() { return cHexadecimalParserRuleCall_1; } - } - - public class SignedIntegerElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SignedInteger"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0); - private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0); - private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1); - private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1); - - //SignedInteger hidden(): - // ("+" | "-")? INT; - public ParserRule getRule() { return rule; } - - //("+" | "-")? INT - public Group getGroup() { return cGroup; } - - //("+" | "-")? - public Alternatives getAlternatives_0() { return cAlternatives_0; } - - //"+" - public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; } - - //"-" - public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; } - - //INT - public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; } - } - - public class HexadecimalElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Hexadecimal"); - private final RuleCall cHEXTerminalRuleCall = (RuleCall)rule.eContents().get(1); - - //Hexadecimal hidden(): - // HEX; - public ParserRule getRule() { return rule; } - - //HEX - public RuleCall getHEXTerminalRuleCall() { return cHEXTerminalRuleCall; } - } - - public class RealElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Real"); - private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); - private final RuleCall cDecimalParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); - private final RuleCall cDotDecimalParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); - private final RuleCall cDecimalDotParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); - private final RuleCall cDecimalExpParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3); - - //Real returns ecore::EDouble: - // Decimal | DotDecimal | DecimalDot | DecimalExp; - public ParserRule getRule() { return rule; } - - //Decimal | DotDecimal | DecimalDot | DecimalExp - public Alternatives getAlternatives() { return cAlternatives; } - - //Decimal - public RuleCall getDecimalParserRuleCall_0() { return cDecimalParserRuleCall_0; } - - //DotDecimal - public RuleCall getDotDecimalParserRuleCall_1() { return cDotDecimalParserRuleCall_1; } - - //DecimalDot - public RuleCall getDecimalDotParserRuleCall_2() { return cDecimalDotParserRuleCall_2; } - - //DecimalExp - public RuleCall getDecimalExpParserRuleCall_3() { return cDecimalExpParserRuleCall_3; } - } - - public class DecimalElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Decimal"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0); - private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0); - private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1); - private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1); - private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2); - private final RuleCall cINTTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3); - - //Decimal hidden(): - // ("+" | "-")? INT "." INT; - public ParserRule getRule() { return rule; } - - //("+" | "-")? INT "." INT - public Group getGroup() { return cGroup; } - - //("+" | "-")? - public Alternatives getAlternatives_0() { return cAlternatives_0; } - - //"+" - public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; } - - //"-" - public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; } - - //INT - public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; } - - //"." - public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; } - - //INT - public RuleCall getINTTerminalRuleCall_3() { return cINTTerminalRuleCall_3; } - } - - public class DotDecimalElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DotDecimal"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0); - private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0); - private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1); - private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1); - private final RuleCall cINTTerminalRuleCall_2 = (RuleCall)cGroup.eContents().get(2); - - //DotDecimal hidden(): - // ("+" | "-")? "." INT; - public ParserRule getRule() { return rule; } - - //("+" | "-")? "." INT - public Group getGroup() { return cGroup; } - - //("+" | "-")? - public Alternatives getAlternatives_0() { return cAlternatives_0; } - - //"+" - public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; } - - //"-" - public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; } - - //"." - public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; } - - //INT - public RuleCall getINTTerminalRuleCall_2() { return cINTTerminalRuleCall_2; } - } - - public class DecimalDotElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DecimalDot"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0); - private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0); - private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1); - private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1); - private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2); - - //DecimalDot hidden(): - // ("+" | "-")? INT "."; - public ParserRule getRule() { return rule; } - - //("+" | "-")? INT "." - public Group getGroup() { return cGroup; } - - //("+" | "-")? - public Alternatives getAlternatives_0() { return cAlternatives_0; } - - //"+" - public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; } - - //"-" - public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; } - - //INT - public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; } - - //"." - public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; } - } - - public class DecimalExpElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DecimalExp"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0); - private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0); - private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1); - private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1); - private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2); - private final RuleCall cINTTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3); - private final RuleCall cIDTerminalRuleCall_4 = (RuleCall)cGroup.eContents().get(4); - private final Alternatives cAlternatives_5 = (Alternatives)cGroup.eContents().get(5); - private final Keyword cPlusSignKeyword_5_0 = (Keyword)cAlternatives_5.eContents().get(0); - private final Keyword cHyphenMinusKeyword_5_1 = (Keyword)cAlternatives_5.eContents().get(1); - private final RuleCall cINTTerminalRuleCall_6 = (RuleCall)cGroup.eContents().get(6); - - //DecimalExp hidden(): - // ("+" | "-")? INT "." INT ID ("+" | "-")? INT; - public ParserRule getRule() { return rule; } - - //("+" | "-")? INT "." INT ID ("+" | "-")? INT - public Group getGroup() { return cGroup; } - - //("+" | "-")? - public Alternatives getAlternatives_0() { return cAlternatives_0; } - - //"+" - public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; } - - //"-" - public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; } - - //INT - public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; } - - //"." - public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; } - - //INT - public RuleCall getINTTerminalRuleCall_3() { return cINTTerminalRuleCall_3; } - - //ID - public RuleCall getIDTerminalRuleCall_4() { return cIDTerminalRuleCall_4; } - - //("+" | "-")? - public Alternatives getAlternatives_5() { return cAlternatives_5; } - - //"+" - public Keyword getPlusSignKeyword_5_0() { return cPlusSignKeyword_5_0; } - - //"-" - public Keyword getHyphenMinusKeyword_5_1() { return cHyphenMinusKeyword_5_1; } - - //INT - public RuleCall getINTTerminalRuleCall_6() { return cINTTerminalRuleCall_6; } - } - - - private ConfigModelElements pConfigModel; - private ConfigElementElements pConfigElement; - 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 RefPathElements pRefPath; - private ImportElements pImport; - private ImportedFQNElements pImportedFQN; - private FQNElements pFQN; - private LiteralArrayElements pLiteralArray; - private LiteralElements pLiteral; - private BooleanLiteralElements pBooleanLiteral; - private NumberLiteralElements pNumberLiteral; - private RealLiteralElements pRealLiteral; - private IntLiteralElements pIntLiteral; - private StringLiteralElements pStringLiteral; - private IntegerElements pInteger; - private SignedIntegerElements pSignedInteger; - private HexadecimalElements pHexadecimal; - private RealElements pReal; - private DecimalElements pDecimal; - private DotDecimalElements pDotDecimal; - private DecimalDotElements pDecimalDot; - private DecimalExpElements pDecimalExp; - private TerminalRule tHEX; - - private final GrammarProvider grammarProvider; - - private TerminalsGrammarAccess gaTerminals; - - @Inject - public ConfigGrammarAccess(GrammarProvider grammarProvider, - TerminalsGrammarAccess gaTerminals) { - this.grammarProvider = grammarProvider; - this.gaTerminals = gaTerminals; - } - - public Grammar getGrammar() { - return grammarProvider.getGrammar(this); - } - - - public TerminalsGrammarAccess getTerminalsGrammarAccess() { - return gaTerminals; - } - - - /// * - // * Postprocessor: - // * getActor(Class|Instance)Config() - // * / ConfigModel: - // imports+=Import* configElements+=ConfigElement*; - public ConfigModelElements getConfigModelAccess() { - return (pConfigModel != null) ? pConfigModel : (pConfigModel = new ConfigModelElements()); - } - - public ParserRule getConfigModelRule() { - return getConfigModelAccess().getRule(); - } - - //ConfigElement: - // ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig; - public ConfigElementElements getConfigElementAccess() { - return (pConfigElement != null) ? pConfigElement : (pConfigElement = new ConfigElementElements()); - } - - public ParserRule getConfigElementRule() { - return getConfigElementAccess().getRule(); - } - - /// * - // * Validation: - // * duplicates config, attributes - // * / ActorClassConfig: - // "ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}"; - public ActorClassConfigElements getActorClassConfigAccess() { - return (pActorClassConfig != null) ? pActorClassConfig : (pActorClassConfig = new ActorClassConfigElements()); - } - - public ParserRule getActorClassConfigRule() { - return getActorClassConfigAccess().getRule(); - } - - /// * - // * Validation: - // * duplicates config, attributes - // * valid instance reference - // * Proposal: - // * attributes - // * / ActorInstanceConfig: - // "ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig* - // ports+=PortInstanceConfig* "}"; - public ActorInstanceConfigElements getActorInstanceConfigAccess() { - return (pActorInstanceConfig != null) ? pActorInstanceConfig : (pActorInstanceConfig = new ActorInstanceConfigElements()); - } - - public ParserRule getActorInstanceConfigRule() { - return getActorInstanceConfigAccess().getRule(); - } - - //ProtocolClassConfig: - // "ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate" - // conjugated=PortClassConfig)?) "}"; - public ProtocolClassConfigElements getProtocolClassConfigAccess() { - return (pProtocolClassConfig != null) ? pProtocolClassConfig : (pProtocolClassConfig = new ProtocolClassConfigElements()); - } - - public ParserRule getProtocolClassConfigRule() { - return getProtocolClassConfigAccess().getRule(); - } - - //PortClassConfig: - // {PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}"; - public PortClassConfigElements getPortClassConfigAccess() { - return (pPortClassConfig != null) ? pPortClassConfig : (pPortClassConfig = new PortClassConfigElements()); - } - - public ParserRule getPortClassConfigRule() { - return getPortClassConfigAccess().getRule(); - } - - //PortInstanceConfig: - // "InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}"; - public PortInstanceConfigElements getPortInstanceConfigAccess() { - return (pPortInstanceConfig != null) ? pPortInstanceConfig : (pPortInstanceConfig = new PortInstanceConfigElements()); - } - - public ParserRule getPortInstanceConfigRule() { - return getPortInstanceConfigAccess().getRule(); - } - - /// * - // * Validation: - // * correct value type - // * Proposal: - // * correct Literal - // * / AttrConfig: - // AttrClassConfig | AttrInstanceConfig; - public AttrConfigElements getAttrConfigAccess() { - return (pAttrConfig != null) ? pAttrConfig : (pAttrConfig = new AttrConfigElements()); - } - - public ParserRule getAttrConfigRule() { - return getAttrConfigAccess().getRule(); - } - - /// * - // * Validation: - // * correct min, max type + available - // * min <= value <= max - // * if !value -> min <= attribute.defaultValue <= max - // * character length - // * - // * / AttrClassConfig: - // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "=" - // max=NumberLiteral)?) "}")?; - public AttrClassConfigElements getAttrClassConfigAccess() { - return (pAttrClassConfig != null) ? pAttrClassConfig : (pAttrClassConfig = new AttrClassConfigElements()); - } - - public ParserRule getAttrClassConfigRule() { - return getAttrClassConfigAccess().getRule(); - } - - //AttrInstanceConfig: - // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)?; - public AttrInstanceConfigElements getAttrInstanceConfigAccess() { - return (pAttrInstanceConfig != null) ? pAttrInstanceConfig : (pAttrInstanceConfig = new AttrInstanceConfigElements()); - } - - public ParserRule getAttrInstanceConfigRule() { - return getAttrInstanceConfigAccess().getRule(); - } - - /// * - // * Proposal: - // * for ActorInstanceConfig - // * / RefPath: - // refs+=ID ("/" refs+=ID)*; - public RefPathElements getRefPathAccess() { - return (pRefPath != null) ? pRefPath : (pRefPath = new RefPathElements()); - } - - public ParserRule getRefPathRule() { - return getRefPathAccess().getRule(); - } - - //// -------------------- from org.eclipse.etrice.core.Room.xtext --------------- - //Import: - // "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING; - public ImportElements getImportAccess() { - return (pImport != null) ? pImport : (pImport = new ImportElements()); - } - - public ParserRule getImportRule() { - return getImportAccess().getRule(); - } - - //ImportedFQN: - // FQN ".*"?; - public ImportedFQNElements getImportedFQNAccess() { - return (pImportedFQN != null) ? pImportedFQN : (pImportedFQN = new ImportedFQNElements()); - } - - public ParserRule getImportedFQNRule() { - return getImportedFQNAccess().getRule(); - } - - //FQN: - // ID ("." ID)*; - public FQNElements getFQNAccess() { - return (pFQN != null) ? pFQN : (pFQN = new FQNElements()); - } - - public ParserRule getFQNRule() { - return getFQNAccess().getRule(); - } - - //// ----------------------------------------------------------------------------- - ////enum Unit: - //// N| - //// W| - //// S = 's'| - //// KG = 'kg'| - //// M = 'm'| - //// C| - //// NM| - //// RPM| - //// V| - //// A| - //// HZ = 'Hz'| - //// KW - ////; - //LiteralArray: - // literals+=Literal ("," literals+=Literal)*; - public LiteralArrayElements getLiteralArrayAccess() { - return (pLiteralArray != null) ? pLiteralArray : (pLiteralArray = new LiteralArrayElements()); - } - - public ParserRule getLiteralArrayRule() { - return getLiteralArrayAccess().getRule(); - } - - //// Value Types for Attributes - //Literal: - // BooleanLiteral | NumberLiteral | StringLiteral; - public LiteralElements getLiteralAccess() { - return (pLiteral != null) ? pLiteral : (pLiteral = new LiteralElements()); - } - - public ParserRule getLiteralRule() { - return getLiteralAccess().getRule(); - } - - //BooleanLiteral: - // {BooleanLiteral} ("false" | isTrue?="true"); - public BooleanLiteralElements getBooleanLiteralAccess() { - return (pBooleanLiteral != null) ? pBooleanLiteral : (pBooleanLiteral = new BooleanLiteralElements()); - } - - public ParserRule getBooleanLiteralRule() { - return getBooleanLiteralAccess().getRule(); - } - - //NumberLiteral: - // IntLiteral | RealLiteral; - public NumberLiteralElements getNumberLiteralAccess() { - return (pNumberLiteral != null) ? pNumberLiteral : (pNumberLiteral = new NumberLiteralElements()); - } - - public ParserRule getNumberLiteralRule() { - return getNumberLiteralAccess().getRule(); - } - - //RealLiteral: - // {RealLiteral} value=Real; - public RealLiteralElements getRealLiteralAccess() { - return (pRealLiteral != null) ? pRealLiteral : (pRealLiteral = new RealLiteralElements()); - } - - public ParserRule getRealLiteralRule() { - return getRealLiteralAccess().getRule(); - } - - //IntLiteral: - // {IntLiteral} value=Integer; - public IntLiteralElements getIntLiteralAccess() { - return (pIntLiteral != null) ? pIntLiteral : (pIntLiteral = new IntLiteralElements()); - } - - public ParserRule getIntLiteralRule() { - return getIntLiteralAccess().getRule(); - } - - //StringLiteral: - // {StringLiteral} value=STRING; - public StringLiteralElements getStringLiteralAccess() { - return (pStringLiteral != null) ? pStringLiteral : (pStringLiteral = new StringLiteralElements()); - } - - public ParserRule getStringLiteralRule() { - return getStringLiteralAccess().getRule(); - } - - //Integer returns ecore::EInt: - // SignedInteger | Hexadecimal; - public IntegerElements getIntegerAccess() { - return (pInteger != null) ? pInteger : (pInteger = new IntegerElements()); - } - - public ParserRule getIntegerRule() { - return getIntegerAccess().getRule(); - } - - //SignedInteger hidden(): - // ("+" | "-")? INT; - public SignedIntegerElements getSignedIntegerAccess() { - return (pSignedInteger != null) ? pSignedInteger : (pSignedInteger = new SignedIntegerElements()); - } - - public ParserRule getSignedIntegerRule() { - return getSignedIntegerAccess().getRule(); - } - - //Hexadecimal hidden(): - // HEX; - public HexadecimalElements getHexadecimalAccess() { - return (pHexadecimal != null) ? pHexadecimal : (pHexadecimal = new HexadecimalElements()); - } - - public ParserRule getHexadecimalRule() { - return getHexadecimalAccess().getRule(); - } - - //Real returns ecore::EDouble: - // Decimal | DotDecimal | DecimalDot | DecimalExp; - public RealElements getRealAccess() { - return (pReal != null) ? pReal : (pReal = new RealElements()); - } - - public ParserRule getRealRule() { - return getRealAccess().getRule(); - } - - //Decimal hidden(): - // ("+" | "-")? INT "." INT; - public DecimalElements getDecimalAccess() { - return (pDecimal != null) ? pDecimal : (pDecimal = new DecimalElements()); - } - - public ParserRule getDecimalRule() { - return getDecimalAccess().getRule(); - } - - //DotDecimal hidden(): - // ("+" | "-")? "." INT; - public DotDecimalElements getDotDecimalAccess() { - return (pDotDecimal != null) ? pDotDecimal : (pDotDecimal = new DotDecimalElements()); - } - - public ParserRule getDotDecimalRule() { - return getDotDecimalAccess().getRule(); - } - - //DecimalDot hidden(): - // ("+" | "-")? INT "."; - public DecimalDotElements getDecimalDotAccess() { - return (pDecimalDot != null) ? pDecimalDot : (pDecimalDot = new DecimalDotElements()); - } - - public ParserRule getDecimalDotRule() { - return getDecimalDotAccess().getRule(); - } - - //DecimalExp hidden(): - // ("+" | "-")? INT "." INT ID ("+" | "-")? INT; - public DecimalExpElements getDecimalExpAccess() { - return (pDecimalExp != null) ? pDecimalExp : (pDecimalExp = new DecimalExpElements()); - } - - public ParserRule getDecimalExpRule() { - return getDecimalExpAccess().getRule(); - } - - ////DecimalPosExp hidden(): - //// ('+' | '-')? INT '.' INT ID; - //terminal HEX: - // ("0x" | "0X") ("0".."9" | "a".."f" | "A".."F")+; - public TerminalRule getHEXRule() { - return (tHEX != null) ? tHEX : (tHEX = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HEX")); - } - - //terminal ID: - // "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*; - public TerminalRule getIDRule() { - return gaTerminals.getIDRule(); - } - - //terminal INT returns ecore::EInt: - // "0".."9"+; - public TerminalRule getINTRule() { - return gaTerminals.getINTRule(); - } - - //terminal STRING: - // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | - // "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'"; - public TerminalRule getSTRINGRule() { - return gaTerminals.getSTRINGRule(); - } - - //terminal ML_COMMENT: - // "/ *"->"* /"; - public TerminalRule getML_COMMENTRule() { - return gaTerminals.getML_COMMENTRule(); - } - - //terminal SL_COMMENT: - // "//" !("\n" | "\r")* ("\r"? "\n")?; - public TerminalRule getSL_COMMENTRule() { - return gaTerminals.getSL_COMMENTRule(); - } - - //terminal WS: - // (" " | "\t" | "\r" | "\n")+; - public TerminalRule getWSRule() { - return gaTerminals.getWSRule(); - } - - //terminal ANY_OTHER: - // .; - public TerminalRule getANY_OTHERRule() { - return gaTerminals.getANY_OTHERRule(); - } -} +/*
+* generated by Xtext
+*/
+
+package org.eclipse.etrice.core.services;
+
+import com.google.inject.Singleton;
+import com.google.inject.Inject;
+
+import java.util.List;
+
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.service.GrammarProvider;
+import org.eclipse.xtext.service.AbstractElementFinder.*;
+
+import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
+
+@Singleton
+public class ConfigGrammarAccess extends AbstractGrammarElementFinder {
+
+
+ public class ConfigModelElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfigModel");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Assignment cImportsAssignment_0 = (Assignment)cGroup.eContents().get(0);
+ private final RuleCall cImportsImportParserRuleCall_0_0 = (RuleCall)cImportsAssignment_0.eContents().get(0);
+ private final Assignment cConfigElementsAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final RuleCall cConfigElementsConfigElementParserRuleCall_1_0 = (RuleCall)cConfigElementsAssignment_1.eContents().get(0);
+
+ /// *
+ // * Postprocessor:
+ // * getActor(Class|Instance)Config()
+ // * / ConfigModel:
+ //
+ // imports+=Import* configElements+=ConfigElement*;
+ public ParserRule getRule() { return rule; }
+
+ //imports+=Import* configElements+=ConfigElement*
+ public Group getGroup() { return cGroup; }
+
+ //imports+=Import*
+ public Assignment getImportsAssignment_0() { return cImportsAssignment_0; }
+
+ //Import
+ public RuleCall getImportsImportParserRuleCall_0_0() { return cImportsImportParserRuleCall_0_0; }
+
+ //configElements+=ConfigElement*
+ public Assignment getConfigElementsAssignment_1() { return cConfigElementsAssignment_1; }
+
+ //ConfigElement
+ public RuleCall getConfigElementsConfigElementParserRuleCall_1_0() { return cConfigElementsConfigElementParserRuleCall_1_0; }
+ }
+
+ public class ConfigElementElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ConfigElement");
+ private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+ private final RuleCall cActorClassConfigParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+ private final RuleCall cActorInstanceConfigParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+ private final RuleCall cProtocolClassConfigParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+
+ //ConfigElement:
+ //
+ // ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig;
+ public ParserRule getRule() { return rule; }
+
+ //ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig
+ public Alternatives getAlternatives() { return cAlternatives; }
+
+ //ActorClassConfig
+ public RuleCall getActorClassConfigParserRuleCall_0() { return cActorClassConfigParserRuleCall_0; }
+
+ //ActorInstanceConfig
+ public RuleCall getActorInstanceConfigParserRuleCall_1() { return cActorInstanceConfigParserRuleCall_1; }
+
+ //ProtocolClassConfig
+ public RuleCall getProtocolClassConfigParserRuleCall_2() { return cProtocolClassConfigParserRuleCall_2; }
+ }
+
+ public class ActorClassConfigElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorClassConfig");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Keyword cActorClassConfigKeyword_0 = (Keyword)cGroup.eContents().get(0);
+ private final Assignment cActorAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final CrossReference cActorActorClassCrossReference_1_0 = (CrossReference)cActorAssignment_1.eContents().get(0);
+ private final RuleCall cActorActorClassFQNParserRuleCall_1_0_1 = (RuleCall)cActorActorClassCrossReference_1_0.eContents().get(1);
+ private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
+ private final Assignment cAttributesAssignment_3 = (Assignment)cGroup.eContents().get(3);
+ private final RuleCall cAttributesAttrClassConfigParserRuleCall_3_0 = (RuleCall)cAttributesAssignment_3.eContents().get(0);
+ private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
+
+ /// *
+ // * Validation:
+ // * duplicates config, attributes
+ // * / ActorClassConfig:
+ //
+ // "ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}";
+ public ParserRule getRule() { return rule; }
+
+ //"ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}"
+ public Group getGroup() { return cGroup; }
+
+ //"ActorClassConfig"
+ public Keyword getActorClassConfigKeyword_0() { return cActorClassConfigKeyword_0; }
+
+ //actor=[room::ActorClass|FQN]
+ public Assignment getActorAssignment_1() { return cActorAssignment_1; }
+
+ //[room::ActorClass|FQN]
+ public CrossReference getActorActorClassCrossReference_1_0() { return cActorActorClassCrossReference_1_0; }
+
+ //FQN
+ public RuleCall getActorActorClassFQNParserRuleCall_1_0_1() { return cActorActorClassFQNParserRuleCall_1_0_1; }
+
+ //"{"
+ public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
+
+ //attributes+=AttrClassConfig*
+ public Assignment getAttributesAssignment_3() { return cAttributesAssignment_3; }
+
+ //AttrClassConfig
+ public RuleCall getAttributesAttrClassConfigParserRuleCall_3_0() { return cAttributesAttrClassConfigParserRuleCall_3_0; }
+
+ //"}"
+ public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
+ }
+
+ public class ActorInstanceConfigElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ActorInstanceConfig");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Keyword cActorInstanceConfigKeyword_0 = (Keyword)cGroup.eContents().get(0);
+ private final Assignment cRootAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final CrossReference cRootSubSystemClassCrossReference_1_0 = (CrossReference)cRootAssignment_1.eContents().get(0);
+ private final RuleCall cRootSubSystemClassFQNParserRuleCall_1_0_1 = (RuleCall)cRootSubSystemClassCrossReference_1_0.eContents().get(1);
+ private final Keyword cSolidusKeyword_2 = (Keyword)cGroup.eContents().get(2);
+ private final Assignment cPathAssignment_3 = (Assignment)cGroup.eContents().get(3);
+ private final RuleCall cPathRefPathParserRuleCall_3_0 = (RuleCall)cPathAssignment_3.eContents().get(0);
+ private final Keyword cLeftCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
+ private final Assignment cAttributesAssignment_5 = (Assignment)cGroup.eContents().get(5);
+ private final RuleCall cAttributesAttrInstanceConfigParserRuleCall_5_0 = (RuleCall)cAttributesAssignment_5.eContents().get(0);
+ private final Assignment cPortsAssignment_6 = (Assignment)cGroup.eContents().get(6);
+ private final RuleCall cPortsPortInstanceConfigParserRuleCall_6_0 = (RuleCall)cPortsAssignment_6.eContents().get(0);
+ private final Keyword cRightCurlyBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);
+
+ /// *
+ // * Validation:
+ // * duplicates config, attributes
+ // * valid instance reference
+ // * Proposal:
+ // * attributes
+ // * /
+ //
+ //ActorInstanceConfig:
+ //
+ // "ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig*
+ //
+ // ports+=PortInstanceConfig* "}";
+ public ParserRule getRule() { return rule; }
+
+ //"ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig*
+ //
+ //ports+=PortInstanceConfig* "}"
+ public Group getGroup() { return cGroup; }
+
+ //"ActorInstanceConfig"
+ public Keyword getActorInstanceConfigKeyword_0() { return cActorInstanceConfigKeyword_0; }
+
+ //root=[room::SubSystemClass|FQN]
+ public Assignment getRootAssignment_1() { return cRootAssignment_1; }
+
+ //[room::SubSystemClass|FQN]
+ public CrossReference getRootSubSystemClassCrossReference_1_0() { return cRootSubSystemClassCrossReference_1_0; }
+
+ //FQN
+ public RuleCall getRootSubSystemClassFQNParserRuleCall_1_0_1() { return cRootSubSystemClassFQNParserRuleCall_1_0_1; }
+
+ //"/"
+ public Keyword getSolidusKeyword_2() { return cSolidusKeyword_2; }
+
+ //path=RefPath
+ public Assignment getPathAssignment_3() { return cPathAssignment_3; }
+
+ //RefPath
+ public RuleCall getPathRefPathParserRuleCall_3_0() { return cPathRefPathParserRuleCall_3_0; }
+
+ //"{"
+ public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; }
+
+ //attributes+=AttrInstanceConfig*
+ public Assignment getAttributesAssignment_5() { return cAttributesAssignment_5; }
+
+ //AttrInstanceConfig
+ public RuleCall getAttributesAttrInstanceConfigParserRuleCall_5_0() { return cAttributesAttrInstanceConfigParserRuleCall_5_0; }
+
+ //ports+=PortInstanceConfig*
+ public Assignment getPortsAssignment_6() { return cPortsAssignment_6; }
+
+ //PortInstanceConfig
+ public RuleCall getPortsPortInstanceConfigParserRuleCall_6_0() { return cPortsPortInstanceConfigParserRuleCall_6_0; }
+
+ //"}"
+ public Keyword getRightCurlyBracketKeyword_7() { return cRightCurlyBracketKeyword_7; }
+ }
+
+ public class ProtocolClassConfigElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ProtocolClassConfig");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Keyword cProtocolClassConfigKeyword_0 = (Keyword)cGroup.eContents().get(0);
+ private final Assignment cProtocolAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final CrossReference cProtocolProtocolClassCrossReference_1_0 = (CrossReference)cProtocolAssignment_1.eContents().get(0);
+ private final RuleCall cProtocolProtocolClassFQNParserRuleCall_1_0_1 = (RuleCall)cProtocolProtocolClassCrossReference_1_0.eContents().get(1);
+ private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
+ private final UnorderedGroup cUnorderedGroup_3 = (UnorderedGroup)cGroup.eContents().get(3);
+ private final Group cGroup_3_0 = (Group)cUnorderedGroup_3.eContents().get(0);
+ private final Keyword cRegularKeyword_3_0_0 = (Keyword)cGroup_3_0.eContents().get(0);
+ private final Assignment cRegularAssignment_3_0_1 = (Assignment)cGroup_3_0.eContents().get(1);
+ private final RuleCall cRegularPortClassConfigParserRuleCall_3_0_1_0 = (RuleCall)cRegularAssignment_3_0_1.eContents().get(0);
+ private final Group cGroup_3_1 = (Group)cUnorderedGroup_3.eContents().get(1);
+ private final Keyword cConjugateKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0);
+ private final Assignment cConjugatedAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1);
+ private final RuleCall cConjugatedPortClassConfigParserRuleCall_3_1_1_0 = (RuleCall)cConjugatedAssignment_3_1_1.eContents().get(0);
+ private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
+
+ //ProtocolClassConfig:
+ //
+ // "ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate"
+ //
+ // conjugated=PortClassConfig)?) "}";
+ public ParserRule getRule() { return rule; }
+
+ //"ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate"
+ //
+ //conjugated=PortClassConfig)?) "}"
+ public Group getGroup() { return cGroup; }
+
+ //"ProtocolClassConfig"
+ public Keyword getProtocolClassConfigKeyword_0() { return cProtocolClassConfigKeyword_0; }
+
+ //protocol=[room::ProtocolClass|FQN]
+ public Assignment getProtocolAssignment_1() { return cProtocolAssignment_1; }
+
+ //[room::ProtocolClass|FQN]
+ public CrossReference getProtocolProtocolClassCrossReference_1_0() { return cProtocolProtocolClassCrossReference_1_0; }
+
+ //FQN
+ public RuleCall getProtocolProtocolClassFQNParserRuleCall_1_0_1() { return cProtocolProtocolClassFQNParserRuleCall_1_0_1; }
+
+ //"{"
+ public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
+
+ //("regular" regular=PortClassConfig)? & ("conjugate" conjugated=PortClassConfig)?
+ public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; }
+
+ //("regular" regular=PortClassConfig)?
+ public Group getGroup_3_0() { return cGroup_3_0; }
+
+ //"regular"
+ public Keyword getRegularKeyword_3_0_0() { return cRegularKeyword_3_0_0; }
+
+ //regular=PortClassConfig
+ public Assignment getRegularAssignment_3_0_1() { return cRegularAssignment_3_0_1; }
+
+ //PortClassConfig
+ public RuleCall getRegularPortClassConfigParserRuleCall_3_0_1_0() { return cRegularPortClassConfigParserRuleCall_3_0_1_0; }
+
+ //("conjugate" conjugated=PortClassConfig)?
+ public Group getGroup_3_1() { return cGroup_3_1; }
+
+ //"conjugate"
+ public Keyword getConjugateKeyword_3_1_0() { return cConjugateKeyword_3_1_0; }
+
+ //conjugated=PortClassConfig
+ public Assignment getConjugatedAssignment_3_1_1() { return cConjugatedAssignment_3_1_1; }
+
+ //PortClassConfig
+ public RuleCall getConjugatedPortClassConfigParserRuleCall_3_1_1_0() { return cConjugatedPortClassConfigParserRuleCall_3_1_1_0; }
+
+ //"}"
+ public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
+ }
+
+ public class PortClassConfigElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PortClassConfig");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Action cPortClassConfigAction_0 = (Action)cGroup.eContents().get(0);
+ private final Keyword cPortKeyword_1 = (Keyword)cGroup.eContents().get(1);
+ private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
+ private final Assignment cAttributesAssignment_3 = (Assignment)cGroup.eContents().get(3);
+ private final RuleCall cAttributesAttrClassConfigParserRuleCall_3_0 = (RuleCall)cAttributesAssignment_3.eContents().get(0);
+ private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
+
+ //PortClassConfig:
+ //
+ // {PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}";
+ public ParserRule getRule() { return rule; }
+
+ //{PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}"
+ public Group getGroup() { return cGroup; }
+
+ //{PortClassConfig}
+ public Action getPortClassConfigAction_0() { return cPortClassConfigAction_0; }
+
+ //"Port"
+ public Keyword getPortKeyword_1() { return cPortKeyword_1; }
+
+ //"{"
+ public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
+
+ //attributes+=AttrClassConfig*
+ public Assignment getAttributesAssignment_3() { return cAttributesAssignment_3; }
+
+ //AttrClassConfig
+ public RuleCall getAttributesAttrClassConfigParserRuleCall_3_0() { return cAttributesAttrClassConfigParserRuleCall_3_0; }
+
+ //"}"
+ public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
+ }
+
+ public class PortInstanceConfigElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PortInstanceConfig");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Keyword cInterfaceItemKeyword_0 = (Keyword)cGroup.eContents().get(0);
+ private final Assignment cItemAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final CrossReference cItemInterfaceItemCrossReference_1_0 = (CrossReference)cItemAssignment_1.eContents().get(0);
+ private final RuleCall cItemInterfaceItemIDTerminalRuleCall_1_0_1 = (RuleCall)cItemInterfaceItemCrossReference_1_0.eContents().get(1);
+ private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
+ private final Assignment cAttributesAssignment_3 = (Assignment)cGroup.eContents().get(3);
+ private final RuleCall cAttributesAttrInstanceConfigParserRuleCall_3_0 = (RuleCall)cAttributesAssignment_3.eContents().get(0);
+ private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
+
+ //PortInstanceConfig:
+ //
+ // "InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}";
+ public ParserRule getRule() { return rule; }
+
+ //"InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}"
+ public Group getGroup() { return cGroup; }
+
+ //"InterfaceItem"
+ public Keyword getInterfaceItemKeyword_0() { return cInterfaceItemKeyword_0; }
+
+ //item=[room::InterfaceItem]
+ public Assignment getItemAssignment_1() { return cItemAssignment_1; }
+
+ //[room::InterfaceItem]
+ public CrossReference getItemInterfaceItemCrossReference_1_0() { return cItemInterfaceItemCrossReference_1_0; }
+
+ //ID
+ public RuleCall getItemInterfaceItemIDTerminalRuleCall_1_0_1() { return cItemInterfaceItemIDTerminalRuleCall_1_0_1; }
+
+ //"{"
+ public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
+
+ //attributes+=AttrInstanceConfig*
+ public Assignment getAttributesAssignment_3() { return cAttributesAssignment_3; }
+
+ //AttrInstanceConfig
+ public RuleCall getAttributesAttrInstanceConfigParserRuleCall_3_0() { return cAttributesAttrInstanceConfigParserRuleCall_3_0; }
+
+ //"}"
+ public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
+ }
+
+ public class AttrConfigElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrConfig");
+ private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+ private final RuleCall cAttrClassConfigParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+ private final RuleCall cAttrInstanceConfigParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+
+ /// *
+ // * Validation:
+ // * correct value type
+ // * Proposal:
+ // * correct Literal
+ // * / AttrConfig:
+ //
+ // AttrClassConfig | AttrInstanceConfig;
+ public ParserRule getRule() { return rule; }
+
+ //AttrClassConfig | AttrInstanceConfig
+ public Alternatives getAlternatives() { return cAlternatives; }
+
+ //AttrClassConfig
+ public RuleCall getAttrClassConfigParserRuleCall_0() { return cAttrClassConfigParserRuleCall_0; }
+
+ //AttrInstanceConfig
+ public RuleCall getAttrInstanceConfigParserRuleCall_1() { return cAttrInstanceConfigParserRuleCall_1; }
+ }
+
+ public class AttrClassConfigElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrClassConfig");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Keyword cAttrKeyword_0 = (Keyword)cGroup.eContents().get(0);
+ private final Assignment cAttributeAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final CrossReference cAttributeAttributeCrossReference_1_0 = (CrossReference)cAttributeAssignment_1.eContents().get(0);
+ private final RuleCall cAttributeAttributeIDTerminalRuleCall_1_0_1 = (RuleCall)cAttributeAttributeCrossReference_1_0.eContents().get(1);
+ private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
+ private final Keyword cEqualsSignKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
+ private final Assignment cValueAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
+ private final RuleCall cValueLiteralArrayParserRuleCall_2_1_0 = (RuleCall)cValueAssignment_2_1.eContents().get(0);
+ private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
+ private final Keyword cLeftCurlyBracketKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
+ private final UnorderedGroup cUnorderedGroup_3_1 = (UnorderedGroup)cGroup_3.eContents().get(1);
+ private final Group cGroup_3_1_0 = (Group)cUnorderedGroup_3_1.eContents().get(0);
+ private final Keyword cMinKeyword_3_1_0_0 = (Keyword)cGroup_3_1_0.eContents().get(0);
+ private final Keyword cEqualsSignKeyword_3_1_0_1 = (Keyword)cGroup_3_1_0.eContents().get(1);
+ private final Assignment cMinAssignment_3_1_0_2 = (Assignment)cGroup_3_1_0.eContents().get(2);
+ private final RuleCall cMinNumberLiteralParserRuleCall_3_1_0_2_0 = (RuleCall)cMinAssignment_3_1_0_2.eContents().get(0);
+ private final Group cGroup_3_1_1 = (Group)cUnorderedGroup_3_1.eContents().get(1);
+ private final Keyword cMaxKeyword_3_1_1_0 = (Keyword)cGroup_3_1_1.eContents().get(0);
+ private final Keyword cEqualsSignKeyword_3_1_1_1 = (Keyword)cGroup_3_1_1.eContents().get(1);
+ private final Assignment cMaxAssignment_3_1_1_2 = (Assignment)cGroup_3_1_1.eContents().get(2);
+ private final RuleCall cMaxNumberLiteralParserRuleCall_3_1_1_2_0 = (RuleCall)cMaxAssignment_3_1_1_2.eContents().get(0);
+ private final Keyword cRightCurlyBracketKeyword_3_2 = (Keyword)cGroup_3.eContents().get(2);
+
+ /// *
+ // * Validation:
+ // * correct min, max type + available
+ // * min <= value <= max
+ // * if !value -> min <= attribute.defaultValue <= max
+ // * character length
+ // *
+ // * /
+ //
+ //AttrClassConfig:
+ //
+ // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "="
+ //
+ // max=NumberLiteral)?) "}")?;
+ public ParserRule getRule() { return rule; }
+
+ //"Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "="
+ //
+ //max=NumberLiteral)?) "}")?
+ public Group getGroup() { return cGroup; }
+
+ //"Attr"
+ public Keyword getAttrKeyword_0() { return cAttrKeyword_0; }
+
+ //attribute=[room::Attribute]
+ public Assignment getAttributeAssignment_1() { return cAttributeAssignment_1; }
+
+ //[room::Attribute]
+ public CrossReference getAttributeAttributeCrossReference_1_0() { return cAttributeAttributeCrossReference_1_0; }
+
+ //ID
+ public RuleCall getAttributeAttributeIDTerminalRuleCall_1_0_1() { return cAttributeAttributeIDTerminalRuleCall_1_0_1; }
+
+ //("=" value=LiteralArray)?
+ public Group getGroup_2() { return cGroup_2; }
+
+ //"="
+ public Keyword getEqualsSignKeyword_2_0() { return cEqualsSignKeyword_2_0; }
+
+ //value=LiteralArray
+ public Assignment getValueAssignment_2_1() { return cValueAssignment_2_1; }
+
+ //LiteralArray
+ public RuleCall getValueLiteralArrayParserRuleCall_2_1_0() { return cValueLiteralArrayParserRuleCall_2_1_0; }
+
+ //("{" (("min" "=" min=NumberLiteral)? & ("max" "=" max=NumberLiteral)?) "}")?
+ public Group getGroup_3() { return cGroup_3; }
+
+ //"{"
+ public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }
+
+ //("min" "=" min=NumberLiteral)? & ("max" "=" max=NumberLiteral)?
+ public UnorderedGroup getUnorderedGroup_3_1() { return cUnorderedGroup_3_1; }
+
+ //("min" "=" min=NumberLiteral)?
+ public Group getGroup_3_1_0() { return cGroup_3_1_0; }
+
+ //"min"
+ public Keyword getMinKeyword_3_1_0_0() { return cMinKeyword_3_1_0_0; }
+
+ //"="
+ public Keyword getEqualsSignKeyword_3_1_0_1() { return cEqualsSignKeyword_3_1_0_1; }
+
+ //min=NumberLiteral
+ public Assignment getMinAssignment_3_1_0_2() { return cMinAssignment_3_1_0_2; }
+
+ //NumberLiteral
+ public RuleCall getMinNumberLiteralParserRuleCall_3_1_0_2_0() { return cMinNumberLiteralParserRuleCall_3_1_0_2_0; }
+
+ //("max" "=" max=NumberLiteral)?
+ public Group getGroup_3_1_1() { return cGroup_3_1_1; }
+
+ //"max"
+ public Keyword getMaxKeyword_3_1_1_0() { return cMaxKeyword_3_1_1_0; }
+
+ //"="
+ public Keyword getEqualsSignKeyword_3_1_1_1() { return cEqualsSignKeyword_3_1_1_1; }
+
+ //max=NumberLiteral
+ public Assignment getMaxAssignment_3_1_1_2() { return cMaxAssignment_3_1_1_2; }
+
+ //NumberLiteral
+ public RuleCall getMaxNumberLiteralParserRuleCall_3_1_1_2_0() { return cMaxNumberLiteralParserRuleCall_3_1_1_2_0; }
+
+ //"}"
+ public Keyword getRightCurlyBracketKeyword_3_2() { return cRightCurlyBracketKeyword_3_2; }
+ }
+
+ public class AttrInstanceConfigElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "AttrInstanceConfig");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Keyword cAttrKeyword_0 = (Keyword)cGroup.eContents().get(0);
+ private final Assignment cAttributeAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final CrossReference cAttributeAttributeCrossReference_1_0 = (CrossReference)cAttributeAssignment_1.eContents().get(0);
+ private final RuleCall cAttributeAttributeIDTerminalRuleCall_1_0_1 = (RuleCall)cAttributeAttributeCrossReference_1_0.eContents().get(1);
+ private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
+ private final Keyword cEqualsSignKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
+ private final Assignment cValueAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
+ private final RuleCall cValueLiteralArrayParserRuleCall_2_1_0 = (RuleCall)cValueAssignment_2_1.eContents().get(0);
+
+ //AttrInstanceConfig:
+ //
+ // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)?;
+ public ParserRule getRule() { return rule; }
+
+ //"Attr" attribute=[room::Attribute] ("=" value=LiteralArray)?
+ public Group getGroup() { return cGroup; }
+
+ //"Attr"
+ public Keyword getAttrKeyword_0() { return cAttrKeyword_0; }
+
+ //attribute=[room::Attribute]
+ public Assignment getAttributeAssignment_1() { return cAttributeAssignment_1; }
+
+ //[room::Attribute]
+ public CrossReference getAttributeAttributeCrossReference_1_0() { return cAttributeAttributeCrossReference_1_0; }
+
+ //ID
+ public RuleCall getAttributeAttributeIDTerminalRuleCall_1_0_1() { return cAttributeAttributeIDTerminalRuleCall_1_0_1; }
+
+ //("=" value=LiteralArray)?
+ public Group getGroup_2() { return cGroup_2; }
+
+ //"="
+ public Keyword getEqualsSignKeyword_2_0() { return cEqualsSignKeyword_2_0; }
+
+ //value=LiteralArray
+ public Assignment getValueAssignment_2_1() { return cValueAssignment_2_1; }
+
+ //LiteralArray
+ public RuleCall getValueLiteralArrayParserRuleCall_2_1_0() { return cValueLiteralArrayParserRuleCall_2_1_0; }
+ }
+
+ public class RefPathElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RefPath");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Assignment cRefsAssignment_0 = (Assignment)cGroup.eContents().get(0);
+ private final RuleCall cRefsIDTerminalRuleCall_0_0 = (RuleCall)cRefsAssignment_0.eContents().get(0);
+ private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
+ private final Keyword cSolidusKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
+ private final Assignment cRefsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
+ private final RuleCall cRefsIDTerminalRuleCall_1_1_0 = (RuleCall)cRefsAssignment_1_1.eContents().get(0);
+
+ /// *
+ // * Proposal:
+ // * for ActorInstanceConfig
+ // * / RefPath:
+ //
+ // refs+=ID ("/" refs+=ID)*;
+ public ParserRule getRule() { return rule; }
+
+ //refs+=ID ("/" refs+=ID)*
+ public Group getGroup() { return cGroup; }
+
+ //refs+=ID
+ public Assignment getRefsAssignment_0() { return cRefsAssignment_0; }
+
+ //ID
+ public RuleCall getRefsIDTerminalRuleCall_0_0() { return cRefsIDTerminalRuleCall_0_0; }
+
+ //("/" refs+=ID)*
+ public Group getGroup_1() { return cGroup_1; }
+
+ //"/"
+ public Keyword getSolidusKeyword_1_0() { return cSolidusKeyword_1_0; }
+
+ //refs+=ID
+ public Assignment getRefsAssignment_1_1() { return cRefsAssignment_1_1; }
+
+ //ID
+ public RuleCall getRefsIDTerminalRuleCall_1_1_0() { return cRefsIDTerminalRuleCall_1_1_0; }
+ }
+
+ public class ImportElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Import");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Keyword cImportKeyword_0 = (Keyword)cGroup.eContents().get(0);
+ private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
+ private final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);
+ private final Assignment cImportedNamespaceAssignment_1_0_0 = (Assignment)cGroup_1_0.eContents().get(0);
+ private final RuleCall cImportedNamespaceImportedFQNParserRuleCall_1_0_0_0 = (RuleCall)cImportedNamespaceAssignment_1_0_0.eContents().get(0);
+ private final Keyword cFromKeyword_1_0_1 = (Keyword)cGroup_1_0.eContents().get(1);
+ private final Keyword cModelKeyword_1_1 = (Keyword)cAlternatives_1.eContents().get(1);
+ private final Assignment cImportURIAssignment_2 = (Assignment)cGroup.eContents().get(2);
+ private final RuleCall cImportURISTRINGTerminalRuleCall_2_0 = (RuleCall)cImportURIAssignment_2.eContents().get(0);
+
+ //// -------------------- from org.eclipse.etrice.core.Room.xtext ---------------
+ // Import:
+ //
+ // "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING;
+ public ParserRule getRule() { return rule; }
+
+ //"import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING
+ public Group getGroup() { return cGroup; }
+
+ //"import"
+ public Keyword getImportKeyword_0() { return cImportKeyword_0; }
+
+ //importedNamespace=ImportedFQN "from" | "model"
+ public Alternatives getAlternatives_1() { return cAlternatives_1; }
+
+ //importedNamespace=ImportedFQN "from"
+ public Group getGroup_1_0() { return cGroup_1_0; }
+
+ //importedNamespace=ImportedFQN
+ public Assignment getImportedNamespaceAssignment_1_0_0() { return cImportedNamespaceAssignment_1_0_0; }
+
+ //ImportedFQN
+ public RuleCall getImportedNamespaceImportedFQNParserRuleCall_1_0_0_0() { return cImportedNamespaceImportedFQNParserRuleCall_1_0_0_0; }
+
+ //"from"
+ public Keyword getFromKeyword_1_0_1() { return cFromKeyword_1_0_1; }
+
+ //"model"
+ public Keyword getModelKeyword_1_1() { return cModelKeyword_1_1; }
+
+ //importURI=STRING
+ public Assignment getImportURIAssignment_2() { return cImportURIAssignment_2; }
+
+ //STRING
+ public RuleCall getImportURISTRINGTerminalRuleCall_2_0() { return cImportURISTRINGTerminalRuleCall_2_0; }
+ }
+
+ public class ImportedFQNElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ImportedFQN");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final RuleCall cFQNParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
+ private final Keyword cFullStopAsteriskKeyword_1 = (Keyword)cGroup.eContents().get(1);
+
+ //ImportedFQN:
+ //
+ // FQN ".*"?;
+ public ParserRule getRule() { return rule; }
+
+ //FQN ".*"?
+ public Group getGroup() { return cGroup; }
+
+ //FQN
+ public RuleCall getFQNParserRuleCall_0() { return cFQNParserRuleCall_0; }
+
+ //".*"?
+ public Keyword getFullStopAsteriskKeyword_1() { return cFullStopAsteriskKeyword_1; }
+ }
+
+ public class FQNElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FQN");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
+ private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
+ private final Keyword cFullStopKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
+ private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
+
+ //FQN:
+ //
+ // ID ("." ID)*;
+ public ParserRule getRule() { return rule; }
+
+ //ID ("." ID)*
+ public Group getGroup() { return cGroup; }
+
+ //ID
+ public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
+
+ //("." ID)*
+ public Group getGroup_1() { return cGroup_1; }
+
+ //"."
+ public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; }
+
+ //ID
+ public RuleCall getIDTerminalRuleCall_1_1() { return cIDTerminalRuleCall_1_1; }
+ }
+
+ public class LiteralArrayElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "LiteralArray");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Assignment cLiteralsAssignment_0 = (Assignment)cGroup.eContents().get(0);
+ private final RuleCall cLiteralsLiteralParserRuleCall_0_0 = (RuleCall)cLiteralsAssignment_0.eContents().get(0);
+ private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
+ private final Keyword cCommaKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
+ private final Assignment cLiteralsAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
+ private final RuleCall cLiteralsLiteralParserRuleCall_1_1_0 = (RuleCall)cLiteralsAssignment_1_1.eContents().get(0);
+
+ //// -----------------------------------------------------------------------------
+ // //enum Unit:
+ // // N|
+ // // W|
+ //
+ //
+ //// S = 's'|
+ // // KG = 'kg'|
+ // // M = 'm'|
+ // // C|
+ // // NM|
+ // // RPM|
+ // // V|
+ // // A|
+ // // HZ = 'Hz'|
+ // // KW
+ // //;
+ //
+ //
+ //// LiteralArray = BooleanLiteral+|NumberLiteral+
+ // // LiteralArray = StringLiteral
+ // LiteralArray:
+ //
+ // literals+=Literal ("," literals+=Literal)*;
+ public ParserRule getRule() { return rule; }
+
+ //literals+=Literal ("," literals+=Literal)*
+ public Group getGroup() { return cGroup; }
+
+ //literals+=Literal
+ public Assignment getLiteralsAssignment_0() { return cLiteralsAssignment_0; }
+
+ //Literal
+ public RuleCall getLiteralsLiteralParserRuleCall_0_0() { return cLiteralsLiteralParserRuleCall_0_0; }
+
+ //("," literals+=Literal)*
+ public Group getGroup_1() { return cGroup_1; }
+
+ //","
+ public Keyword getCommaKeyword_1_0() { return cCommaKeyword_1_0; }
+
+ //literals+=Literal
+ public Assignment getLiteralsAssignment_1_1() { return cLiteralsAssignment_1_1; }
+
+ //Literal
+ public RuleCall getLiteralsLiteralParserRuleCall_1_1_0() { return cLiteralsLiteralParserRuleCall_1_1_0; }
+ }
+
+ public class LiteralElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Literal");
+ private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+ private final RuleCall cBooleanLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+ private final RuleCall cNumberLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+ private final RuleCall cStringLiteralParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+
+ //// Value Types for Attributes
+ // Literal:
+ //
+ // BooleanLiteral | NumberLiteral | StringLiteral;
+ public ParserRule getRule() { return rule; }
+
+ //BooleanLiteral | NumberLiteral | StringLiteral
+ public Alternatives getAlternatives() { return cAlternatives; }
+
+ //BooleanLiteral
+ public RuleCall getBooleanLiteralParserRuleCall_0() { return cBooleanLiteralParserRuleCall_0; }
+
+ //NumberLiteral
+ public RuleCall getNumberLiteralParserRuleCall_1() { return cNumberLiteralParserRuleCall_1; }
+
+ //StringLiteral
+ public RuleCall getStringLiteralParserRuleCall_2() { return cStringLiteralParserRuleCall_2; }
+ }
+
+ public class BooleanLiteralElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "BooleanLiteral");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Action cBooleanLiteralAction_0 = (Action)cGroup.eContents().get(0);
+ private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
+ private final Keyword cFalseKeyword_1_0 = (Keyword)cAlternatives_1.eContents().get(0);
+ private final Assignment cIsTrueAssignment_1_1 = (Assignment)cAlternatives_1.eContents().get(1);
+ private final Keyword cIsTrueTrueKeyword_1_1_0 = (Keyword)cIsTrueAssignment_1_1.eContents().get(0);
+
+ //BooleanLiteral:
+ //
+ // {BooleanLiteral} ("false" | isTrue?="true");
+ public ParserRule getRule() { return rule; }
+
+ //{BooleanLiteral} ("false" | isTrue?="true")
+ public Group getGroup() { return cGroup; }
+
+ //{BooleanLiteral}
+ public Action getBooleanLiteralAction_0() { return cBooleanLiteralAction_0; }
+
+ //"false" | isTrue?="true"
+ public Alternatives getAlternatives_1() { return cAlternatives_1; }
+
+ //"false"
+ public Keyword getFalseKeyword_1_0() { return cFalseKeyword_1_0; }
+
+ //isTrue?="true"
+ public Assignment getIsTrueAssignment_1_1() { return cIsTrueAssignment_1_1; }
+
+ //"true"
+ public Keyword getIsTrueTrueKeyword_1_1_0() { return cIsTrueTrueKeyword_1_1_0; }
+ }
+
+ public class NumberLiteralElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NumberLiteral");
+ private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+ private final RuleCall cIntLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+ private final RuleCall cRealLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+
+ //NumberLiteral:
+ //
+ // IntLiteral | RealLiteral;
+ public ParserRule getRule() { return rule; }
+
+ //IntLiteral | RealLiteral
+ public Alternatives getAlternatives() { return cAlternatives; }
+
+ //IntLiteral
+ public RuleCall getIntLiteralParserRuleCall_0() { return cIntLiteralParserRuleCall_0; }
+
+ //RealLiteral
+ public RuleCall getRealLiteralParserRuleCall_1() { return cRealLiteralParserRuleCall_1; }
+ }
+
+ public class RealLiteralElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RealLiteral");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Action cRealLiteralAction_0 = (Action)cGroup.eContents().get(0);
+ private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final RuleCall cValueRealParserRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0);
+
+ //RealLiteral:
+ //
+ // {RealLiteral} value=Real;
+ public ParserRule getRule() { return rule; }
+
+ //{RealLiteral} value=Real
+ public Group getGroup() { return cGroup; }
+
+ //{RealLiteral}
+ public Action getRealLiteralAction_0() { return cRealLiteralAction_0; }
+
+ //value=Real
+ public Assignment getValueAssignment_1() { return cValueAssignment_1; }
+
+ //Real
+ public RuleCall getValueRealParserRuleCall_1_0() { return cValueRealParserRuleCall_1_0; }
+ }
+
+ public class IntLiteralElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "IntLiteral");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Action cIntLiteralAction_0 = (Action)cGroup.eContents().get(0);
+ private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final RuleCall cValueIntegerParserRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0);
+
+ //IntLiteral:
+ //
+ // {IntLiteral} value=Integer;
+ public ParserRule getRule() { return rule; }
+
+ //{IntLiteral} value=Integer
+ public Group getGroup() { return cGroup; }
+
+ //{IntLiteral}
+ public Action getIntLiteralAction_0() { return cIntLiteralAction_0; }
+
+ //value=Integer
+ public Assignment getValueAssignment_1() { return cValueAssignment_1; }
+
+ //Integer
+ public RuleCall getValueIntegerParserRuleCall_1_0() { return cValueIntegerParserRuleCall_1_0; }
+ }
+
+ public class StringLiteralElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "StringLiteral");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Action cStringLiteralAction_0 = (Action)cGroup.eContents().get(0);
+ private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
+ private final RuleCall cValueSTRINGTerminalRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0);
+
+ //StringLiteral:
+ //
+ // {StringLiteral} value=STRING;
+ public ParserRule getRule() { return rule; }
+
+ //{StringLiteral} value=STRING
+ public Group getGroup() { return cGroup; }
+
+ //{StringLiteral}
+ public Action getStringLiteralAction_0() { return cStringLiteralAction_0; }
+
+ //value=STRING
+ public Assignment getValueAssignment_1() { return cValueAssignment_1; }
+
+ //STRING
+ public RuleCall getValueSTRINGTerminalRuleCall_1_0() { return cValueSTRINGTerminalRuleCall_1_0; }
+ }
+
+ public class IntegerElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Integer");
+ private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+ private final RuleCall cSignedIntegerParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+ private final RuleCall cHexadecimalParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+
+ //Integer returns ecore::EInt:
+ //
+ // SignedInteger | Hexadecimal;
+ public ParserRule getRule() { return rule; }
+
+ //SignedInteger | Hexadecimal
+ public Alternatives getAlternatives() { return cAlternatives; }
+
+ //SignedInteger
+ public RuleCall getSignedIntegerParserRuleCall_0() { return cSignedIntegerParserRuleCall_0; }
+
+ //Hexadecimal
+ public RuleCall getHexadecimalParserRuleCall_1() { return cHexadecimalParserRuleCall_1; }
+ }
+
+ public class SignedIntegerElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "SignedInteger");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
+ private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0);
+ private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
+ private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+
+ //SignedInteger hidden():
+ //
+ // ("+" | "-")? INT;
+ public ParserRule getRule() { return rule; }
+
+ //("+" | "-")? INT
+ public Group getGroup() { return cGroup; }
+
+ //("+" | "-")?
+ public Alternatives getAlternatives_0() { return cAlternatives_0; }
+
+ //"+"
+ public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; }
+
+ //"-"
+ public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; }
+
+ //INT
+ public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+ }
+
+ public class HexadecimalElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Hexadecimal");
+ private final RuleCall cHEXTerminalRuleCall = (RuleCall)rule.eContents().get(1);
+
+ //Hexadecimal hidden():
+ //
+ // HEX;
+ public ParserRule getRule() { return rule; }
+
+ //HEX
+ public RuleCall getHEXTerminalRuleCall() { return cHEXTerminalRuleCall; }
+ }
+
+ public class RealElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Real");
+ private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+ private final RuleCall cDecimalParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+ private final RuleCall cDotDecimalParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+ private final RuleCall cDecimalDotParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+ private final RuleCall cDecimalExpParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
+
+ //Real returns ecore::EDouble:
+ //
+ // Decimal | DotDecimal | DecimalDot | DecimalExp;
+ public ParserRule getRule() { return rule; }
+
+ //Decimal | DotDecimal | DecimalDot | DecimalExp
+ public Alternatives getAlternatives() { return cAlternatives; }
+
+ //Decimal
+ public RuleCall getDecimalParserRuleCall_0() { return cDecimalParserRuleCall_0; }
+
+ //DotDecimal
+ public RuleCall getDotDecimalParserRuleCall_1() { return cDotDecimalParserRuleCall_1; }
+
+ //DecimalDot
+ public RuleCall getDecimalDotParserRuleCall_2() { return cDecimalDotParserRuleCall_2; }
+
+ //DecimalExp
+ public RuleCall getDecimalExpParserRuleCall_3() { return cDecimalExpParserRuleCall_3; }
+ }
+
+ public class DecimalElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Decimal");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
+ private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0);
+ private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
+ private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+ private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);
+ private final RuleCall cINTTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);
+
+ //Decimal hidden():
+ //
+ // ("+" | "-")? INT "." INT;
+ public ParserRule getRule() { return rule; }
+
+ //("+" | "-")? INT "." INT
+ public Group getGroup() { return cGroup; }
+
+ //("+" | "-")?
+ public Alternatives getAlternatives_0() { return cAlternatives_0; }
+
+ //"+"
+ public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; }
+
+ //"-"
+ public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; }
+
+ //INT
+ public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+
+ //"."
+ public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; }
+
+ //INT
+ public RuleCall getINTTerminalRuleCall_3() { return cINTTerminalRuleCall_3; }
+ }
+
+ public class DotDecimalElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DotDecimal");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
+ private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0);
+ private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
+ private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1);
+ private final RuleCall cINTTerminalRuleCall_2 = (RuleCall)cGroup.eContents().get(2);
+
+ //DotDecimal hidden():
+ //
+ // ("+" | "-")? "." INT;
+ public ParserRule getRule() { return rule; }
+
+ //("+" | "-")? "." INT
+ public Group getGroup() { return cGroup; }
+
+ //("+" | "-")?
+ public Alternatives getAlternatives_0() { return cAlternatives_0; }
+
+ //"+"
+ public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; }
+
+ //"-"
+ public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; }
+
+ //"."
+ public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
+
+ //INT
+ public RuleCall getINTTerminalRuleCall_2() { return cINTTerminalRuleCall_2; }
+ }
+
+ public class DecimalDotElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DecimalDot");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
+ private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0);
+ private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
+ private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+ private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);
+
+ //DecimalDot hidden():
+ //
+ // ("+" | "-")? INT ".";
+ public ParserRule getRule() { return rule; }
+
+ //("+" | "-")? INT "."
+ public Group getGroup() { return cGroup; }
+
+ //("+" | "-")?
+ public Alternatives getAlternatives_0() { return cAlternatives_0; }
+
+ //"+"
+ public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; }
+
+ //"-"
+ public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; }
+
+ //INT
+ public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+
+ //"."
+ public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; }
+ }
+
+ public class DecimalExpElements extends AbstractParserRuleElementFinder {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "DecimalExp");
+ private final Group cGroup = (Group)rule.eContents().get(1);
+ private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
+ private final Keyword cPlusSignKeyword_0_0 = (Keyword)cAlternatives_0.eContents().get(0);
+ private final Keyword cHyphenMinusKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
+ private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+ private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);
+ private final RuleCall cINTTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);
+ private final RuleCall cIDTerminalRuleCall_4 = (RuleCall)cGroup.eContents().get(4);
+ private final Alternatives cAlternatives_5 = (Alternatives)cGroup.eContents().get(5);
+ private final Keyword cPlusSignKeyword_5_0 = (Keyword)cAlternatives_5.eContents().get(0);
+ private final Keyword cHyphenMinusKeyword_5_1 = (Keyword)cAlternatives_5.eContents().get(1);
+ private final RuleCall cINTTerminalRuleCall_6 = (RuleCall)cGroup.eContents().get(6);
+
+ //DecimalExp hidden():
+ //
+ // ("+" | "-")? INT "." INT ID ("+" | "-")? INT;
+ public ParserRule getRule() { return rule; }
+
+ //("+" | "-")? INT "." INT ID ("+" | "-")? INT
+ public Group getGroup() { return cGroup; }
+
+ //("+" | "-")?
+ public Alternatives getAlternatives_0() { return cAlternatives_0; }
+
+ //"+"
+ public Keyword getPlusSignKeyword_0_0() { return cPlusSignKeyword_0_0; }
+
+ //"-"
+ public Keyword getHyphenMinusKeyword_0_1() { return cHyphenMinusKeyword_0_1; }
+
+ //INT
+ public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+
+ //"."
+ public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; }
+
+ //INT
+ public RuleCall getINTTerminalRuleCall_3() { return cINTTerminalRuleCall_3; }
+
+ //ID
+ public RuleCall getIDTerminalRuleCall_4() { return cIDTerminalRuleCall_4; }
+
+ //("+" | "-")?
+ public Alternatives getAlternatives_5() { return cAlternatives_5; }
+
+ //"+"
+ public Keyword getPlusSignKeyword_5_0() { return cPlusSignKeyword_5_0; }
+
+ //"-"
+ public Keyword getHyphenMinusKeyword_5_1() { return cHyphenMinusKeyword_5_1; }
+
+ //INT
+ public RuleCall getINTTerminalRuleCall_6() { return cINTTerminalRuleCall_6; }
+ }
+
+
+ private ConfigModelElements pConfigModel;
+ private ConfigElementElements pConfigElement;
+ 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 RefPathElements pRefPath;
+ private ImportElements pImport;
+ private ImportedFQNElements pImportedFQN;
+ private FQNElements pFQN;
+ private LiteralArrayElements pLiteralArray;
+ private LiteralElements pLiteral;
+ private BooleanLiteralElements pBooleanLiteral;
+ private NumberLiteralElements pNumberLiteral;
+ private RealLiteralElements pRealLiteral;
+ private IntLiteralElements pIntLiteral;
+ private StringLiteralElements pStringLiteral;
+ private IntegerElements pInteger;
+ private SignedIntegerElements pSignedInteger;
+ private HexadecimalElements pHexadecimal;
+ private RealElements pReal;
+ private DecimalElements pDecimal;
+ private DotDecimalElements pDotDecimal;
+ private DecimalDotElements pDecimalDot;
+ private DecimalExpElements pDecimalExp;
+ private TerminalRule tHEX;
+
+ private final Grammar grammar;
+
+ private TerminalsGrammarAccess gaTerminals;
+
+ @Inject
+ public ConfigGrammarAccess(GrammarProvider grammarProvider,
+ TerminalsGrammarAccess gaTerminals) {
+ this.grammar = internalFindGrammar(grammarProvider);
+ this.gaTerminals = gaTerminals;
+ }
+
+ protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
+ Grammar grammar = grammarProvider.getGrammar(this);
+ while (grammar != null) {
+ if ("org.eclipse.etrice.core.Config".equals(grammar.getName())) {
+ return grammar;
+ }
+ List<Grammar> grammars = grammar.getUsedGrammars();
+ if (!grammars.isEmpty()) {
+ grammar = grammars.iterator().next();
+ } else {
+ return null;
+ }
+ }
+ return grammar;
+ }
+
+
+ public Grammar getGrammar() {
+ return grammar;
+ }
+
+
+ public TerminalsGrammarAccess getTerminalsGrammarAccess() {
+ return gaTerminals;
+ }
+
+
+ /// *
+ // * Postprocessor:
+ // * getActor(Class|Instance)Config()
+ // * / ConfigModel:
+ //
+ // imports+=Import* configElements+=ConfigElement*;
+ public ConfigModelElements getConfigModelAccess() {
+ return (pConfigModel != null) ? pConfigModel : (pConfigModel = new ConfigModelElements());
+ }
+
+ public ParserRule getConfigModelRule() {
+ return getConfigModelAccess().getRule();
+ }
+
+ //ConfigElement:
+ //
+ // ActorClassConfig | ActorInstanceConfig | ProtocolClassConfig;
+ public ConfigElementElements getConfigElementAccess() {
+ return (pConfigElement != null) ? pConfigElement : (pConfigElement = new ConfigElementElements());
+ }
+
+ public ParserRule getConfigElementRule() {
+ return getConfigElementAccess().getRule();
+ }
+
+ /// *
+ // * Validation:
+ // * duplicates config, attributes
+ // * / ActorClassConfig:
+ //
+ // "ActorClassConfig" actor=[room::ActorClass|FQN] "{" attributes+=AttrClassConfig* "}";
+ public ActorClassConfigElements getActorClassConfigAccess() {
+ return (pActorClassConfig != null) ? pActorClassConfig : (pActorClassConfig = new ActorClassConfigElements());
+ }
+
+ public ParserRule getActorClassConfigRule() {
+ return getActorClassConfigAccess().getRule();
+ }
+
+ /// *
+ // * Validation:
+ // * duplicates config, attributes
+ // * valid instance reference
+ // * Proposal:
+ // * attributes
+ // * /
+ //
+ //ActorInstanceConfig:
+ //
+ // "ActorInstanceConfig" root=[room::SubSystemClass|FQN] "/" path=RefPath "{" attributes+=AttrInstanceConfig*
+ //
+ // ports+=PortInstanceConfig* "}";
+ public ActorInstanceConfigElements getActorInstanceConfigAccess() {
+ return (pActorInstanceConfig != null) ? pActorInstanceConfig : (pActorInstanceConfig = new ActorInstanceConfigElements());
+ }
+
+ public ParserRule getActorInstanceConfigRule() {
+ return getActorInstanceConfigAccess().getRule();
+ }
+
+ //ProtocolClassConfig:
+ //
+ // "ProtocolClassConfig" protocol=[room::ProtocolClass|FQN] "{" (("regular" regular=PortClassConfig)? & ("conjugate"
+ //
+ // conjugated=PortClassConfig)?) "}";
+ public ProtocolClassConfigElements getProtocolClassConfigAccess() {
+ return (pProtocolClassConfig != null) ? pProtocolClassConfig : (pProtocolClassConfig = new ProtocolClassConfigElements());
+ }
+
+ public ParserRule getProtocolClassConfigRule() {
+ return getProtocolClassConfigAccess().getRule();
+ }
+
+ //PortClassConfig:
+ //
+ // {PortClassConfig} "Port" "{" attributes+=AttrClassConfig* "}";
+ public PortClassConfigElements getPortClassConfigAccess() {
+ return (pPortClassConfig != null) ? pPortClassConfig : (pPortClassConfig = new PortClassConfigElements());
+ }
+
+ public ParserRule getPortClassConfigRule() {
+ return getPortClassConfigAccess().getRule();
+ }
+
+ //PortInstanceConfig:
+ //
+ // "InterfaceItem" item=[room::InterfaceItem] "{" attributes+=AttrInstanceConfig* "}";
+ public PortInstanceConfigElements getPortInstanceConfigAccess() {
+ return (pPortInstanceConfig != null) ? pPortInstanceConfig : (pPortInstanceConfig = new PortInstanceConfigElements());
+ }
+
+ public ParserRule getPortInstanceConfigRule() {
+ return getPortInstanceConfigAccess().getRule();
+ }
+
+ /// *
+ // * Validation:
+ // * correct value type
+ // * Proposal:
+ // * correct Literal
+ // * / AttrConfig:
+ //
+ // AttrClassConfig | AttrInstanceConfig;
+ public AttrConfigElements getAttrConfigAccess() {
+ return (pAttrConfig != null) ? pAttrConfig : (pAttrConfig = new AttrConfigElements());
+ }
+
+ public ParserRule getAttrConfigRule() {
+ return getAttrConfigAccess().getRule();
+ }
+
+ /// *
+ // * Validation:
+ // * correct min, max type + available
+ // * min <= value <= max
+ // * if !value -> min <= attribute.defaultValue <= max
+ // * character length
+ // *
+ // * /
+ //
+ //AttrClassConfig:
+ //
+ // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)? ("{" (("min" "=" min=NumberLiteral)? & ("max" "="
+ //
+ // max=NumberLiteral)?) "}")?;
+ public AttrClassConfigElements getAttrClassConfigAccess() {
+ return (pAttrClassConfig != null) ? pAttrClassConfig : (pAttrClassConfig = new AttrClassConfigElements());
+ }
+
+ public ParserRule getAttrClassConfigRule() {
+ return getAttrClassConfigAccess().getRule();
+ }
+
+ //AttrInstanceConfig:
+ //
+ // "Attr" attribute=[room::Attribute] ("=" value=LiteralArray)?;
+ public AttrInstanceConfigElements getAttrInstanceConfigAccess() {
+ return (pAttrInstanceConfig != null) ? pAttrInstanceConfig : (pAttrInstanceConfig = new AttrInstanceConfigElements());
+ }
+
+ public ParserRule getAttrInstanceConfigRule() {
+ return getAttrInstanceConfigAccess().getRule();
+ }
+
+ /// *
+ // * Proposal:
+ // * for ActorInstanceConfig
+ // * / RefPath:
+ //
+ // refs+=ID ("/" refs+=ID)*;
+ public RefPathElements getRefPathAccess() {
+ return (pRefPath != null) ? pRefPath : (pRefPath = new RefPathElements());
+ }
+
+ public ParserRule getRefPathRule() {
+ return getRefPathAccess().getRule();
+ }
+
+ //// -------------------- from org.eclipse.etrice.core.Room.xtext ---------------
+ // Import:
+ //
+ // "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING;
+ public ImportElements getImportAccess() {
+ return (pImport != null) ? pImport : (pImport = new ImportElements());
+ }
+
+ public ParserRule getImportRule() {
+ return getImportAccess().getRule();
+ }
+
+ //ImportedFQN:
+ //
+ // FQN ".*"?;
+ public ImportedFQNElements getImportedFQNAccess() {
+ return (pImportedFQN != null) ? pImportedFQN : (pImportedFQN = new ImportedFQNElements());
+ }
+
+ public ParserRule getImportedFQNRule() {
+ return getImportedFQNAccess().getRule();
+ }
+
+ //FQN:
+ //
+ // ID ("." ID)*;
+ public FQNElements getFQNAccess() {
+ return (pFQN != null) ? pFQN : (pFQN = new FQNElements());
+ }
+
+ public ParserRule getFQNRule() {
+ return getFQNAccess().getRule();
+ }
+
+ //// -----------------------------------------------------------------------------
+ // //enum Unit:
+ // // N|
+ // // W|
+ //
+ //
+ //// S = 's'|
+ // // KG = 'kg'|
+ // // M = 'm'|
+ // // C|
+ // // NM|
+ // // RPM|
+ // // V|
+ // // A|
+ // // HZ = 'Hz'|
+ // // KW
+ // //;
+ //
+ //
+ //// LiteralArray = BooleanLiteral+|NumberLiteral+
+ // // LiteralArray = StringLiteral
+ // LiteralArray:
+ //
+ // literals+=Literal ("," literals+=Literal)*;
+ public LiteralArrayElements getLiteralArrayAccess() {
+ return (pLiteralArray != null) ? pLiteralArray : (pLiteralArray = new LiteralArrayElements());
+ }
+
+ public ParserRule getLiteralArrayRule() {
+ return getLiteralArrayAccess().getRule();
+ }
+
+ //// Value Types for Attributes
+ // Literal:
+ //
+ // BooleanLiteral | NumberLiteral | StringLiteral;
+ public LiteralElements getLiteralAccess() {
+ return (pLiteral != null) ? pLiteral : (pLiteral = new LiteralElements());
+ }
+
+ public ParserRule getLiteralRule() {
+ return getLiteralAccess().getRule();
+ }
+
+ //BooleanLiteral:
+ //
+ // {BooleanLiteral} ("false" | isTrue?="true");
+ public BooleanLiteralElements getBooleanLiteralAccess() {
+ return (pBooleanLiteral != null) ? pBooleanLiteral : (pBooleanLiteral = new BooleanLiteralElements());
+ }
+
+ public ParserRule getBooleanLiteralRule() {
+ return getBooleanLiteralAccess().getRule();
+ }
+
+ //NumberLiteral:
+ //
+ // IntLiteral | RealLiteral;
+ public NumberLiteralElements getNumberLiteralAccess() {
+ return (pNumberLiteral != null) ? pNumberLiteral : (pNumberLiteral = new NumberLiteralElements());
+ }
+
+ public ParserRule getNumberLiteralRule() {
+ return getNumberLiteralAccess().getRule();
+ }
+
+ //RealLiteral:
+ //
+ // {RealLiteral} value=Real;
+ public RealLiteralElements getRealLiteralAccess() {
+ return (pRealLiteral != null) ? pRealLiteral : (pRealLiteral = new RealLiteralElements());
+ }
+
+ public ParserRule getRealLiteralRule() {
+ return getRealLiteralAccess().getRule();
+ }
+
+ //IntLiteral:
+ //
+ // {IntLiteral} value=Integer;
+ public IntLiteralElements getIntLiteralAccess() {
+ return (pIntLiteral != null) ? pIntLiteral : (pIntLiteral = new IntLiteralElements());
+ }
+
+ public ParserRule getIntLiteralRule() {
+ return getIntLiteralAccess().getRule();
+ }
+
+ //StringLiteral:
+ //
+ // {StringLiteral} value=STRING;
+ public StringLiteralElements getStringLiteralAccess() {
+ return (pStringLiteral != null) ? pStringLiteral : (pStringLiteral = new StringLiteralElements());
+ }
+
+ public ParserRule getStringLiteralRule() {
+ return getStringLiteralAccess().getRule();
+ }
+
+ //Integer returns ecore::EInt:
+ //
+ // SignedInteger | Hexadecimal;
+ public IntegerElements getIntegerAccess() {
+ return (pInteger != null) ? pInteger : (pInteger = new IntegerElements());
+ }
+
+ public ParserRule getIntegerRule() {
+ return getIntegerAccess().getRule();
+ }
+
+ //SignedInteger hidden():
+ //
+ // ("+" | "-")? INT;
+ public SignedIntegerElements getSignedIntegerAccess() {
+ return (pSignedInteger != null) ? pSignedInteger : (pSignedInteger = new SignedIntegerElements());
+ }
+
+ public ParserRule getSignedIntegerRule() {
+ return getSignedIntegerAccess().getRule();
+ }
+
+ //Hexadecimal hidden():
+ //
+ // HEX;
+ public HexadecimalElements getHexadecimalAccess() {
+ return (pHexadecimal != null) ? pHexadecimal : (pHexadecimal = new HexadecimalElements());
+ }
+
+ public ParserRule getHexadecimalRule() {
+ return getHexadecimalAccess().getRule();
+ }
+
+ //Real returns ecore::EDouble:
+ //
+ // Decimal | DotDecimal | DecimalDot | DecimalExp;
+ public RealElements getRealAccess() {
+ return (pReal != null) ? pReal : (pReal = new RealElements());
+ }
+
+ public ParserRule getRealRule() {
+ return getRealAccess().getRule();
+ }
+
+ //Decimal hidden():
+ //
+ // ("+" | "-")? INT "." INT;
+ public DecimalElements getDecimalAccess() {
+ return (pDecimal != null) ? pDecimal : (pDecimal = new DecimalElements());
+ }
+
+ public ParserRule getDecimalRule() {
+ return getDecimalAccess().getRule();
+ }
+
+ //DotDecimal hidden():
+ //
+ // ("+" | "-")? "." INT;
+ public DotDecimalElements getDotDecimalAccess() {
+ return (pDotDecimal != null) ? pDotDecimal : (pDotDecimal = new DotDecimalElements());
+ }
+
+ public ParserRule getDotDecimalRule() {
+ return getDotDecimalAccess().getRule();
+ }
+
+ //DecimalDot hidden():
+ //
+ // ("+" | "-")? INT ".";
+ public DecimalDotElements getDecimalDotAccess() {
+ return (pDecimalDot != null) ? pDecimalDot : (pDecimalDot = new DecimalDotElements());
+ }
+
+ public ParserRule getDecimalDotRule() {
+ return getDecimalDotAccess().getRule();
+ }
+
+ //DecimalExp hidden():
+ //
+ // ("+" | "-")? INT "." INT ID ("+" | "-")? INT;
+ public DecimalExpElements getDecimalExpAccess() {
+ return (pDecimalExp != null) ? pDecimalExp : (pDecimalExp = new DecimalExpElements());
+ }
+
+ public ParserRule getDecimalExpRule() {
+ return getDecimalExpAccess().getRule();
+ }
+
+ ////DecimalPosExp hidden():
+ // // ('+' | '-')? INT '.' INT ID;
+ // terminal HEX:
+ //
+ // ("0x" | "0X") ("0".."9" | "a".."f" | "A".."F")+;
+ public TerminalRule getHEXRule() {
+ return (tHEX != null) ? tHEX : (tHEX = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HEX"));
+ }
+
+ //terminal ID:
+ //
+ // "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
+ public TerminalRule getIDRule() {
+ return gaTerminals.getIDRule();
+ }
+
+ //terminal INT returns ecore::EInt:
+ //
+ // "0".."9"+;
+ public TerminalRule getINTRule() {
+ return gaTerminals.getINTRule();
+ }
+
+ //terminal STRING:
+ //
+ // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" |
+ //
+ // "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'";
+ public TerminalRule getSTRINGRule() {
+ return gaTerminals.getSTRINGRule();
+ }
+
+ //terminal ML_COMMENT:
+ //
+ // "/ *"->"* /";
+ public TerminalRule getML_COMMENTRule() {
+ return gaTerminals.getML_COMMENTRule();
+ }
+
+ //terminal SL_COMMENT:
+ //
+ // "//" !("\n" | "\r")* ("\r"? "\n")?;
+ public TerminalRule getSL_COMMENTRule() {
+ return gaTerminals.getSL_COMMENTRule();
+ }
+
+ //terminal WS:
+ //
+ // (" " | "\t" | "\r" | "\n")+;
+ public TerminalRule getWSRule() {
+ return gaTerminals.getWSRule();
+ }
+
+ //terminal ANY_OTHER:
+ //
+ // .;
+ public TerminalRule getANY_OTHERRule() {
+ return gaTerminals.getANY_OTHERRule();
+ }
+}
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 a682a1b7f..5c9cd859a 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 @@ -1,148 +1,148 @@ -/******************************************************************************* - * Copyright (c) 2012 protos software gmbh (http://www.protos.de). - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * CONTRIBUTORS: - * Juergen Haug - * - *******************************************************************************/ -module org.eclipse.etrice.core.GenerateConfig - -import org.eclipse.emf.mwe.utils.* -import org.eclipse.xtext.generator.* -import org.eclipse.xtext.ui.generator.* - -var grammarURI = "classpath:/org/eclipse/etrice/core/Config.xtext" -var file.extensions = "config" -var projectName = "org.eclipse.etrice.core.config" -var runtimeProject = "../${projectName}" - -Workflow { - bean = StandaloneSetup { - scanClassPath = true - platformUri = "${runtimeProject}/.." - registerGenModelFile = "platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel" - } - - component = DirectoryCleaner { - directory = "${runtimeProject}/src-gen" - } - - component = DirectoryCleaner { - directory = "${runtimeProject}.ui/src-gen" - } - - component = Generator { - pathRtProject = runtimeProject - pathUiProject = "${runtimeProject}.ui" - pathTestProject = "${runtimeProject}.tests" - projectNameRt = projectName - projectNameUi = "${projectName}.ui" - language = { - uri = grammarURI - fileExtensions = file.extensions - - // Java API to access grammar elements (required by several other fragments) - fragment = grammarAccess.GrammarAccessFragment {} - - // generates Java API for the generated EPackages - fragment = ecore.EcoreGeneratorFragment { - // referencedGenModels = " - // platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel, - // platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel - // " - } - - // Serializer 2.0 - fragment = serializer.SerializerFragment { - generateStub = false - } - - // the serialization component (1.0) - // fragment = parseTreeConstructor.ParseTreeConstructorFragment {} - - // a custom ResourceFactory for use with EMF - fragment = resourceFactory.ResourceFactoryFragment { - fileExtensions = file.extensions - } - - // The antlr parser generator fragment. - fragment = parser.antlr.XtextAntlrGeneratorFragment { - // options = { - // backtrack = true - // } - } - - // java-based API for validation - fragment = validation.JavaValidatorFragment { - // composedCheck = "org.eclipse.xtext.validation.ImportUriValidator" - // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator" - } - - // scoping and exporting API - // fragment = scoping.ImportURIScopingFragment {} - // fragment = exporting.SimpleNamesFragment {} - - // scoping and exporting API - fragment = scoping.ImportURIScopingFragment {} - // fragment = scoping.ImportNamespacesScopingFragment {} - fragment = exporting.QualifiedNamesFragment {} - fragment = builder.BuilderIntegrationFragment {} - - // generator API - fragment = generator.GeneratorFragment { - generateMwe = false - generateJavaMain = false - } - - // formatter API - fragment = formatting.FormatterFragment {} - - // labeling API - fragment = labeling.LabelProviderFragment {} - - // outline API - fragment = outline.OutlineTreeProviderFragment {} - fragment = outline.QuickOutlineFragment {} - - // quickfix API - fragment = quickfix.QuickfixProviderFragment {} - - // content assist API - fragment = contentAssist.JavaBasedContentAssistFragment {} - - // generates a more lightweight Antlr parser and lexer tailored for content assist - fragment = parser.antlr.XtextAntlrUiGeneratorFragment {} - - // generates junit test support classes into Generator#pathTestProject - fragment = junit.Junit4Fragment {} - - // project wizard (optional) - // fragment = projectWizard.SimpleProjectWizardFragment { - // generatorProjectName = "${projectName}" - // modelFileExtension = file.extensions - // } - - // rename refactoring - fragment = refactoring.RefactorElementNameFragment {} - - // provides the necessary bindings for java types integration - // fragment = types.TypesGeneratorFragment {} - - // generates the required bindings only if the grammar inherits from Xbase - fragment = xbase.XbaseGeneratorFragment {} - - // provides a preference page for template proposals - fragment = templates.CodetemplatesGeneratorFragment {} - - // provides a compare view - fragment = compare.CompareFragment { - fileExtensions = file.extensions - } - - } - } -} +/*******************************************************************************
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Juergen Haug
+ *
+ *******************************************************************************/
+module org.eclipse.etrice.core.GenerateConfig
+
+import org.eclipse.emf.mwe.utils.*
+import org.eclipse.xtext.generator.*
+import org.eclipse.xtext.ui.generator.*
+
+var grammarURI = "classpath:/org/eclipse/etrice/core/Config.xtext"
+var file.extensions = "config"
+var projectName = "org.eclipse.etrice.core.config"
+var runtimeProject = "../${projectName}"
+
+Workflow {
+ bean = StandaloneSetup {
+ scanClassPath = true
+ platformUri = "${runtimeProject}/.."
+ registerGenModelFile = "platform:/resource/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel"
+ }
+
+ component = DirectoryCleaner {
+ directory = "${runtimeProject}/src-gen"
+ }
+
+ component = DirectoryCleaner {
+ directory = "${runtimeProject}.ui/src-gen"
+ }
+
+ component = Generator {
+ pathRtProject = runtimeProject
+ pathUiProject = "${runtimeProject}.ui"
+ pathTestProject = "../../tests/${projectName}.tests"
+ projectNameRt = projectName
+ projectNameUi = "${projectName}.ui"
+ language = {
+ uri = grammarURI
+ fileExtensions = file.extensions
+
+ // Java API to access grammar elements (required by several other fragments)
+ fragment = grammarAccess.GrammarAccessFragment {}
+
+ // generates Java API for the generated EPackages
+ fragment = ecore.EcoreGeneratorFragment {
+ // referencedGenModels = "
+ // platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel,
+ // platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel
+ // "
+ }
+
+ // Serializer 2.0
+ fragment = serializer.SerializerFragment {
+ generateStub = false
+ }
+
+ // the serialization component (1.0)
+ // fragment = parseTreeConstructor.ParseTreeConstructorFragment {}
+
+ // a custom ResourceFactory for use with EMF
+ fragment = resourceFactory.ResourceFactoryFragment {
+ fileExtensions = file.extensions
+ }
+
+ // The antlr parser generator fragment.
+ fragment = parser.antlr.XtextAntlrGeneratorFragment {
+ // options = {
+ // backtrack = true
+ // }
+ }
+
+ // java-based API for validation
+ fragment = validation.JavaValidatorFragment {
+ // composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
+ // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
+ }
+
+ // scoping and exporting API
+ // fragment = scoping.ImportURIScopingFragment {}
+ // fragment = exporting.SimpleNamesFragment {}
+
+ // scoping and exporting API
+ fragment = scoping.ImportURIScopingFragment {}
+ // fragment = scoping.ImportNamespacesScopingFragment {}
+ fragment = exporting.QualifiedNamesFragment {}
+ fragment = builder.BuilderIntegrationFragment {}
+
+ // generator API
+ fragment = generator.GeneratorFragment {
+ generateMwe = false
+ generateJavaMain = false
+ }
+
+ // formatter API
+ fragment = formatting.FormatterFragment {}
+
+ // labeling API
+ fragment = labeling.LabelProviderFragment {}
+
+ // outline API
+ fragment = outline.OutlineTreeProviderFragment {}
+ fragment = outline.QuickOutlineFragment {}
+
+ // quickfix API
+ fragment = quickfix.QuickfixProviderFragment {}
+
+ // content assist API
+ fragment = contentAssist.JavaBasedContentAssistFragment {}
+
+ // generates a more lightweight Antlr parser and lexer tailored for content assist
+ fragment = parser.antlr.XtextAntlrUiGeneratorFragment {}
+
+ // generates junit test support classes into Generator#pathTestProject
+ fragment = junit.Junit4Fragment {}
+
+ // project wizard (optional)
+ // fragment = projectWizard.SimpleProjectWizardFragment {
+ // generatorProjectName = "${projectName}"
+ // modelFileExtension = file.extensions
+ // }
+
+ // rename refactoring
+ fragment = refactoring.RefactorElementNameFragment {}
+
+ // provides the necessary bindings for java types integration
+ // fragment = types.TypesGeneratorFragment {}
+
+ // generates the required bindings only if the grammar inherits from Xbase
+ fragment = xbase.XbaseGeneratorFragment {}
+
+ // provides a preference page for template proposals
+ fragment = templates.CodetemplatesGeneratorFragment {}
+
+ // provides a compare view
+ fragment = compare.CompareFragment {
+ fileExtensions = file.extensions
+ }
+
+ }
+ }
+}
diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF index 13bd0f1ce..f244fd590 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF @@ -25,5 +25,6 @@ Export-Package: org.eclipse.etrice.core.ui, org.eclipse.etrice.core.ui.editor,
org.eclipse.etrice.core.ui.linking,
org.eclipse.etrice.core.ui.newwizard,
- org.eclipse.etrice.core.ui.quickfix
+ org.eclipse.etrice.core.ui.quickfix,
+ org.eclipse.etrice.core.ui.contentassist
Bundle-Activator: org.eclipse.etrice.core.ui.RoomUiActivator
diff --git a/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen index 0d32501f6..0b4a70ead 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen +++ b/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen @@ -151,6 +151,28 @@ </extension> + <!-- marker definitions for org.eclipse.etrice.core.Room --> + <extension + id="room.check.fast" + name="Room Problem" + point="org.eclipse.core.resources.markers"> + <super type="org.eclipse.xtext.ui.check.fast"/> + <persistent value="true"/> + </extension> + <extension + id="room.check.normal" + name="Room Problem" + point="org.eclipse.core.resources.markers"> + <super type="org.eclipse.xtext.ui.check.normal"/> + <persistent value="true"/> + </extension> + <extension + id="room.check.expensive" + name="Room Problem" + point="org.eclipse.core.resources.markers"> + <super type="org.eclipse.xtext.ui.check.expensive"/> + <persistent value="true"/> + </extension> <!-- Quick Outline --> <extension @@ -185,13 +207,34 @@ </command> </menuContribution> </extension> - <!-- quickfix marker resolution generator --> - <extension - point="org.eclipse.ui.ide.markerResolution"> - <markerResolutionGenerator - class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"> - </markerResolutionGenerator> - </extension> + <!-- quickfix marker resolution generator for org.eclipse.etrice.core.Room --> + <extension + point="org.eclipse.ui.ide.markerResolution"> + <markerResolutionGenerator + class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" + markerType="org.eclipse.etrice.core.ui.room.check.fast"> + <attribute + name="FIXABLE_KEY" + value="true"> + </attribute> + </markerResolutionGenerator> + <markerResolutionGenerator + class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" + markerType="org.eclipse.etrice.core.ui.room.check.normal"> + <attribute + name="FIXABLE_KEY" + value="true"> + </attribute> + </markerResolutionGenerator> + <markerResolutionGenerator + class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" + markerType="org.eclipse.etrice.core.ui.room.check.expensive"> + <attribute + name="FIXABLE_KEY" + value="true"> + </attribute> + </markerResolutionGenerator> + </extension> <!-- Rename Refactoring --> <extension point="org.eclipse.ui.handlers"> <handler diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/RoomExecutableExtensionFactory.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/RoomExecutableExtensionFactory.java index 682c2e3c8..1c6060b91 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/RoomExecutableExtensionFactory.java +++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/RoomExecutableExtensionFactory.java @@ -8,6 +8,8 @@ import org.osgi.framework.Bundle; import com.google.inject.Injector; +import org.eclipse.etrice.core.ui.internal.RoomActivator; + /** * This class was generated. Customizations should only happen in a newly * introduced subclass. @@ -16,12 +18,12 @@ public class RoomExecutableExtensionFactory extends AbstractGuiceAwareExecutable @Override protected Bundle getBundle() { - return org.eclipse.etrice.core.ui.internal.RoomActivator.getInstance().getBundle(); + return RoomActivator.getInstance().getBundle(); } @Override protected Injector getInjector() { - return org.eclipse.etrice.core.ui.internal.RoomActivator.getInstance().getInjector("org.eclipse.etrice.core.Room"); + return RoomActivator.getInstance().getInjector(RoomActivator.ORG_ECLIPSE_ETRICE_CORE_ROOM); } } diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/internal/RoomActivator.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/internal/RoomActivator.java index ae99f6cb0..b36788b56 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/internal/RoomActivator.java +++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/internal/RoomActivator.java @@ -3,49 +3,38 @@ */ package org.eclipse.etrice.core.ui.internal; -import static com.google.inject.util.Modules.override; -import static com.google.inject.Guice.createInjector; +import java.util.Collections; +import java.util.Map; import org.apache.log4j.Logger; - import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.xtext.ui.shared.SharedStateModule; +import org.eclipse.xtext.util.Modules2; import org.osgi.framework.BundleContext; +import com.google.common.collect.Maps; +import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; -import java.util.Map; -import java.util.HashMap; - /** * This class was generated. Customizations should only happen in a newly * introduced subclass. */ public class RoomActivator extends AbstractUIPlugin { - - private Map<String,Injector> injectors = new HashMap<String,Injector>(); + + public static final String ORG_ECLIPSE_ETRICE_CORE_ROOM = "org.eclipse.etrice.core.Room"; + + private static final Logger logger = Logger.getLogger(RoomActivator.class); + private static RoomActivator INSTANCE; - - public Injector getInjector(String languageName) { - return injectors.get(languageName); - } + + private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1)); @Override public void start(BundleContext context) throws Exception { super.start(context); INSTANCE = this; - try { - registerInjectorFor("org.eclipse.etrice.core.Room"); - - } catch (Exception e) { - Logger.getLogger(getClass()).error(e.getMessage(), e); - throw e; - } - } - - protected void registerInjectorFor(String language) throws Exception { - injectors.put(language, createInjector( - override(override(getRuntimeModule(language)).with(getSharedStateModule())).with(getUiModule(language)))); } @Override @@ -59,24 +48,48 @@ public class RoomActivator extends AbstractUIPlugin { return INSTANCE; } + public Injector getInjector(String language) { + synchronized (injectors) { + Injector injector = injectors.get(language); + if (injector == null) { + injectors.put(language, injector = createInjector(language)); + } + return injector; + } + } + + protected Injector createInjector(String language) { + try { + Module runtimeModule = getRuntimeModule(language); + Module sharedStateModule = getSharedStateModule(); + Module uiModule = getUiModule(language); + Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); + return Guice.createInjector(mergedModule); + } catch (Exception e) { + logger.error("Failed to create injector for " + language); + logger.error(e.getMessage(), e); + throw new RuntimeException("Failed to create injector for " + language, e); + } + } + protected Module getRuntimeModule(String grammar) { - if ("org.eclipse.etrice.core.Room".equals(grammar)) { - return new org.eclipse.etrice.core.RoomRuntimeModule(); + if (ORG_ECLIPSE_ETRICE_CORE_ROOM.equals(grammar)) { + return new org.eclipse.etrice.core.RoomRuntimeModule(); } throw new IllegalArgumentException(grammar); } protected Module getUiModule(String grammar) { - if ("org.eclipse.etrice.core.Room".equals(grammar)) { - return new org.eclipse.etrice.core.ui.RoomUiModule(this); + if (ORG_ECLIPSE_ETRICE_CORE_ROOM.equals(grammar)) { + return new org.eclipse.etrice.core.ui.RoomUiModule(this); } throw new IllegalArgumentException(grammar); } protected Module getSharedStateModule() { - return new org.eclipse.xtext.ui.shared.SharedStateModule(); + return new SharedStateModule(); } } diff --git a/plugins/org.eclipse.etrice.core.room/gen_room.launch b/plugins/org.eclipse.etrice.core.room/gen_room.launch index 041054485..ed5e6a8d5 100644 --- a/plugins/org.eclipse.etrice.core.room/gen_room.launch +++ b/plugins/org.eclipse.etrice.core.room/gen_room.launch @@ -10,6 +10,12 @@ <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="org.eclipse.etrice.core.room" path="1" type="4"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="org.eclipse.etrice.core.room"/> </runtimeClasspathEntry> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry externalArchive="C:/Users/hrentz/Downloads/eclipse/Indigo/target/eclipse-modeling-indigo-win32/eclipse/plugins/org.antlr.generator_3.2.0.v201011091333.jar" path="3" type="2"/> "/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/etrice/core/GenerateRoom.mwe2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.core.room"/>
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/AbstractRoomRuntimeModule.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/AbstractRoomRuntimeModule.java index 90378b590..43bb61726 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/AbstractRoomRuntimeModule.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/AbstractRoomRuntimeModule.java @@ -35,6 +35,11 @@ public abstract class AbstractRoomRuntimeModule extends DefaultRuntimeModule { } // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment + public java.lang.ClassLoader bindClassLoaderToInstance() { + return getClass().getClassLoader(); + } + + // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() { return org.eclipse.etrice.core.services.RoomGrammarAccess.class; } diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore index 9ea6333ca..8f25a708b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="room"
- nsURI="http://www.eclipse.org/etrice/Room" nsPrefix="room">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="room" nsURI="http://www.eclipse.org/etrice/Room" nsPrefix="room">
<eClassifiers xsi:type="ecore:EClass" name="RoomModel">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="docu" eType="#//Documentation"
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel index 5f06ee774..35a6f4cd8 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.genmodel @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.room/src-gen"
- editDirectory="/org.eclipse.etrice.core.room.edit/src" editorDirectory="/org.eclipse.etrice.core.room.editor/src"
- modelPluginID="org.eclipse.etrice.core.room" forceOverwrite="true" modelName="Room"
- updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.core.room/src-gen" editDirectory="/org.eclipse.etrice.core.room.edit/src"
+ editorDirectory="/org.eclipse.etrice.core.room.editor/src" modelPluginID="org.eclipse.etrice.core.room"
+ forceOverwrite="true" modelName="Room" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.etrice.core.room.edit"
- editorPluginID="org.eclipse.etrice.core.room.editor">
+ editorPluginID="org.eclipse.etrice.core.room.editor" runtimeVersion="2.8">
<genPackages prefix="Room" basePackage="org.eclipse.etrice.core" disposableProviderFactory="true"
ecorePackage="Room.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="Room.ecore#//LiteralType">
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java index 67444aca9..1d541da2c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java @@ -123,15 +123,20 @@ protected class ThisRootNode extends RootToken { /************ begin Rule RoomModel **************** * * RoomModel: + * * "RoomModel" name=FQN docu=Documentation? "{" imports+=Import* (primitiveTypes+=PrimitiveType | + * * externalTypes+=ExternalType | dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | + * * actorClasses+=ActorClass | subSystemClasses+=SubSystemClass | systems+=LogicalSystem)* "}"; * **/ // "RoomModel" name=FQN docu=Documentation? "{" imports+=Import* (primitiveTypes+=PrimitiveType | -// externalTypes+=ExternalType | dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass -// | subSystemClasses+=SubSystemClass | systems+=LogicalSystem)* "}" +// +// externalTypes+=ExternalType | dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | +// +// actorClasses+=ActorClass | subSystemClasses+=SubSystemClass | systems+=LogicalSystem)* "}" protected class RoomModel_Group extends GroupToken { public RoomModel_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -332,7 +337,9 @@ protected class RoomModel_ImportsAssignment_4 extends AssignmentToken { } // (primitiveTypes+=PrimitiveType | externalTypes+=ExternalType | dataClasses+=DataClass | +// // protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass | subSystemClasses+=SubSystemClass | +// // systems+=LogicalSystem)* protected class RoomModel_Alternatives_5 extends AlternativesToken { @@ -729,6 +736,7 @@ protected class RoomModel_RightCurlyBracketKeyword_6 extends KeywordToken { /************ begin Rule RoomClass **************** * * RoomClass: + * * DataType | GeneralProtocolClass | StructureClass; * **/ @@ -891,6 +899,7 @@ protected class RoomClass_StructureClassParserRuleCall_2 extends RuleCallToken { /************ begin Rule StructureClass **************** * * StructureClass: + * * ActorContainerClass | LogicalSystem; * **/ @@ -1007,6 +1016,7 @@ protected class StructureClass_LogicalSystemParserRuleCall_1 extends RuleCallTok /************ begin Rule ActorContainerClass **************** * * ActorContainerClass: + * * ActorClass | SubSystemClass; * **/ @@ -1125,6 +1135,7 @@ protected class ActorContainerClass_SubSystemClassParserRuleCall_1 extends RuleC * // data class * * VarDecl: + * * name=ID ":" refType=RefableType; * **/ @@ -1266,6 +1277,7 @@ protected class VarDecl_RefTypeAssignment_2 extends AssignmentToken { /************ begin Rule RefableType **************** * * RefableType: + * * type=[DataType|FQN] ref?="ref"?; * **/ @@ -1377,6 +1389,7 @@ protected class RefableType_RefAssignment_1 extends AssignmentToken { /************ begin Rule DataType **************** * * DataType: + * * PrimitiveType | ComplexType; * **/ @@ -1493,6 +1506,7 @@ protected class DataType_ComplexTypeParserRuleCall_1 extends RuleCallToken { /************ begin Rule ComplexType **************** * * ComplexType: + * * DataClass | ExternalType; * **/ @@ -1607,12 +1621,15 @@ protected class ComplexType_ExternalTypeParserRuleCall_1 extends RuleCallToken { /************ begin Rule PrimitiveType **************** * * PrimitiveType: + * * "PrimitiveType" name=ID ":" type=LiteralType "->" targetName=FQN ("(" castName=FQN ")")? "default" + * * defaultValueLiteral=STRING docu=Documentation?; * **/ // "PrimitiveType" name=ID ":" type=LiteralType "->" targetName=FQN ("(" castName=FQN ")")? "default" +// // defaultValueLiteral=STRING docu=Documentation? protected class PrimitiveType_Group extends GroupToken { @@ -2021,6 +2038,7 @@ protected class PrimitiveType_DocuAssignment_9 extends AssignmentToken { /************ begin Rule ExternalType **************** * * ExternalType: + * * "ExternalType" name=ID "->" targetName=FQN docu=Documentation?; * **/ @@ -2221,14 +2239,19 @@ protected class ExternalType_DocuAssignment_4 extends AssignmentToken { * // TODOHRR: define detail level language? * * DataClass: + * * "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" + * * userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+ + * * operations+=StandardOperation* "}"; * **/ // "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" +// // userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+ +// // operations+=StandardOperation* "}" protected class DataClass_Group extends GroupToken { @@ -2920,7 +2943,10 @@ protected class DataClass_RightCurlyBracketKeyword_11 extends KeywordToken { /************ begin Rule Attribute **************** * * Attribute: - * "Attribute" name=ID ("[" size=INT "]")? ":" refType=RefableType ("=" defaultValueLiteral=STRING)? docu=Documentation?; + * + * "Attribute" name=ID ("[" size=INT "]")? ":" refType=RefableType ("=" defaultValueLiteral=STRING)? + * + * docu=Documentation?; * **/ @@ -3313,6 +3339,7 @@ protected class Attribute_DocuAssignment_6 extends AssignmentToken { /************ begin Rule Operation **************** * * Operation: + * * StandardOperation | PortOperation; * **/ @@ -3427,12 +3454,15 @@ protected class Operation_PortOperationParserRuleCall_1 extends RuleCallToken { /************ begin Rule StandardOperation **************** * * StandardOperation: + * * "Operation" destructor?="~"? name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | + * * returntype=RefableType))? docu=Documentation? detailCode=DetailCode; * **/ // "Operation" destructor?="~"? name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | +// // returntype=RefableType))? docu=Documentation? detailCode=DetailCode protected class StandardOperation_Group extends GroupToken { @@ -3975,12 +4005,15 @@ protected class StandardOperation_DetailCodeAssignment_8 extends AssignmentToken /************ begin Rule PortOperation **************** * * PortOperation: + * * "Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | returntype=RefableType) | + * * "sends" sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode; * **/ // "Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | returntype=RefableType) | +// // "sends" sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode protected class PortOperation_Group extends GroupToken { @@ -4594,6 +4627,7 @@ protected class PortOperation_DetailCodeAssignment_7 extends AssignmentToken { /************ begin Rule GeneralProtocolClass **************** * * GeneralProtocolClass: + * * ProtocolClass | CompoundProtocolClass; * **/ @@ -4708,18 +4742,27 @@ protected class GeneralProtocolClass_CompoundProtocolClassParserRuleCall_1 exten /************ begin Rule ProtocolClass **************** * * ProtocolClass: + * * commType=CommunicationType? "ProtocolClass" name=ID docu=Documentation? ("extends" base=[ProtocolClass|FQN])? "{" + * * annotations+=Annotation* ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" + * * userCode3=DetailCode)? ("incoming" "{" incomingMessages+=Message* "}")? ("outgoing" "{" outgoingMessages+=Message* + * * "}")? ("regular" "PortClass" regular=PortClass)? ("conjugate" "PortClass" conjugate=PortClass)? + * * semantics=ProtocolSemantics? "}"; * **/ // commType=CommunicationType? "ProtocolClass" name=ID docu=Documentation? ("extends" base=[ProtocolClass|FQN])? "{" +// // annotations+=Annotation* ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" +// // userCode3=DetailCode)? ("incoming" "{" incomingMessages+=Message* "}")? ("outgoing" "{" outgoingMessages+=Message* +// // "}")? ("regular" "PortClass" regular=PortClass)? ("conjugate" "PortClass" conjugate=PortClass)? +// // semantics=ProtocolSemantics? "}" protected class ProtocolClass_Group extends GroupToken { @@ -5929,6 +5972,7 @@ protected class ProtocolClass_RightCurlyBracketKeyword_15 extends KeywordToken /************ begin Rule CompoundProtocolClass **************** * * CompoundProtocolClass: + * * "CompoundProtocolClass" name=ID docu=Documentation? "{" annotations+=Annotation* subProtocols+=SubProtocol+ "}"; * **/ @@ -6210,6 +6254,7 @@ protected class CompoundProtocolClass_RightCurlyBracketKeyword_6 extends Keyword /************ begin Rule SubProtocol **************** * * SubProtocol: + * * "SubProtocol" name=ID ":" protocol=[GeneralProtocolClass|FQN]; * **/ @@ -6364,6 +6409,7 @@ protected class SubProtocol_ProtocolAssignment_3 extends AssignmentToken { /************ begin Rule Message **************** * * Message: + * * priv?="private"? "Message" name=ID "(" data=VarDecl? ")" docu=Documentation?; * **/ @@ -6631,12 +6677,15 @@ protected class Message_DocuAssignment_6 extends AssignmentToken { /************ begin Rule PortClass **************** * * PortClass: + * * "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | + * * msgHandlers+=MessageHandler)+ "}"; * **/ // "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | msgHandlers+=MessageHandler)+ +// // "}" protected class PortClass_Group extends GroupToken { @@ -6976,6 +7025,7 @@ protected class PortClass_RightCurlyBracketKeyword_3 extends KeywordToken { /************ begin Rule MessageHandler **************** * * MessageHandler: + * * InMessageHandler | OutMessageHandler; * **/ @@ -7090,6 +7140,7 @@ protected class MessageHandler_OutMessageHandlerParserRuleCall_1 extends RuleCal /************ begin Rule InMessageHandler **************** * * InMessageHandler: + * * "handle" "incoming" msg=[Message] detailCode=DetailCode; * **/ @@ -7256,6 +7307,7 @@ protected class InMessageHandler_DetailCodeAssignment_3 extends AssignmentToken /************ begin Rule OutMessageHandler **************** * * OutMessageHandler: + * * "handle" "outgoing" msg=[Message] detailCode=DetailCode; * **/ @@ -7422,6 +7474,7 @@ protected class OutMessageHandler_DetailCodeAssignment_3 extends AssignmentToken /************ begin Rule ProtocolSemantics **************** * * ProtocolSemantics: + * * {ProtocolSemantics} "semantics" "{" rules+=SemanticsRule* "}"; * **/ @@ -7602,6 +7655,7 @@ protected class ProtocolSemantics_RightCurlyBracketKeyword_4 extends KeywordToke /************ begin Rule SemanticsRule **************** * * SemanticsRule: + * * InSemanticsRule | OutSemanticsRule; * **/ @@ -7716,12 +7770,15 @@ protected class SemanticsRule_OutSemanticsRuleParserRuleCall_1 extends RuleCallT /************ begin Rule InSemanticsRule **************** * * InSemanticsRule: + * * "in" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ + * * ")"))?; * **/ // "in" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ +// // ")"))? protected class InSemanticsRule_Group extends GroupToken { @@ -8159,12 +8216,15 @@ protected class InSemanticsRule_RightParenthesisKeyword_3_1_1_3 extends KeywordT /************ begin Rule OutSemanticsRule **************** * * OutSemanticsRule: - * "out" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ - * ")"))?; + * + * "out" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," + * + * followUps+=SemanticsRule)+ ")"))?; * **/ // "out" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ +// // ")"))? protected class OutSemanticsRule_Group extends GroupToken { @@ -8616,23 +8676,36 @@ protected class OutSemanticsRule_RightParenthesisKeyword_3_1_1_3 extends Keyword * // since double containment is not supported we decided to define external ports as reference to interface ports * * ActorClass: + * * (abstract?="abstract"? & commType=ActorCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" + * * base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" ifPorts+=Port* ifSPPs+=SPPRef* "}")? + * * ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? + * * ("usercode3" userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* + * * serviceImplementations+=ServiceImplementation* strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* + * * bindings+=Binding* connections+=LayerConnection* "}")? ("Behavior" behaviorDocu=Documentation? "{" + * * behaviorAnnotations+=Annotation* operations+=StandardOperation* stateMachine=StateMachine? "}")? "}"; * **/ // (abstract?="abstract"? & commType=ActorCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" -// base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" ifPorts+=Port* ifSPPs+=SPPRef* "}")? ("Structure" -// structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" -// userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* serviceImplementations+=ServiceImplementation* -// strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* bindings+=Binding* connections+=LayerConnection* "}")? -// ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* operations+=StandardOperation* -// stateMachine=StateMachine? "}")? "}" +// +// base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" ifPorts+=Port* ifSPPs+=SPPRef* "}")? +// +// ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? +// +// ("usercode3" userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* +// +// serviceImplementations+=ServiceImplementation* strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* +// +// bindings+=Binding* connections+=LayerConnection* "}")? ("Behavior" behaviorDocu=Documentation? "{" +// +// behaviorAnnotations+=Annotation* operations+=StandardOperation* stateMachine=StateMachine? "}")? "}" protected class ActorClass_Group extends GroupToken { public ActorClass_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) { @@ -9195,8 +9268,11 @@ protected class ActorClass_RightCurlyBracketKeyword_7_4 extends KeywordToken { // ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? +// // ("usercode3" userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* +// // serviceImplementations+=ServiceImplementation* strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* +// // bindings+=Binding* connections+=LayerConnection* "}")? protected class ActorClass_Group_8 extends GroupToken { @@ -10067,6 +10143,7 @@ protected class ActorClass_RightCurlyBracketKeyword_8_13 extends KeywordToken { // ("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* operations+=StandardOperation* +// // stateMachine=StateMachine? "}")? protected class ActorClass_Group_9 extends GroupToken { @@ -10385,6 +10462,7 @@ protected class ActorClass_RightCurlyBracketKeyword_10 extends KeywordToken { /************ begin Rule InterfaceItem **************** * * InterfaceItem: + * * Port | SAPRef | SPPRef; * **/ @@ -10537,12 +10615,15 @@ protected class InterfaceItem_SPPRefParserRuleCall_2 extends RuleCallToken { /************ begin Rule Port **************** * * Port: + * * conjugated?="conjugated"? "Port" name=ID multiplicity=MULTIPLICITY? ":" protocol=[GeneralProtocolClass|FQN] + * * docu=Documentation?; * **/ // conjugated?="conjugated"? "Port" name=ID multiplicity=MULTIPLICITY? ":" protocol=[GeneralProtocolClass|FQN] +// // docu=Documentation? protected class Port_Group extends GroupToken { @@ -10809,6 +10890,7 @@ protected class Port_DocuAssignment_6 extends AssignmentToken { /************ begin Rule ExternalPort **************** * * ExternalPort: + * * "external" "Port" ifport=[Port]; * **/ @@ -10929,6 +11011,7 @@ protected class ExternalPort_IfportAssignment_2 extends AssignmentToken { /************ begin Rule SAPRef **************** * * SAPRef: + * * "SAP" name=ID ":" protocol=[ProtocolClass|FQN]; * **/ @@ -11083,6 +11166,7 @@ protected class SAPRef_ProtocolAssignment_3 extends AssignmentToken { /************ begin Rule SPPRef **************** * * SPPRef: + * * "SPP" name=ID ":" protocol=[ProtocolClass|FQN]; * **/ @@ -11237,6 +11321,7 @@ protected class SPPRef_ProtocolAssignment_3 extends AssignmentToken { /************ begin Rule ServiceImplementation **************** * * ServiceImplementation: + * * "ServiceImplementation" "of" spp=[SPPRef]; * **/ @@ -11357,12 +11442,15 @@ protected class ServiceImplementation_SppAssignment_2 extends AssignmentToken { /************ begin Rule LogicalSystem **************** * * LogicalSystem: + * * "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* subSystems+=SubSystemRef* bindings+=Binding* + * * connections+=LayerConnection* "}"; * **/ // "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* subSystems+=SubSystemRef* bindings+=Binding* +// // connections+=LayerConnection* "}" protected class LogicalSystem_Group extends GroupToken { @@ -11743,6 +11831,7 @@ protected class LogicalSystem_RightCurlyBracketKeyword_8 extends KeywordToken { /************ begin Rule ActorContainerRef **************** * * ActorContainerRef: + * * SubSystemRef | ActorRef; * **/ @@ -11857,6 +11946,7 @@ protected class ActorContainerRef_ActorRefParserRuleCall_1 extends RuleCallToken /************ begin Rule SubSystemRef **************** * * SubSystemRef: + * * "SubSystemRef" name=ID ":" type=[SubSystemClass|FQN] docu=Documentation?; * **/ @@ -12058,14 +12148,19 @@ protected class SubSystemRef_DocuAssignment_4 extends AssignmentToken { /************ begin Rule SubSystemClass **************** * * SubSystemClass: + * * "SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? + * * ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? relayPorts+=Port* ifSPPs+=SPPRef* + * * actorRefs+=ActorRef* bindings+=Binding* connections+=LayerConnection* threads+=LogicalThread* "}"; * **/ // "SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? +// // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? relayPorts+=Port* ifSPPs+=SPPRef* +// // actorRefs+=ActorRef* bindings+=Binding* connections+=LayerConnection* threads+=LogicalThread* "}" protected class SubSystemClass_Group extends GroupToken { @@ -12905,6 +13000,7 @@ protected class SubSystemClass_RightCurlyBracketKeyword_14 extends KeywordToken /************ begin Rule LogicalThread **************** * * LogicalThread: + * * "LogicalThread" name=ID "prio" "=" prio=INT "{" instances+=ActorInstancePath ("," instances+=ActorInstancePath)* "}"; * **/ @@ -13261,6 +13357,7 @@ protected class LogicalThread_RightCurlyBracketKeyword_8 extends KeywordToken { /************ begin Rule ActorInstancePath **************** * * ActorInstancePath: + * * segments+=ID ("." segments+=ID)*; * **/ @@ -13421,6 +13518,7 @@ protected class ActorInstancePath_SegmentsAssignment_1_1 extends AssignmentToken * // (2) use a notation with 1 to n bindings * * Binding: + * * "Binding" endpoint1=BindingEndPoint "and" endpoint2=BindingEndPoint; * **/ @@ -13596,6 +13694,7 @@ protected class Binding_Endpoint2Assignment_3 extends AssignmentToken { /************ begin Rule BindingEndPoint **************** * * BindingEndPoint: + * * (actorRef=[ActorContainerRef] ".")? port=[Port] ("sub" sub=[SubProtocol])?; * **/ @@ -13837,6 +13936,7 @@ protected class BindingEndPoint_SubAssignment_2_1 extends AssignmentToken { /************ begin Rule LayerConnection **************** * * LayerConnection: + * * "LayerConnection" from=SAPoint "satisfied_by" to=SPPoint; * **/ @@ -14012,6 +14112,7 @@ protected class LayerConnection_ToAssignment_3 extends AssignmentToken { /************ begin Rule SAPoint **************** * * SAPoint: + * * RefSAPoint | RelaySAPoint; * **/ @@ -14332,6 +14433,7 @@ protected class RelaySAPoint_RelayAssignment_1 extends AssignmentToken { /************ begin Rule SPPoint **************** * * SPPoint: + * * ref=[ActorContainerRef] "." service=[SPPRef]; * **/ @@ -14467,6 +14569,7 @@ protected class SPPoint_ServiceAssignment_2 extends AssignmentToken { /************ begin Rule ActorRef **************** * * ActorRef: + * * "ActorRef" name=ID ("[" size=INT "]")? ":" type=[ActorClass|FQN] docu=Documentation?; * **/ @@ -14774,6 +14877,7 @@ protected class ActorRef_DocuAssignment_5 extends AssignmentToken { * // state machine * * StateGraphNode: + * * State | ChoicePoint | TrPoint; * **/ @@ -14932,6 +15036,7 @@ protected class StateGraphNode_TrPointParserRuleCall_2 extends RuleCallToken { /************ begin Rule StateGraphItem **************** * * StateGraphItem: + * * StateGraphNode | Transition; * **/ @@ -15064,6 +15169,7 @@ protected class StateGraphItem_TransitionParserRuleCall_1 extends RuleCallToken /************ begin Rule State **************** * * State: + * * SimpleState | RefinedState; * **/ @@ -15178,12 +15284,15 @@ protected class State_RefinedStateParserRuleCall_1 extends RuleCallToken { /************ begin Rule StateGraph **************** * * StateGraph: + * * {StateGraph} "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | + * * refinedTransitions+=RefinedTransition)* "}"; * **/ // {StateGraph} "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | +// // refinedTransitions+=RefinedTransition)* "}" protected class StateGraph_Group extends GroupToken { @@ -15262,6 +15371,7 @@ protected class StateGraph_LeftCurlyBracketKeyword_1 extends KeywordToken { } // (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | +// // refinedTransitions+=RefinedTransition)* protected class StateGraph_Alternatives_2 extends AlternativesToken { @@ -15554,12 +15664,15 @@ protected class StateGraph_RightCurlyBracketKeyword_3 extends KeywordToken { /************ begin Rule StateMachine **************** * * StateMachine returns StateGraph: - * {StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | - * refinedTransitions+=RefinedTransition)* "}"; + * + * {StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition + * + * | refinedTransitions+=RefinedTransition)* "}"; * **/ // {StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | +// // refinedTransitions+=RefinedTransition)* "}" protected class StateMachine_Group extends GroupToken { @@ -15660,6 +15773,7 @@ protected class StateMachine_LeftCurlyBracketKeyword_2 extends KeywordToken { } // (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | +// // refinedTransitions+=RefinedTransition)* protected class StateMachine_Alternatives_3 extends AlternativesToken { @@ -15952,12 +16066,15 @@ protected class StateMachine_RightCurlyBracketKeyword_4 extends KeywordToken { /************ begin Rule SimpleState **************** * * SimpleState: + * * "State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do" + * * doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")?; * **/ // "State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do" +// // doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")? protected class SimpleState_Group extends GroupToken { @@ -16091,6 +16208,7 @@ protected class SimpleState_DocuAssignment_2 extends AssignmentToken { } // ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do" doCode=DetailCode)? ("subgraph" +// // subgraph=StateGraph)? "}")? protected class SimpleState_Group_3 extends GroupToken { @@ -16539,12 +16657,15 @@ protected class SimpleState_RightCurlyBracketKeyword_3_5 extends KeywordToken { /************ begin Rule RefinedState **************** * * RefinedState: + * * "RefinedState" target=[State|FQN] docu=Documentation? "{" ("entry" entryCode=DetailCode)? ("exit" + * * exitCode=DetailCode)? ("do" doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}"; * **/ // "RefinedState" target=[State|FQN] docu=Documentation? "{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? +// // ("do" doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}" protected class RefinedState_Group extends GroupToken { @@ -17108,6 +17229,7 @@ protected class RefinedState_RightCurlyBracketKeyword_8 extends KeywordToken { * // super() keyword or flag like in Trice * * DetailCode: + * * "{" commands+=STRING+ "}"; * **/ @@ -17226,6 +17348,7 @@ protected class DetailCode_RightCurlyBracketKeyword_2 extends KeywordToken { /************ begin Rule TrPoint **************** * * TrPoint: + * * TransitionPoint | EntryPoint | ExitPoint; * **/ @@ -17378,6 +17501,7 @@ protected class TrPoint_ExitPointParserRuleCall_2 extends RuleCallToken { /************ begin Rule TransitionPoint **************** * * TransitionPoint: + * * handler?="handler"? "TransitionPoint" name=ID; * **/ @@ -17507,6 +17631,7 @@ protected class TransitionPoint_NameAssignment_2 extends AssignmentToken { /************ begin Rule EntryPoint **************** * * EntryPoint: + * * "EntryPoint" name=ID; * **/ @@ -17602,6 +17727,7 @@ protected class EntryPoint_NameAssignment_1 extends AssignmentToken { /************ begin Rule ExitPoint **************** * * ExitPoint: + * * "ExitPoint" name=ID; * **/ @@ -17697,6 +17823,7 @@ protected class ExitPoint_NameAssignment_1 extends AssignmentToken { /************ begin Rule ChoicePoint **************** * * ChoicePoint: + * * "ChoicePoint" name=ID docu=Documentation?; * **/ @@ -17839,6 +17966,7 @@ protected class ChoicePoint_DocuAssignment_2 extends AssignmentToken { /************ begin Rule Transition **************** * * Transition: + * * InitialTransition | NonInitialTransition; * **/ @@ -17959,6 +18087,7 @@ protected class Transition_NonInitialTransitionParserRuleCall_1 extends RuleCall /************ begin Rule NonInitialTransition **************** * * NonInitialTransition: + * * TransitionChainStartTransition | ContinuationTransition | CPBranchTransition; * **/ @@ -18113,6 +18242,7 @@ protected class NonInitialTransition_CPBranchTransitionParserRuleCall_2 extends /************ begin Rule TransitionChainStartTransition **************** * * TransitionChainStartTransition: + * * TriggeredTransition | GuardedTransition; * **/ @@ -18227,7 +18357,9 @@ protected class TransitionChainStartTransition_GuardedTransitionParserRuleCall_1 /************ begin Rule InitialTransition **************** * * InitialTransition: + * * "Transition" name=ID? ":" "initial" "->" to=TransitionTerminal docu=Documentation? "{" ("action" action=DetailCode)? + * * "}"; * **/ @@ -18619,12 +18751,15 @@ protected class InitialTransition_RightCurlyBracketKeyword_9 extends KeywordToke /************ begin Rule ContinuationTransition **************** * * ContinuationTransition: + * * "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? ("{" ("action" + * * action=DetailCode)? "}")?; * **/ // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? ("{" ("action" +// // action=DetailCode)? "}")? protected class ContinuationTransition_Group extends GroupToken { @@ -19060,12 +19195,15 @@ protected class ContinuationTransition_RightCurlyBracketKeyword_7_2 extends Keyw /************ begin Rule TriggeredTransition **************** * * TriggeredTransition: + * * "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "triggers" "{" + * * triggers+=Trigger ("or" triggers+=Trigger)* "}" ("action" action=DetailCode)? "}"; * **/ // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "triggers" "{" +// // triggers+=Trigger ("or" triggers+=Trigger)* "}" ("action" action=DetailCode)? "}" protected class TriggeredTransition_Group extends GroupToken { @@ -19682,12 +19820,15 @@ protected class TriggeredTransition_RightCurlyBracketKeyword_14 extends KeywordT /************ begin Rule GuardedTransition **************** * * GuardedTransition: + * * "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "guard" + * * guard=DetailCode ("action" action=DetailCode)? "}"; * **/ // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "guard" +// // guard=DetailCode ("action" action=DetailCode)? "}" protected class GuardedTransition_Group extends GroupToken { @@ -20167,12 +20308,15 @@ protected class GuardedTransition_RightCurlyBracketKeyword_11 extends KeywordTok /************ begin Rule CPBranchTransition **************** * * CPBranchTransition: + * * "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "cond" + * * condition=DetailCode ("action" action=DetailCode)? "}"; * **/ // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "cond" +// // condition=DetailCode ("action" action=DetailCode)? "}" protected class CPBranchTransition_Group extends GroupToken { @@ -20651,7 +20795,10 @@ protected class CPBranchTransition_RightCurlyBracketKeyword_11 extends KeywordTo /************ begin Rule RefinedTransition **************** * + * // by validation RefinedTransition can only be contained in the top level state graph + * * RefinedTransition: + * * "RefinedTransition" target=[Transition|FQN] docu=Documentation? "{" "action" action=DetailCode "}"; * **/ @@ -20909,6 +21056,7 @@ protected class RefinedTransition_RightCurlyBracketKeyword_6 extends KeywordToke /************ begin Rule TransitionTerminal **************** * * TransitionTerminal: + * * StateTerminal | TrPointTerminal | SubStateTrPointTerminal | ChoicepointTerminal; * **/ @@ -21099,6 +21247,7 @@ protected class TransitionTerminal_ChoicepointTerminalParserRuleCall_3 extends R /************ begin Rule StateTerminal **************** * * StateTerminal: + * * state=[State]; * **/ @@ -21147,6 +21296,7 @@ protected class StateTerminal_StateAssignment extends AssignmentToken { /************ begin Rule TrPointTerminal **************** * * TrPointTerminal: + * * "my" trPoint=[TrPoint]; * **/ @@ -21245,6 +21395,7 @@ protected class TrPointTerminal_TrPointAssignment_1 extends AssignmentToken { /************ begin Rule SubStateTrPointTerminal **************** * * SubStateTrPointTerminal: + * * trPoint=[TrPoint] "of" state=[State]; * **/ @@ -21380,6 +21531,7 @@ protected class SubStateTrPointTerminal_StateAssignment_2 extends AssignmentToke /************ begin Rule ChoicepointTerminal **************** * * ChoicepointTerminal: + * * "cp" cp=[ChoicePoint]; * **/ @@ -21478,6 +21630,7 @@ protected class ChoicepointTerminal_CpAssignment_1 extends AssignmentToken { /************ begin Rule Trigger **************** * * Trigger: + * * "<" msgFromIfPairs+=MessageFromIf ("|" msgFromIfPairs+=MessageFromIf)* guard=Guard? ">"; * **/ @@ -21748,6 +21901,7 @@ protected class Trigger_GreaterThanSignKeyword_4 extends KeywordToken { /************ begin Rule MessageFromIf **************** * * MessageFromIf: + * * message=[Message] ":" from=[InterfaceItem]; * **/ @@ -21883,6 +22037,7 @@ protected class MessageFromIf_FromAssignment_2 extends AssignmentToken { /************ begin Rule Guard **************** * * Guard: + * * "guard" guard=DetailCode; * **/ @@ -21994,6 +22149,7 @@ protected class Guard_GuardAssignment_1 extends AssignmentToken { * // general * * Documentation: + * * "[" text+=STRING+ "]"; * **/ @@ -22112,6 +22268,7 @@ protected class Documentation_RightSquareBracketKeyword_2 extends KeywordToken /************ begin Rule Annotation **************** * * Annotation: + * * "@" name=ID ("(" attributes+=KeyValue ("," attributes+=KeyValue)* ")")?; * **/ @@ -22414,6 +22571,7 @@ protected class Annotation_RightParenthesisKeyword_2_3 extends KeywordToken { /************ begin Rule KeyValue **************** * * KeyValue: + * * key=ID "=" value=STRING; * **/ @@ -22579,6 +22737,7 @@ protected class KeyValue_ValueAssignment_2 extends AssignmentToken { * // the attribute 'importURI' is picked up by the ImportUriGlobalScopeProvider * * Import: + * * "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING; * **/ diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java index fc5e7ef3e..82e79cf91 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorCommunicationType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorCommunicationType.java index a93230686..d7ba4588d 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorCommunicationType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorCommunicationType.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerClass.java index 4e3e5c291..88aaf6bd7 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java index 3c4133ea4..c4ca26382 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorContainerRef.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstancePath.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstancePath.java index 7ac566b42..7e5cdb327 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstancePath.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorInstancePath.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorRef.java index 4f6b24825..6833d09b6 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorRef.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ActorRef.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Annotation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Annotation.java index 4a3a97450..043be1e7b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Annotation.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Annotation.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java index 7f7678c84..b206ac043 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Attribute.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java index 9f2ea32e5..c488dd67a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Binding.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java index e677c0374..f230f7d45 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/BindingEndPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CPBranchTransition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CPBranchTransition.java index 174c644d3..c22abac1e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CPBranchTransition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CPBranchTransition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ChoicePoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ChoicePoint.java index 423f1d6e1..c445c9128 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ChoicePoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ChoicePoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ChoicepointTerminal.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ChoicepointTerminal.java index 2f18c8826..10de8cb39 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ChoicepointTerminal.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ChoicepointTerminal.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CommunicationType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CommunicationType.java index e19cdf72b..b8442103f 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CommunicationType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CommunicationType.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ComplexType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ComplexType.java index dccbd8240..68d283cf1 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ComplexType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ComplexType.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CompoundProtocolClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CompoundProtocolClass.java index 5004cef7c..c69d912da 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CompoundProtocolClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/CompoundProtocolClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ContinuationTransition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ContinuationTransition.java index 7625e234b..cd3d37ab6 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ContinuationTransition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ContinuationTransition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java index bc64c57ba..0a009f532 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataType.java index d99c4f36f..aa78039bb 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DataType.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DetailCode.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DetailCode.java index d46cf4138..6d01ed682 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DetailCode.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/DetailCode.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Documentation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Documentation.java index b13a07201..d2bce41c8 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Documentation.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Documentation.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EntryPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EntryPoint.java index 9e0de54da..d6b67585a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EntryPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/EntryPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExitPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExitPoint.java index eb9647a44..0a25c8be4 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExitPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExitPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java index da787abac..df65aac21 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalPort.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalType.java index ca27f5d89..0ec6405ca 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ExternalType.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GeneralProtocolClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GeneralProtocolClass.java index 8393a0a76..4f6fbfc8e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GeneralProtocolClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GeneralProtocolClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Guard.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Guard.java index d2a26bdde..14325213e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Guard.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Guard.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GuardedTransition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GuardedTransition.java index 89f153fd9..6f5a8bf4b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GuardedTransition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/GuardedTransition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Import.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Import.java index 099a74a6d..8e057e5ab 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Import.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Import.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InMessageHandler.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InMessageHandler.java index 6d4aafd60..62a58de54 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InMessageHandler.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InMessageHandler.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InSemanticsRule.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InSemanticsRule.java index fd509632b..681f470ae 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InSemanticsRule.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InSemanticsRule.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InitialTransition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InitialTransition.java index 07054e3a7..7b3fd9ba0 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InitialTransition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InitialTransition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InterfaceItem.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InterfaceItem.java index f3fa73811..409630d49 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InterfaceItem.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/InterfaceItem.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/KeyValue.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/KeyValue.java index 4976daf58..3765605ab 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/KeyValue.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/KeyValue.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java index 6e391d91a..d23580b04 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LayerConnection.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LiteralType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LiteralType.java index 7461dca0d..bc92e2966 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LiteralType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LiteralType.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalSystem.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalSystem.java index f01a4e7b1..662fa7ea4 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalSystem.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalSystem.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java index dc2dab2c2..ca52f7b85 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/LogicalThread.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java index 1f33c8ccf..08f2acb90 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Message.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageFromIf.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageFromIf.java index 6f8f882c6..58e05c8cf 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageFromIf.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageFromIf.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java index bd8b5937f..08588db8e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/MessageHandler.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/NonInitialTransition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/NonInitialTransition.java index 7c5daa695..2b2cd664d 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/NonInitialTransition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/NonInitialTransition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java index 5cec78b38..a54ed1e5a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Operation.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutMessageHandler.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutMessageHandler.java index 1b02da41b..706f00d20 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutMessageHandler.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutMessageHandler.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutSemanticsRule.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutSemanticsRule.java index 8c229460b..cb56140d1 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutSemanticsRule.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/OutSemanticsRule.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Port.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Port.java index b88a5d6ad..fc0be516d 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Port.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Port.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java index a6451020a..bd29c2ebe 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortOperation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortOperation.java index 598b26473..a698ef168 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortOperation.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PortOperation.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PrimitiveType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PrimitiveType.java index 9acce4059..a94afb8e8 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PrimitiveType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/PrimitiveType.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolClass.java index 9d4ad6abe..78145ac77 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolSemantics.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolSemantics.java index 3ed151ba8..8c51c6882 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolSemantics.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ProtocolSemantics.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSAPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSAPoint.java index 0020d4999..70bfa59fe 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSAPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefSAPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java index 42a36e717..e64263703 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefableType.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefinedState.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefinedState.java index 57e2cb3df..cb8d4e49c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefinedState.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefinedState.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefinedTransition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefinedTransition.java index 4197ac5a3..40aaedf19 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefinedTransition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RefinedTransition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RelaySAPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RelaySAPoint.java index 833d165cc..b194cee97 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RelaySAPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RelaySAPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java index 62474d1ed..96ab6f7b8 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomFactory.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomFactory.java index 4d9aca357..1c1f93af8 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomFactory.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomFactory.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java index a337c72c0..b2b780a09 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomModel.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java index e7c2b6e52..3e9663c75 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPRef.java index 7180c0a8a..f7d32559a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPRef.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPRef.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPoint.java index 9fd06afc0..0d0366b16 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SAPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPRef.java index f8f0d319f..591d392e7 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPRef.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPRef.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java index d43ebc15d..0bfec2b88 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SPPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SemanticsRule.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SemanticsRule.java index a0fa05699..68301e7ad 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SemanticsRule.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SemanticsRule.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java index 6ebd02169..f23f0415c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/ServiceImplementation.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SimpleState.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SimpleState.java index 279808b83..b36922e47 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SimpleState.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SimpleState.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StandardOperation.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StandardOperation.java index 35d8dfc43..4fd5761b8 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StandardOperation.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StandardOperation.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/State.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/State.java index c614327ef..0632f4764 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/State.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/State.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraph.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraph.java index d36980a9a..50d975493 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraph.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraph.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraphItem.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraphItem.java index 6fae1fe91..e1d9adbef 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraphItem.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraphItem.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraphNode.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraphNode.java index ff1f0a8fb..0248c32ee 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraphNode.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateGraphNode.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateTerminal.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateTerminal.java index 299e87874..959553783 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateTerminal.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StateTerminal.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java index e2a856cbc..d6d11eb0c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/StructureClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java index efb7c5ed4..e18ac4483 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubProtocol.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubStateTrPointTerminal.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubStateTrPointTerminal.java index ba353a29b..aa7cbd85e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubStateTrPointTerminal.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubStateTrPointTerminal.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java index 87388f1f0..4f61e9460 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemClass.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemRef.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemRef.java index 0ef6d9f2f..a45fc8444 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemRef.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/SubSystemRef.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TrPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TrPoint.java index 28c28081f..7bbc1a852 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TrPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TrPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TrPointTerminal.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TrPointTerminal.java index d9f642590..172b6888e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TrPointTerminal.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TrPointTerminal.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Transition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Transition.java index 1a453b8a1..df3b6ae4b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Transition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Transition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionChainStartTransition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionChainStartTransition.java index 093ae6e5a..3fa1c5364 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionChainStartTransition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionChainStartTransition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionPoint.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionPoint.java index 80505f73a..96234118a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionPoint.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionPoint.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionTerminal.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionTerminal.java index 372bee014..49dc6bba1 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionTerminal.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TransitionTerminal.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Trigger.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Trigger.java index 3c2fbfc01..8b2d32a13 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Trigger.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/Trigger.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TriggeredTransition.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TriggeredTransition.java index c0555ea62..574743bd9 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TriggeredTransition.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/TriggeredTransition.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java index 5a1b06ead..deb4215ff 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/VarDecl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java index 836603ca0..0e576ccb7 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerClassImpl.java index 08cb0ce32..24899cee5 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java index 0f1def977..74ad6edfe 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorContainerRefImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorInstancePathImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorInstancePathImpl.java index 7b6a1b28c..10fe036fd 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorInstancePathImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorInstancePathImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java index 51959a5d3..6b2b93474 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ActorRefImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AnnotationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AnnotationImpl.java index 6722c1331..21a39dadf 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AnnotationImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AnnotationImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java index 04afd5efa..d71c9ecb3 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/AttributeImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingEndPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingEndPointImpl.java index 3ba584639..fa53799fb 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingEndPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingEndPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingImpl.java index 970a933e9..fa871977a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/BindingImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CPBranchTransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CPBranchTransitionImpl.java index a90b956e4..677ca80de 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CPBranchTransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CPBranchTransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ChoicePointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ChoicePointImpl.java index f435b5609..158fabda5 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ChoicePointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ChoicePointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ChoicepointTerminalImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ChoicepointTerminalImpl.java index fa5a19ef1..a21ed4bd5 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ChoicepointTerminalImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ChoicepointTerminalImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ComplexTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ComplexTypeImpl.java index 7e2baf0b4..55c6e5377 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ComplexTypeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ComplexTypeImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CompoundProtocolClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CompoundProtocolClassImpl.java index b69825a74..699999a01 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CompoundProtocolClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/CompoundProtocolClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ContinuationTransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ContinuationTransitionImpl.java index 8556d4b68..14fa086d4 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ContinuationTransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ContinuationTransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java index eb28be6c6..c6cc73efb 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataTypeImpl.java index 159dd90e7..6ff1099be 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataTypeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DataTypeImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DetailCodeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DetailCodeImpl.java index d42afcedc..46a566a9e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DetailCodeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DetailCodeImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DocumentationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DocumentationImpl.java index 89713e548..e762bd03c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DocumentationImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/DocumentationImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EntryPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EntryPointImpl.java index 6955dbe5b..1ff98a627 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EntryPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/EntryPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExitPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExitPointImpl.java index d4e63877c..2d4e1cafa 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExitPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExitPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalPortImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalPortImpl.java index c52fdb018..11874e42c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalPortImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalPortImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java index 43e96ced3..3d92a18a4 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ExternalTypeImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GeneralProtocolClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GeneralProtocolClassImpl.java index 8a37b9f73..a4976bb78 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GeneralProtocolClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GeneralProtocolClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GuardImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GuardImpl.java index c6e5d979f..69973b6fb 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GuardImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GuardImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GuardedTransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GuardedTransitionImpl.java index f467763b8..3f576e1bf 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GuardedTransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/GuardedTransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ImportImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ImportImpl.java index e3439bed6..4148a0c13 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ImportImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ImportImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InMessageHandlerImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InMessageHandlerImpl.java index e2b5eea2a..bd3a97f23 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InMessageHandlerImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InMessageHandlerImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InSemanticsRuleImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InSemanticsRuleImpl.java index 7cd2bf950..7398f05a3 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InSemanticsRuleImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InSemanticsRuleImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InitialTransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InitialTransitionImpl.java index db5e36928..3eedecc1a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InitialTransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InitialTransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java index a1d133b9b..0533c2c66 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/InterfaceItemImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/KeyValueImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/KeyValueImpl.java index bcc61678e..939189326 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/KeyValueImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/KeyValueImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LayerConnectionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LayerConnectionImpl.java index b2de5fd6b..6bb018e56 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LayerConnectionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LayerConnectionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalSystemImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalSystemImpl.java index d56059bdb..b4291b758 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalSystemImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalSystemImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java index 301c9b0c5..7b5008662 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/LogicalThreadImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageFromIfImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageFromIfImpl.java index edaa6f02c..9db9a8044 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageFromIfImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageFromIfImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageHandlerImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageHandlerImpl.java index 71ae6ba28..2562897ef 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageHandlerImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageHandlerImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java index b817ff2dc..d88547054 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/MessageImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/NonInitialTransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/NonInitialTransitionImpl.java index adfa93133..5724f9d53 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/NonInitialTransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/NonInitialTransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java index d3d9deecb..6f2eacd6b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OperationImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutMessageHandlerImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutMessageHandlerImpl.java index e33c5b963..f03bbc63f 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutMessageHandlerImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutMessageHandlerImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutSemanticsRuleImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutSemanticsRuleImpl.java index c2f6dbaad..28eb98ae1 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutSemanticsRuleImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/OutSemanticsRuleImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java index 1773b2e94..434638f10 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java index b3dc2cdad..766260f63 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortOperationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortOperationImpl.java index 36653969a..c7f2718e3 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortOperationImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PortOperationImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java index b8312cb2d..110a5fc9b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/PrimitiveTypeImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java index 37ddfd302..d1b43cd4c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolSemanticsImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolSemanticsImpl.java index a96319772..2fe327825 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolSemanticsImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ProtocolSemanticsImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSAPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSAPointImpl.java index f065122d3..350e31829 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSAPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefSAPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java index 52a8f12ba..2ffc2e741 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefableTypeImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefinedStateImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefinedStateImpl.java index 73abf370c..b93215824 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefinedStateImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefinedStateImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefinedTransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefinedTransitionImpl.java index 889480227..f287dfa09 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefinedTransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RefinedTransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RelaySAPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RelaySAPointImpl.java index e61a8c7fd..c9b229ae3 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RelaySAPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RelaySAPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java index d771f03fd..370cbc57c 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomFactoryImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomFactoryImpl.java index 80bbeb827..2aa040257 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomFactoryImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomFactoryImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java index 4c31a14f1..fed7aec6f 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomModelImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java index e30e4c8aa..45bbb1d19 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPRefImpl.java index 73e905002..716b1c606 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPRefImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPRefImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPointImpl.java index c74c01cd4..ad34bebd5 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SAPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPRefImpl.java index ddce1bc4c..df21071b2 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPRefImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPRefImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPointImpl.java index 365fcf8f4..444addf06 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SPPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SemanticsRuleImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SemanticsRuleImpl.java index 374814b2e..82f79041a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SemanticsRuleImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SemanticsRuleImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ServiceImplementationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ServiceImplementationImpl.java index 2adbcc651..bede2b48a 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ServiceImplementationImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/ServiceImplementationImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SimpleStateImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SimpleStateImpl.java index 005f15ec0..925e1b25f 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SimpleStateImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SimpleStateImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java index 96f9c67b8..346cd7346 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StandardOperationImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphImpl.java index 69fdd649d..6da42e699 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphItemImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphItemImpl.java index 4aad82916..522936dc7 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphItemImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphItemImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphNodeImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphNodeImpl.java index 0a34580f8..0630ede09 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphNodeImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateGraphNodeImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateImpl.java index 299a2463c..599abc524 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateTerminalImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateTerminalImpl.java index 4c8cdacc1..60742844b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateTerminalImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StateTerminalImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java index 059eb1bf3..e375320de 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/StructureClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java index 46a5f4ed2..b08b1005b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubProtocolImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubStateTrPointTerminalImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubStateTrPointTerminalImpl.java index 7d288e0d7..624419621 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubStateTrPointTerminalImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubStateTrPointTerminalImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java index cad1d8929..e58001823 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemClassImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemRefImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemRefImpl.java index eb79498ab..2194907b1 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemRefImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/SubSystemRefImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TrPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TrPointImpl.java index 161bd4728..84e9fd124 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TrPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TrPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TrPointTerminalImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TrPointTerminalImpl.java index 42f3087ae..36750c523 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TrPointTerminalImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TrPointTerminalImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionChainStartTransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionChainStartTransitionImpl.java index e7c135250..7a3c41eac 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionChainStartTransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionChainStartTransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionImpl.java index 0d60d4fe8..9733cc03b 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionPointImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionPointImpl.java index 4be263513..110bd38ee 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionPointImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionPointImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionTerminalImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionTerminalImpl.java index 2e91bd44e..803169772 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionTerminalImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TransitionTerminalImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TriggerImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TriggerImpl.java index e9dc01c78..aa8af0b9e 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TriggerImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TriggerImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TriggeredTransitionImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TriggeredTransitionImpl.java index 28020a9a0..eef9ce5f6 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TriggeredTransitionImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/TriggeredTransitionImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java index 39a93e102..ee0da8c15 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/VarDeclImpl.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.impl;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java index efa58e583..e6a0295bb 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.util;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java index e909ae967..eb37355ca 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java @@ -1,8 +1,4 @@ /**
- * <copyright>
- * </copyright>
- *
- */
package org.eclipse.etrice.core.room.util;
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java index abc50a903..4e7422c7d 100644 --- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java +++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java @@ -7,6 +7,8 @@ package org.eclipse.etrice.core.services; import com.google.inject.Singleton; import com.google.inject.Inject; +import java.util.List; + import org.eclipse.xtext.*; import org.eclipse.xtext.service.GrammarProvider; import org.eclipse.xtext.service.AbstractElementFinder.*; @@ -46,14 +48,19 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6); //RoomModel: + // // "RoomModel" name=FQN docu=Documentation? "{" imports+=Import* (primitiveTypes+=PrimitiveType | + // // externalTypes+=ExternalType | dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | + // // actorClasses+=ActorClass | subSystemClasses+=SubSystemClass | systems+=LogicalSystem)* "}"; public ParserRule getRule() { return rule; } //"RoomModel" name=FQN docu=Documentation? "{" imports+=Import* (primitiveTypes+=PrimitiveType | - //externalTypes+=ExternalType | dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass - //| subSystemClasses+=SubSystemClass | systems+=LogicalSystem)* "}" + // + //externalTypes+=ExternalType | dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | + // + //actorClasses+=ActorClass | subSystemClasses+=SubSystemClass | systems+=LogicalSystem)* "}" public Group getGroup() { return cGroup; } //"RoomModel" @@ -81,7 +88,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { public RuleCall getImportsImportParserRuleCall_4_0() { return cImportsImportParserRuleCall_4_0; } //(primitiveTypes+=PrimitiveType | externalTypes+=ExternalType | dataClasses+=DataClass | + // //protocolClasses+=GeneralProtocolClass | actorClasses+=ActorClass | subSystemClasses+=SubSystemClass | + // //systems+=LogicalSystem)* public Alternatives getAlternatives_5() { return cAlternatives_5; } @@ -139,6 +148,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cStructureClassParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); //RoomClass: + // // DataType | GeneralProtocolClass | StructureClass; public ParserRule getRule() { return rule; } @@ -162,6 +172,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cLogicalSystemParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //StructureClass: + // // ActorContainerClass | LogicalSystem; public ParserRule getRule() { return rule; } @@ -182,6 +193,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cSubSystemClassParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //ActorContainerClass: + // // ActorClass | SubSystemClass; public ParserRule getRule() { return rule; } @@ -209,6 +221,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// data class // //VarDecl: + // // name=ID ":" refType=RefableType; public ParserRule getRule() { return rule; } @@ -241,6 +254,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRefRefKeyword_1_0 = (Keyword)cRefAssignment_1.eContents().get(0); //RefableType: + // // type=[DataType|FQN] ref?="ref"?; public ParserRule getRule() { return rule; } @@ -270,6 +284,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cComplexTypeParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //DataType: + // // PrimitiveType | ComplexType; public ParserRule getRule() { return rule; } @@ -290,6 +305,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cExternalTypeParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //ComplexType: + // // DataClass | ExternalType; public ParserRule getRule() { return rule; } @@ -327,11 +343,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDocuDocumentationParserRuleCall_9_0 = (RuleCall)cDocuAssignment_9.eContents().get(0); //PrimitiveType: + // // "PrimitiveType" name=ID ":" type=LiteralType "->" targetName=FQN ("(" castName=FQN ")")? "default" + // // defaultValueLiteral=STRING docu=Documentation?; public ParserRule getRule() { return rule; } //"PrimitiveType" name=ID ":" type=LiteralType "->" targetName=FQN ("(" castName=FQN ")")? "default" + // //defaultValueLiteral=STRING docu=Documentation? public Group getGroup() { return cGroup; } @@ -406,6 +425,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDocuDocumentationParserRuleCall_4_0 = (RuleCall)cDocuAssignment_4.eContents().get(0); //ExternalType: + // // "ExternalType" name=ID "->" targetName=FQN docu=Documentation?; public ParserRule getRule() { return rule; } @@ -474,13 +494,18 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// TODOHRR: define detail level language? // //DataClass: + // // "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" + // // userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+ + // // operations+=StandardOperation* "}"; public ParserRule getRule() { return rule; } //"DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" + // //userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+ + // //operations+=StandardOperation* "}" public Group getGroup() { return cGroup; } @@ -597,7 +622,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDocuDocumentationParserRuleCall_6_0 = (RuleCall)cDocuAssignment_6.eContents().get(0); //Attribute: - // "Attribute" name=ID ("[" size=INT "]")? ":" refType=RefableType ("=" defaultValueLiteral=STRING)? docu=Documentation?; + // + // "Attribute" name=ID ("[" size=INT "]")? ":" refType=RefableType ("=" defaultValueLiteral=STRING)? + // + // docu=Documentation?; public ParserRule getRule() { return rule; } //"Attribute" name=ID ("[" size=INT "]")? ":" refType=RefableType ("=" defaultValueLiteral=STRING)? docu=Documentation? @@ -662,6 +690,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cPortOperationParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //Operation: + // // StandardOperation | PortOperation; public ParserRule getRule() { return rule; } @@ -704,11 +733,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDetailCodeDetailCodeParserRuleCall_8_0 = (RuleCall)cDetailCodeAssignment_8.eContents().get(0); //StandardOperation: + // // "Operation" destructor?="~"? name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | + // // returntype=RefableType))? docu=Documentation? detailCode=DetailCode; public ParserRule getRule() { return rule; } //"Operation" destructor?="~"? name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | + // //returntype=RefableType))? docu=Documentation? detailCode=DetailCode public Group getGroup() { return cGroup; } @@ -818,11 +850,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDetailCodeDetailCodeParserRuleCall_7_0 = (RuleCall)cDetailCodeAssignment_7.eContents().get(0); //PortOperation: + // // "Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | returntype=RefableType) | + // // "sends" sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode; public ParserRule getRule() { return rule; } //"Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | returntype=RefableType) | + // //"sends" sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode public Group getGroup() { return cGroup; } @@ -918,6 +953,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cCompoundProtocolClassParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //GeneralProtocolClass: + // // ProtocolClass | CompoundProtocolClass; public ParserRule getRule() { return rule; } @@ -988,17 +1024,26 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_15 = (Keyword)cGroup.eContents().get(15); //ProtocolClass: + // // commType=CommunicationType? "ProtocolClass" name=ID docu=Documentation? ("extends" base=[ProtocolClass|FQN])? "{" + // // annotations+=Annotation* ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" + // // userCode3=DetailCode)? ("incoming" "{" incomingMessages+=Message* "}")? ("outgoing" "{" outgoingMessages+=Message* + // // "}")? ("regular" "PortClass" regular=PortClass)? ("conjugate" "PortClass" conjugate=PortClass)? + // // semantics=ProtocolSemantics? "}"; public ParserRule getRule() { return rule; } //commType=CommunicationType? "ProtocolClass" name=ID docu=Documentation? ("extends" base=[ProtocolClass|FQN])? "{" + // //annotations+=Annotation* ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" + // //userCode3=DetailCode)? ("incoming" "{" incomingMessages+=Message* "}")? ("outgoing" "{" outgoingMessages+=Message* + // //"}")? ("regular" "PortClass" regular=PortClass)? ("conjugate" "PortClass" conjugate=PortClass)? + // //semantics=ProtocolSemantics? "}" public Group getGroup() { return cGroup; } @@ -1175,6 +1220,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6); //CompoundProtocolClass: + // // "CompoundProtocolClass" name=ID docu=Documentation? "{" annotations+=Annotation* subProtocols+=SubProtocol+ "}"; public ParserRule getRule() { return rule; } @@ -1227,6 +1273,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cProtocolGeneralProtocolClassFQNParserRuleCall_3_0_1 = (RuleCall)cProtocolGeneralProtocolClassCrossReference_3_0.eContents().get(1); //SubProtocol: + // // "SubProtocol" name=ID ":" protocol=[GeneralProtocolClass|FQN]; public ParserRule getRule() { return rule; } @@ -1271,6 +1318,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDocuDocumentationParserRuleCall_6_0 = (RuleCall)cDocuAssignment_6.eContents().get(0); //Message: + // // priv?="private"? "Message" name=ID "(" data=VarDecl? ")" docu=Documentation?; public ParserRule getRule() { return rule; } @@ -1329,11 +1377,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3); //PortClass: + // // "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | + // // msgHandlers+=MessageHandler)+ "}"; public ParserRule getRule() { return rule; } //"{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | msgHandlers+=MessageHandler)+ + // //"}" public Group getGroup() { return cGroup; } @@ -1384,6 +1435,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cOutMessageHandlerParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //MessageHandler: + // // InMessageHandler | OutMessageHandler; public ParserRule getRule() { return rule; } @@ -1409,6 +1461,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDetailCodeDetailCodeParserRuleCall_3_0 = (RuleCall)cDetailCodeAssignment_3.eContents().get(0); //InMessageHandler: + // // "handle" "incoming" msg=[Message] detailCode=DetailCode; public ParserRule getRule() { return rule; } @@ -1449,6 +1502,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDetailCodeDetailCodeParserRuleCall_3_0 = (RuleCall)cDetailCodeAssignment_3.eContents().get(0); //OutMessageHandler: + // // "handle" "outgoing" msg=[Message] detailCode=DetailCode; public ParserRule getRule() { return rule; } @@ -1488,6 +1542,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); //ProtocolSemantics: + // // {ProtocolSemantics} "semantics" "{" rules+=SemanticsRule* "}"; public ParserRule getRule() { return rule; } @@ -1520,6 +1575,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cOutSemanticsRuleParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //SemanticsRule: + // // InSemanticsRule | OutSemanticsRule; public ParserRule getRule() { return rule; } @@ -1557,11 +1613,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightParenthesisKeyword_3_1_1_3 = (Keyword)cGroup_3_1_1.eContents().get(3); //InSemanticsRule: + // // "in" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ + // // ")"))?; public ParserRule getRule() { return rule; } //"in" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ + // //")"))? public Group getGroup() { return cGroup; } @@ -1647,11 +1706,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightParenthesisKeyword_3_1_1_3 = (Keyword)cGroup_3_1_1.eContents().get(3); //OutSemanticsRule: - // "out" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ - // ")"))?; + // + // "out" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," + // + // followUps+=SemanticsRule)+ ")"))?; public ParserRule getRule() { return rule; } //"out" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ + // //")"))? public Group getGroup() { return cGroup; } @@ -1806,22 +1868,35 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// since double containment is not supported we decided to define external ports as reference to interface ports // //ActorClass: + // // (abstract?="abstract"? & commType=ActorCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" + // // base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" ifPorts+=Port* ifSPPs+=SPPRef* "}")? + // // ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? + // // ("usercode3" userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* + // // serviceImplementations+=ServiceImplementation* strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* + // // bindings+=Binding* connections+=LayerConnection* "}")? ("Behavior" behaviorDocu=Documentation? "{" + // // behaviorAnnotations+=Annotation* operations+=StandardOperation* stateMachine=StateMachine? "}")? "}"; public ParserRule getRule() { return rule; } //(abstract?="abstract"? & commType=ActorCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" - //base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" ifPorts+=Port* ifSPPs+=SPPRef* "}")? ("Structure" - //structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" - //userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* serviceImplementations+=ServiceImplementation* - //strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* bindings+=Binding* connections+=LayerConnection* "}")? - //("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* operations+=StandardOperation* - //stateMachine=StateMachine? "}")? "}" + // + //base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" ifPorts+=Port* ifSPPs+=SPPRef* "}")? + // + //("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? + // + //("usercode3" userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* + // + //serviceImplementations+=ServiceImplementation* strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* + // + //bindings+=Binding* connections+=LayerConnection* "}")? ("Behavior" behaviorDocu=Documentation? "{" + // + //behaviorAnnotations+=Annotation* operations+=StandardOperation* stateMachine=StateMachine? "}")? "}" public Group getGroup() { return cGroup; } //abstract?="abstract"? & commType=ActorCommunicationType? @@ -1903,8 +1978,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { public Keyword getRightCurlyBracketKeyword_7_4() { return cRightCurlyBracketKeyword_7_4; } //("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? + // //("usercode3" userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* + // //serviceImplementations+=ServiceImplementation* strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* + // //bindings+=Binding* connections+=LayerConnection* "}")? public Group getGroup_8() { return cGroup_8; } @@ -2011,6 +2089,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { public Keyword getRightCurlyBracketKeyword_8_13() { return cRightCurlyBracketKeyword_8_13; } //("Behavior" behaviorDocu=Documentation? "{" behaviorAnnotations+=Annotation* operations+=StandardOperation* + // //stateMachine=StateMachine? "}")? public Group getGroup_9() { return cGroup_9; } @@ -2059,6 +2138,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cSPPRefParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); //InterfaceItem: + // // Port | SAPRef | SPPRef; public ParserRule getRule() { return rule; } @@ -2093,11 +2173,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDocuDocumentationParserRuleCall_6_0 = (RuleCall)cDocuAssignment_6.eContents().get(0); //Port: + // // conjugated?="conjugated"? "Port" name=ID multiplicity=MULTIPLICITY? ":" protocol=[GeneralProtocolClass|FQN] + // // docu=Documentation?; public ParserRule getRule() { return rule; } //conjugated?="conjugated"? "Port" name=ID multiplicity=MULTIPLICITY? ":" protocol=[GeneralProtocolClass|FQN] + // //docu=Documentation? public Group getGroup() { return cGroup; } @@ -2151,6 +2234,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cIfportPortIDTerminalRuleCall_2_0_1 = (RuleCall)cIfportPortCrossReference_2_0.eContents().get(1); //ExternalPort: + // // "external" "Port" ifport=[Port]; public ParserRule getRule() { return rule; } @@ -2185,6 +2269,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cProtocolProtocolClassFQNParserRuleCall_3_0_1 = (RuleCall)cProtocolProtocolClassCrossReference_3_0.eContents().get(1); //SAPRef: + // // "SAP" name=ID ":" protocol=[ProtocolClass|FQN]; public ParserRule getRule() { return rule; } @@ -2225,6 +2310,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cProtocolProtocolClassFQNParserRuleCall_3_0_1 = (RuleCall)cProtocolProtocolClassCrossReference_3_0.eContents().get(1); //SPPRef: + // // "SPP" name=ID ":" protocol=[ProtocolClass|FQN]; public ParserRule getRule() { return rule; } @@ -2263,6 +2349,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cSppSPPRefIDTerminalRuleCall_2_0_1 = (RuleCall)cSppSPPRefCrossReference_2_0.eContents().get(1); //ServiceImplementation: + // // "ServiceImplementation" "of" spp=[SPPRef]; public ParserRule getRule() { return rule; } @@ -2305,11 +2392,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_8 = (Keyword)cGroup.eContents().get(8); //LogicalSystem: + // // "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* subSystems+=SubSystemRef* bindings+=Binding* + // // connections+=LayerConnection* "}"; public ParserRule getRule() { return rule; } //"LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* subSystems+=SubSystemRef* bindings+=Binding* + // //connections+=LayerConnection* "}" public Group getGroup() { return cGroup; } @@ -2366,6 +2456,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cActorRefParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //ActorContainerRef: + // // SubSystemRef | ActorRef; public ParserRule getRule() { return rule; } @@ -2393,6 +2484,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDocuDocumentationParserRuleCall_4_0 = (RuleCall)cDocuAssignment_4.eContents().get(0); //SubSystemRef: + // // "SubSystemRef" name=ID ":" type=[SubSystemClass|FQN] docu=Documentation?; public ParserRule getRule() { return rule; } @@ -2465,13 +2557,18 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_14 = (Keyword)cGroup.eContents().get(14); //SubSystemClass: + // // "SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? + // // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? relayPorts+=Port* ifSPPs+=SPPRef* + // // actorRefs+=ActorRef* bindings+=Binding* connections+=LayerConnection* threads+=LogicalThread* "}"; public ParserRule getRule() { return rule; } //"SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? + // //("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? relayPorts+=Port* ifSPPs+=SPPRef* + // //actorRefs+=ActorRef* bindings+=Binding* connections+=LayerConnection* threads+=LogicalThread* "}" public Group getGroup() { return cGroup; } @@ -2595,6 +2692,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_8 = (Keyword)cGroup.eContents().get(8); //LogicalThread: + // // "LogicalThread" name=ID "prio" "=" prio=INT "{" instances+=ActorInstancePath ("," instances+=ActorInstancePath)* "}"; public ParserRule getRule() { return rule; } @@ -2658,6 +2756,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cSegmentsIDTerminalRuleCall_1_1_0 = (RuleCall)cSegmentsAssignment_1_1.eContents().get(0); //ActorInstancePath: + // // segments+=ID ("." segments+=ID)*; public ParserRule getRule() { return rule; } @@ -2700,6 +2799,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// (2) use a notation with 1 to n bindings // //Binding: + // // "Binding" endpoint1=BindingEndPoint "and" endpoint2=BindingEndPoint; public ParserRule getRule() { return rule; } @@ -2743,6 +2843,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cSubSubProtocolIDTerminalRuleCall_2_1_0_1 = (RuleCall)cSubSubProtocolCrossReference_2_1_0.eContents().get(1); //BindingEndPoint: + // // (actorRef=[ActorContainerRef] ".")? port=[Port] ("sub" sub=[SubProtocol])?; public ParserRule getRule() { return rule; } @@ -2800,6 +2901,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cToSPPointParserRuleCall_3_0 = (RuleCall)cToAssignment_3.eContents().get(0); //LayerConnection: + // // "LayerConnection" from=SAPoint "satisfied_by" to=SPPoint; public ParserRule getRule() { return rule; } @@ -2832,6 +2934,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cRelaySAPointParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //SAPoint: + // // RefSAPoint | RelaySAPoint; public ParserRule getRule() { return rule; } @@ -2923,6 +3026,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cServiceSPPRefIDTerminalRuleCall_2_0_1 = (RuleCall)cServiceSPPRefCrossReference_2_0.eContents().get(1); //SPPoint: + // // ref=[ActorContainerRef] "." service=[SPPRef]; public ParserRule getRule() { return rule; } @@ -2970,6 +3074,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDocuDocumentationParserRuleCall_5_0 = (RuleCall)cDocuAssignment_5.eContents().get(0); //ActorRef: + // // "ActorRef" name=ID ("[" size=INT "]")? ":" type=[ActorClass|FQN] docu=Documentation?; public ParserRule getRule() { return rule; } @@ -3031,6 +3136,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// state machine // //StateGraphNode: + // // State | ChoicePoint | TrPoint; public ParserRule getRule() { return rule; } @@ -3054,6 +3160,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //StateGraphItem: + // // StateGraphNode | Transition; public ParserRule getRule() { return rule; } @@ -3074,6 +3181,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cRefinedStateParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //State: + // // SimpleState | RefinedState; public ParserRule getRule() { return rule; } @@ -3106,11 +3214,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3); //StateGraph: + // // {StateGraph} "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | + // // refinedTransitions+=RefinedTransition)* "}"; public ParserRule getRule() { return rule; } //{StateGraph} "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | + // //refinedTransitions+=RefinedTransition)* "}" public Group getGroup() { return cGroup; } @@ -3121,6 +3232,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { public Keyword getLeftCurlyBracketKeyword_1() { return cLeftCurlyBracketKeyword_1; } //(states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | + // //refinedTransitions+=RefinedTransition)* public Alternatives getAlternatives_2() { return cAlternatives_2; } @@ -3178,11 +3290,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); //StateMachine returns StateGraph: - // {StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | - // refinedTransitions+=RefinedTransition)* "}"; + // + // {StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition + // + // | refinedTransitions+=RefinedTransition)* "}"; public ParserRule getRule() { return rule; } //{StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | + // //refinedTransitions+=RefinedTransition)* "}" public Group getGroup() { return cGroup; } @@ -3196,6 +3311,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; } //(states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | + // //refinedTransitions+=RefinedTransition)* public Alternatives getAlternatives_3() { return cAlternatives_3; } @@ -3262,11 +3378,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_3_5 = (Keyword)cGroup_3.eContents().get(5); //SimpleState: + // // "State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do" + // // doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")?; public ParserRule getRule() { return rule; } //"State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do" + // //doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")? public Group getGroup() { return cGroup; } @@ -3286,6 +3405,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; } //("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do" doCode=DetailCode)? ("subgraph" + // //subgraph=StateGraph)? "}")? public Group getGroup_3() { return cGroup_3; } @@ -3373,11 +3493,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_8 = (Keyword)cGroup.eContents().get(8); //RefinedState: + // // "RefinedState" target=[State|FQN] docu=Documentation? "{" ("entry" entryCode=DetailCode)? ("exit" + // // exitCode=DetailCode)? ("do" doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}"; public ParserRule getRule() { return rule; } //"RefinedState" target=[State|FQN] docu=Documentation? "{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? + // //("do" doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}" public Group getGroup() { return cGroup; } @@ -3467,6 +3590,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// super() keyword or flag like in Trice // //DetailCode: + // // "{" commands+=STRING+ "}"; public ParserRule getRule() { return rule; } @@ -3494,6 +3618,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cExitPointParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); //TrPoint: + // // TransitionPoint | EntryPoint | ExitPoint; public ParserRule getRule() { return rule; } @@ -3520,6 +3645,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0); //TransitionPoint: + // // handler?="handler"? "TransitionPoint" name=ID; public ParserRule getRule() { return rule; } @@ -3550,6 +3676,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0); //EntryPoint: + // // "EntryPoint" name=ID; public ParserRule getRule() { return rule; } @@ -3574,6 +3701,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0); //ExitPoint: + // // "ExitPoint" name=ID; public ParserRule getRule() { return rule; } @@ -3600,6 +3728,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cDocuDocumentationParserRuleCall_2_0 = (RuleCall)cDocuAssignment_2.eContents().get(0); //ChoicePoint: + // // "ChoicePoint" name=ID docu=Documentation?; public ParserRule getRule() { return rule; } @@ -3629,6 +3758,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cNonInitialTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //Transition: + // // InitialTransition | NonInitialTransition; public ParserRule getRule() { return rule; } @@ -3650,6 +3780,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cCPBranchTransitionParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); //NonInitialTransition: + // // TransitionChainStartTransition | ContinuationTransition | CPBranchTransition; public ParserRule getRule() { return rule; } @@ -3673,6 +3804,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cGuardedTransitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //TransitionChainStartTransition: + // // TriggeredTransition | GuardedTransition; public ParserRule getRule() { return rule; } @@ -3707,7 +3839,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_9 = (Keyword)cGroup.eContents().get(9); //InitialTransition: + // // "Transition" name=ID? ":" "initial" "->" to=TransitionTerminal docu=Documentation? "{" ("action" action=DetailCode)? + // // "}"; public ParserRule getRule() { return rule; } @@ -3786,11 +3920,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_7_2 = (Keyword)cGroup_7.eContents().get(2); //ContinuationTransition: + // // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? ("{" ("action" + // // action=DetailCode)? "}")?; public ParserRule getRule() { return rule; } //"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? ("{" ("action" + // //action=DetailCode)? "}")? public Group getGroup() { return cGroup; } @@ -3880,11 +4017,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_14 = (Keyword)cGroup.eContents().get(14); //TriggeredTransition: + // // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "triggers" "{" + // // triggers+=Trigger ("or" triggers+=Trigger)* "}" ("action" action=DetailCode)? "}"; public ParserRule getRule() { return rule; } //"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "triggers" "{" + // //triggers+=Trigger ("or" triggers+=Trigger)* "}" ("action" action=DetailCode)? "}" public Group getGroup() { return cGroup; } @@ -3992,11 +4132,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_11 = (Keyword)cGroup.eContents().get(11); //GuardedTransition: + // // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "guard" + // // guard=DetailCode ("action" action=DetailCode)? "}"; public ParserRule getRule() { return rule; } //"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "guard" + // //guard=DetailCode ("action" action=DetailCode)? "}" public Group getGroup() { return cGroup; } @@ -4086,11 +4229,14 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_11 = (Keyword)cGroup.eContents().get(11); //CPBranchTransition: + // // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "cond" + // // condition=DetailCode ("action" action=DetailCode)? "}"; public ParserRule getRule() { return rule; } //"Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "cond" + // //condition=DetailCode ("action" action=DetailCode)? "}" public Group getGroup() { return cGroup; } @@ -4170,7 +4316,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cActionDetailCodeParserRuleCall_5_0 = (RuleCall)cActionAssignment_5.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6); + //// by validation RefinedTransition can only be contained in the top level state graph + // //RefinedTransition: + // // "RefinedTransition" target=[Transition|FQN] docu=Documentation? "{" "action" action=DetailCode "}"; public ParserRule getRule() { return rule; } @@ -4220,6 +4369,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cChoicepointTerminalParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3); //TransitionTerminal: + // // StateTerminal | TrPointTerminal | SubStateTrPointTerminal | ChoicepointTerminal; public ParserRule getRule() { return rule; } @@ -4246,6 +4396,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cStateStateIDTerminalRuleCall_0_1 = (RuleCall)cStateStateCrossReference_0.eContents().get(1); //StateTerminal: + // // state=[State]; public ParserRule getRule() { return rule; } @@ -4268,6 +4419,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cTrPointTrPointIDTerminalRuleCall_1_0_1 = (RuleCall)cTrPointTrPointCrossReference_1_0.eContents().get(1); //TrPointTerminal: + // // "my" trPoint=[TrPoint]; public ParserRule getRule() { return rule; } @@ -4299,6 +4451,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cStateStateIDTerminalRuleCall_2_0_1 = (RuleCall)cStateStateCrossReference_2_0.eContents().get(1); //SubStateTrPointTerminal: + // // trPoint=[TrPoint] "of" state=[State]; public ParserRule getRule() { return rule; } @@ -4336,6 +4489,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cCpChoicePointIDTerminalRuleCall_1_0_1 = (RuleCall)cCpChoicePointCrossReference_1_0.eContents().get(1); //ChoicepointTerminal: + // // "cp" cp=[ChoicePoint]; public ParserRule getRule() { return rule; } @@ -4370,6 +4524,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cGreaterThanSignKeyword_4 = (Keyword)cGroup.eContents().get(4); //Trigger: + // // "<" msgFromIfPairs+=MessageFromIf ("|" msgFromIfPairs+=MessageFromIf)* guard=Guard? ">"; public ParserRule getRule() { return rule; } @@ -4419,6 +4574,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cFromInterfaceItemIDTerminalRuleCall_2_0_1 = (RuleCall)cFromInterfaceItemCrossReference_2_0.eContents().get(1); //MessageFromIf: + // // message=[Message] ":" from=[InterfaceItem]; public ParserRule getRule() { return rule; } @@ -4455,6 +4611,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cGuardDetailCodeParserRuleCall_1_0 = (RuleCall)cGuardAssignment_1.eContents().get(0); //Guard: + // // "guard" guard=DetailCode; public ParserRule getRule() { return rule; } @@ -4484,6 +4641,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// general // //Documentation: + // // "[" text+=STRING+ "]"; public ParserRule getRule() { return rule; } @@ -4520,6 +4678,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightParenthesisKeyword_2_3 = (Keyword)cGroup_2.eContents().get(3); //Annotation: + // // "@" name=ID ("(" attributes+=KeyValue ("," attributes+=KeyValue)* ")")?; public ParserRule getRule() { return rule; } @@ -4573,6 +4732,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cValueSTRINGTerminalRuleCall_2_0 = (RuleCall)cValueAssignment_2.eContents().get(0); //KeyValue: + // // key=ID "=" value=STRING; public ParserRule getRule() { return rule; } @@ -4645,6 +4805,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// the attribute 'importURI' is picked up by the ImportUriGlobalScopeProvider // //Import: + // // "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING; public ParserRule getRule() { return rule; } @@ -4686,6 +4847,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cFullStopAsteriskKeyword_1 = (Keyword)cGroup.eContents().get(1); //ImportedFQN: + // // FQN ".*"?; public ParserRule getRule() { return rule; } @@ -4708,6 +4870,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1); //FQN: + // // ID ("." ID)*; public ParserRule getRule() { return rule; } @@ -4741,6 +4904,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// (because then the lexer already would find this in places where it is not expected, e.g. in an Attribute) // //MULTIPLICITY returns ecore::EInt: + // // "[" ("*" | INT) "]"; public ParserRule getRule() { return rule; } @@ -4777,6 +4941,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cCHARPtCharacterKeyword_3_0 = (Keyword)cCHAREnumLiteralDeclaration_3.eContents().get(0); //enum LiteralType: + // // BOOL="ptBoolean" | INT="ptInteger" | REAL="ptReal" | CHAR="ptCharacter"; public EnumRule getRule() { return rule; } @@ -4823,6 +4988,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// protocol class // //enum CommunicationType: + // // EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | SYNCHRONOUS="sync"; public EnumRule getRule() { return rule; } @@ -4865,6 +5031,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// actor class // //enum ActorCommunicationType: + // // EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | ASYNCHRONOUS="async" | SYNCHRONOUS="sync"; public EnumRule getRule() { return rule; } @@ -4986,19 +5153,36 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { private FQNElements pFQN; private MULTIPLICITYElements pMULTIPLICITY; - private final GrammarProvider grammarProvider; + private final Grammar grammar; private TerminalsGrammarAccess gaTerminals; @Inject public RoomGrammarAccess(GrammarProvider grammarProvider, TerminalsGrammarAccess gaTerminals) { - this.grammarProvider = grammarProvider; + this.grammar = internalFindGrammar(grammarProvider); this.gaTerminals = gaTerminals; } - public Grammar getGrammar() { - return grammarProvider.getGrammar(this); + protected Grammar internalFindGrammar(GrammarProvider grammarProvider) { + Grammar grammar = grammarProvider.getGrammar(this); + while (grammar != null) { + if ("org.eclipse.etrice.core.Room".equals(grammar.getName())) { + return grammar; + } + List<Grammar> grammars = grammar.getUsedGrammars(); + if (!grammars.isEmpty()) { + grammar = grammars.iterator().next(); + } else { + return null; + } + } + return grammar; + } + + + public Grammar getGrammar() { + return grammar; } @@ -5008,8 +5192,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //RoomModel: + // // "RoomModel" name=FQN docu=Documentation? "{" imports+=Import* (primitiveTypes+=PrimitiveType | + // // externalTypes+=ExternalType | dataClasses+=DataClass | protocolClasses+=GeneralProtocolClass | + // // actorClasses+=ActorClass | subSystemClasses+=SubSystemClass | systems+=LogicalSystem)* "}"; public RoomModelElements getRoomModelAccess() { return (pRoomModel != null) ? pRoomModel : (pRoomModel = new RoomModelElements()); @@ -5020,6 +5207,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //RoomClass: + // // DataType | GeneralProtocolClass | StructureClass; public RoomClassElements getRoomClassAccess() { return (pRoomClass != null) ? pRoomClass : (pRoomClass = new RoomClassElements()); @@ -5030,6 +5218,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //StructureClass: + // // ActorContainerClass | LogicalSystem; public StructureClassElements getStructureClassAccess() { return (pStructureClass != null) ? pStructureClass : (pStructureClass = new StructureClassElements()); @@ -5040,6 +5229,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ActorContainerClass: + // // ActorClass | SubSystemClass; public ActorContainerClassElements getActorContainerClassAccess() { return (pActorContainerClass != null) ? pActorContainerClass : (pActorContainerClass = new ActorContainerClassElements()); @@ -5054,6 +5244,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// data class // //VarDecl: + // // name=ID ":" refType=RefableType; public VarDeclElements getVarDeclAccess() { return (pVarDecl != null) ? pVarDecl : (pVarDecl = new VarDeclElements()); @@ -5064,6 +5255,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //RefableType: + // // type=[DataType|FQN] ref?="ref"?; public RefableTypeElements getRefableTypeAccess() { return (pRefableType != null) ? pRefableType : (pRefableType = new RefableTypeElements()); @@ -5074,6 +5266,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //enum LiteralType: + // // BOOL="ptBoolean" | INT="ptInteger" | REAL="ptReal" | CHAR="ptCharacter"; public LiteralTypeElements getLiteralTypeAccess() { return (unknownRuleLiteralType != null) ? unknownRuleLiteralType : (unknownRuleLiteralType = new LiteralTypeElements()); @@ -5084,6 +5277,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //DataType: + // // PrimitiveType | ComplexType; public DataTypeElements getDataTypeAccess() { return (pDataType != null) ? pDataType : (pDataType = new DataTypeElements()); @@ -5094,6 +5288,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ComplexType: + // // DataClass | ExternalType; public ComplexTypeElements getComplexTypeAccess() { return (pComplexType != null) ? pComplexType : (pComplexType = new ComplexTypeElements()); @@ -5104,7 +5299,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //PrimitiveType: + // // "PrimitiveType" name=ID ":" type=LiteralType "->" targetName=FQN ("(" castName=FQN ")")? "default" + // // defaultValueLiteral=STRING docu=Documentation?; public PrimitiveTypeElements getPrimitiveTypeAccess() { return (pPrimitiveType != null) ? pPrimitiveType : (pPrimitiveType = new PrimitiveTypeElements()); @@ -5115,6 +5312,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ExternalType: + // // "ExternalType" name=ID "->" targetName=FQN docu=Documentation?; public ExternalTypeElements getExternalTypeAccess() { return (pExternalType != null) ? pExternalType : (pExternalType = new ExternalTypeElements()); @@ -5127,8 +5325,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// TODOHRR: define detail level language? // //DataClass: + // // "DataClass" name=ID docu=Documentation? ("extends" base=[DataClass|FQN])? "{" annotations+=Annotation* ("usercode1" + // // userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? attributes+=Attribute+ + // // operations+=StandardOperation* "}"; public DataClassElements getDataClassAccess() { return (pDataClass != null) ? pDataClass : (pDataClass = new DataClassElements()); @@ -5139,7 +5340,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //Attribute: - // "Attribute" name=ID ("[" size=INT "]")? ":" refType=RefableType ("=" defaultValueLiteral=STRING)? docu=Documentation?; + // + // "Attribute" name=ID ("[" size=INT "]")? ":" refType=RefableType ("=" defaultValueLiteral=STRING)? + // + // docu=Documentation?; public AttributeElements getAttributeAccess() { return (pAttribute != null) ? pAttribute : (pAttribute = new AttributeElements()); } @@ -5149,6 +5353,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //Operation: + // // StandardOperation | PortOperation; public OperationElements getOperationAccess() { return (pOperation != null) ? pOperation : (pOperation = new OperationElements()); @@ -5159,7 +5364,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //StandardOperation: + // // "Operation" destructor?="~"? name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | + // // returntype=RefableType))? docu=Documentation? detailCode=DetailCode; public StandardOperationElements getStandardOperationAccess() { return (pStandardOperation != null) ? pStandardOperation : (pStandardOperation = new StandardOperationElements()); @@ -5170,7 +5377,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //PortOperation: + // // "Operation" name=ID "(" (arguments+=VarDecl ("," arguments+=VarDecl)*)? ")" (":" ("void" | returntype=RefableType) | + // // "sends" sendsMsg=[Message])? docu=Documentation? detailCode=DetailCode; public PortOperationElements getPortOperationAccess() { return (pPortOperation != null) ? pPortOperation : (pPortOperation = new PortOperationElements()); @@ -5185,6 +5394,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// protocol class // //enum CommunicationType: + // // EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | SYNCHRONOUS="sync"; public CommunicationTypeElements getCommunicationTypeAccess() { return (unknownRuleCommunicationType != null) ? unknownRuleCommunicationType : (unknownRuleCommunicationType = new CommunicationTypeElements()); @@ -5195,6 +5405,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //GeneralProtocolClass: + // // ProtocolClass | CompoundProtocolClass; public GeneralProtocolClassElements getGeneralProtocolClassAccess() { return (pGeneralProtocolClass != null) ? pGeneralProtocolClass : (pGeneralProtocolClass = new GeneralProtocolClassElements()); @@ -5205,10 +5416,15 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ProtocolClass: + // // commType=CommunicationType? "ProtocolClass" name=ID docu=Documentation? ("extends" base=[ProtocolClass|FQN])? "{" + // // annotations+=Annotation* ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? ("usercode3" + // // userCode3=DetailCode)? ("incoming" "{" incomingMessages+=Message* "}")? ("outgoing" "{" outgoingMessages+=Message* + // // "}")? ("regular" "PortClass" regular=PortClass)? ("conjugate" "PortClass" conjugate=PortClass)? + // // semantics=ProtocolSemantics? "}"; public ProtocolClassElements getProtocolClassAccess() { return (pProtocolClass != null) ? pProtocolClass : (pProtocolClass = new ProtocolClassElements()); @@ -5219,6 +5435,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //CompoundProtocolClass: + // // "CompoundProtocolClass" name=ID docu=Documentation? "{" annotations+=Annotation* subProtocols+=SubProtocol+ "}"; public CompoundProtocolClassElements getCompoundProtocolClassAccess() { return (pCompoundProtocolClass != null) ? pCompoundProtocolClass : (pCompoundProtocolClass = new CompoundProtocolClassElements()); @@ -5229,6 +5446,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SubProtocol: + // // "SubProtocol" name=ID ":" protocol=[GeneralProtocolClass|FQN]; public SubProtocolElements getSubProtocolAccess() { return (pSubProtocol != null) ? pSubProtocol : (pSubProtocol = new SubProtocolElements()); @@ -5239,6 +5457,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //Message: + // // priv?="private"? "Message" name=ID "(" data=VarDecl? ")" docu=Documentation?; public MessageElements getMessageAccess() { return (pMessage != null) ? pMessage : (pMessage = new MessageElements()); @@ -5249,7 +5468,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //PortClass: + // // "{" ("usercode" userCode=DetailCode)? (attributes+=Attribute | operations+=PortOperation | + // // msgHandlers+=MessageHandler)+ "}"; public PortClassElements getPortClassAccess() { return (pPortClass != null) ? pPortClass : (pPortClass = new PortClassElements()); @@ -5260,6 +5481,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //MessageHandler: + // // InMessageHandler | OutMessageHandler; public MessageHandlerElements getMessageHandlerAccess() { return (pMessageHandler != null) ? pMessageHandler : (pMessageHandler = new MessageHandlerElements()); @@ -5270,6 +5492,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //InMessageHandler: + // // "handle" "incoming" msg=[Message] detailCode=DetailCode; public InMessageHandlerElements getInMessageHandlerAccess() { return (pInMessageHandler != null) ? pInMessageHandler : (pInMessageHandler = new InMessageHandlerElements()); @@ -5280,6 +5503,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //OutMessageHandler: + // // "handle" "outgoing" msg=[Message] detailCode=DetailCode; public OutMessageHandlerElements getOutMessageHandlerAccess() { return (pOutMessageHandler != null) ? pOutMessageHandler : (pOutMessageHandler = new OutMessageHandlerElements()); @@ -5290,6 +5514,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ProtocolSemantics: + // // {ProtocolSemantics} "semantics" "{" rules+=SemanticsRule* "}"; public ProtocolSemanticsElements getProtocolSemanticsAccess() { return (pProtocolSemantics != null) ? pProtocolSemantics : (pProtocolSemantics = new ProtocolSemanticsElements()); @@ -5300,6 +5525,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SemanticsRule: + // // InSemanticsRule | OutSemanticsRule; public SemanticsRuleElements getSemanticsRuleAccess() { return (pSemanticsRule != null) ? pSemanticsRule : (pSemanticsRule = new SemanticsRuleElements()); @@ -5310,7 +5536,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //InSemanticsRule: + // // "in" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ + // // ")"))?; public InSemanticsRuleElements getInSemanticsRuleAccess() { return (pInSemanticsRule != null) ? pInSemanticsRule : (pInSemanticsRule = new InSemanticsRuleElements()); @@ -5321,8 +5549,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //OutSemanticsRule: - // "out" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," followUps+=SemanticsRule)+ - // ")"))?; + // + // "out" ":" msg=[Message] ("->" (followUps+=SemanticsRule | "(" followUps+=SemanticsRule ("," + // + // followUps+=SemanticsRule)+ ")"))?; public OutSemanticsRuleElements getOutSemanticsRuleAccess() { return (pOutSemanticsRule != null) ? pOutSemanticsRule : (pOutSemanticsRule = new OutSemanticsRuleElements()); } @@ -5336,6 +5566,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// actor class // //enum ActorCommunicationType: + // // EVENT_DRIVEN="eventdriven" | DATA_DRIVEN="datadriven" | ASYNCHRONOUS="async" | SYNCHRONOUS="sync"; public ActorCommunicationTypeElements getActorCommunicationTypeAccess() { return (unknownRuleActorCommunicationType != null) ? unknownRuleActorCommunicationType : (unknownRuleActorCommunicationType = new ActorCommunicationTypeElements()); @@ -5360,12 +5591,19 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// since double containment is not supported we decided to define external ports as reference to interface ports // //ActorClass: + // // (abstract?="abstract"? & commType=ActorCommunicationType?) "ActorClass" name=ID docu=Documentation? ("extends" + // // base=[ActorClass|FQN])? "{" annotations+=Annotation* ("Interface" "{" ifPorts+=Port* ifSPPs+=SPPRef* "}")? + // // ("Structure" structureDocu=Documentation? "{" ("usercode1" userCode1=DetailCode)? ("usercode2" userCode2=DetailCode)? + // // ("usercode3" userCode3=DetailCode)? (intPorts+=Port | extPorts+=ExternalPort)* + // // serviceImplementations+=ServiceImplementation* strSAPs+=SAPRef* attributes+=Attribute* actorRefs+=ActorRef* + // // bindings+=Binding* connections+=LayerConnection* "}")? ("Behavior" behaviorDocu=Documentation? "{" + // // behaviorAnnotations+=Annotation* operations+=StandardOperation* stateMachine=StateMachine? "}")? "}"; public ActorClassElements getActorClassAccess() { return (pActorClass != null) ? pActorClass : (pActorClass = new ActorClassElements()); @@ -5376,6 +5614,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //InterfaceItem: + // // Port | SAPRef | SPPRef; public InterfaceItemElements getInterfaceItemAccess() { return (pInterfaceItem != null) ? pInterfaceItem : (pInterfaceItem = new InterfaceItemElements()); @@ -5386,7 +5625,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //Port: + // // conjugated?="conjugated"? "Port" name=ID multiplicity=MULTIPLICITY? ":" protocol=[GeneralProtocolClass|FQN] + // // docu=Documentation?; public PortElements getPortAccess() { return (pPort != null) ? pPort : (pPort = new PortElements()); @@ -5397,6 +5638,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ExternalPort: + // // "external" "Port" ifport=[Port]; public ExternalPortElements getExternalPortAccess() { return (pExternalPort != null) ? pExternalPort : (pExternalPort = new ExternalPortElements()); @@ -5407,6 +5649,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SAPRef: + // // "SAP" name=ID ":" protocol=[ProtocolClass|FQN]; public SAPRefElements getSAPRefAccess() { return (pSAPRef != null) ? pSAPRef : (pSAPRef = new SAPRefElements()); @@ -5417,6 +5660,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SPPRef: + // // "SPP" name=ID ":" protocol=[ProtocolClass|FQN]; public SPPRefElements getSPPRefAccess() { return (pSPPRef != null) ? pSPPRef : (pSPPRef = new SPPRefElements()); @@ -5427,6 +5671,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ServiceImplementation: + // // "ServiceImplementation" "of" spp=[SPPRef]; public ServiceImplementationElements getServiceImplementationAccess() { return (pServiceImplementation != null) ? pServiceImplementation : (pServiceImplementation = new ServiceImplementationElements()); @@ -5437,7 +5682,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //LogicalSystem: + // // "LogicalSystem" name=ID docu=Documentation? "{" annotations+=Annotation* subSystems+=SubSystemRef* bindings+=Binding* + // // connections+=LayerConnection* "}"; public LogicalSystemElements getLogicalSystemAccess() { return (pLogicalSystem != null) ? pLogicalSystem : (pLogicalSystem = new LogicalSystemElements()); @@ -5448,6 +5695,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ActorContainerRef: + // // SubSystemRef | ActorRef; public ActorContainerRefElements getActorContainerRefAccess() { return (pActorContainerRef != null) ? pActorContainerRef : (pActorContainerRef = new ActorContainerRefElements()); @@ -5458,6 +5706,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SubSystemRef: + // // "SubSystemRef" name=ID ":" type=[SubSystemClass|FQN] docu=Documentation?; public SubSystemRefElements getSubSystemRefAccess() { return (pSubSystemRef != null) ? pSubSystemRef : (pSubSystemRef = new SubSystemRefElements()); @@ -5468,8 +5717,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SubSystemClass: + // // "SubSystemClass" name=ID docu=Documentation? "{" annotations+=Annotation* ("usercode1" userCode1=DetailCode)? + // // ("usercode2" userCode2=DetailCode)? ("usercode3" userCode3=DetailCode)? relayPorts+=Port* ifSPPs+=SPPRef* + // // actorRefs+=ActorRef* bindings+=Binding* connections+=LayerConnection* threads+=LogicalThread* "}"; public SubSystemClassElements getSubSystemClassAccess() { return (pSubSystemClass != null) ? pSubSystemClass : (pSubSystemClass = new SubSystemClassElements()); @@ -5480,6 +5732,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //LogicalThread: + // // "LogicalThread" name=ID "prio" "=" prio=INT "{" instances+=ActorInstancePath ("," instances+=ActorInstancePath)* "}"; public LogicalThreadElements getLogicalThreadAccess() { return (pLogicalThread != null) ? pLogicalThread : (pLogicalThread = new LogicalThreadElements()); @@ -5490,6 +5743,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ActorInstancePath: + // // segments+=ID ("." segments+=ID)*; public ActorInstancePathElements getActorInstancePathAccess() { return (pActorInstancePath != null) ? pActorInstancePath : (pActorInstancePath = new ActorInstancePathElements()); @@ -5506,6 +5760,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// (2) use a notation with 1 to n bindings // //Binding: + // // "Binding" endpoint1=BindingEndPoint "and" endpoint2=BindingEndPoint; public BindingElements getBindingAccess() { return (pBinding != null) ? pBinding : (pBinding = new BindingElements()); @@ -5516,6 +5771,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //BindingEndPoint: + // // (actorRef=[ActorContainerRef] ".")? port=[Port] ("sub" sub=[SubProtocol])?; public BindingEndPointElements getBindingEndPointAccess() { return (pBindingEndPoint != null) ? pBindingEndPoint : (pBindingEndPoint = new BindingEndPointElements()); @@ -5526,6 +5782,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //LayerConnection: + // // "LayerConnection" from=SAPoint "satisfied_by" to=SPPoint; public LayerConnectionElements getLayerConnectionAccess() { return (pLayerConnection != null) ? pLayerConnection : (pLayerConnection = new LayerConnectionElements()); @@ -5536,6 +5793,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SAPoint: + // // RefSAPoint | RelaySAPoint; public SAPointElements getSAPointAccess() { return (pSAPoint != null) ? pSAPoint : (pSAPoint = new SAPointElements()); @@ -5568,6 +5826,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SPPoint: + // // ref=[ActorContainerRef] "." service=[SPPRef]; public SPPointElements getSPPointAccess() { return (pSPPoint != null) ? pSPPoint : (pSPPoint = new SPPointElements()); @@ -5578,6 +5837,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ActorRef: + // // "ActorRef" name=ID ("[" size=INT "]")? ":" type=[ActorClass|FQN] docu=Documentation?; public ActorRefElements getActorRefAccess() { return (pActorRef != null) ? pActorRef : (pActorRef = new ActorRefElements()); @@ -5592,6 +5852,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// state machine // //StateGraphNode: + // // State | ChoicePoint | TrPoint; public StateGraphNodeElements getStateGraphNodeAccess() { return (pStateGraphNode != null) ? pStateGraphNode : (pStateGraphNode = new StateGraphNodeElements()); @@ -5602,6 +5863,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //StateGraphItem: + // // StateGraphNode | Transition; public StateGraphItemElements getStateGraphItemAccess() { return (pStateGraphItem != null) ? pStateGraphItem : (pStateGraphItem = new StateGraphItemElements()); @@ -5612,6 +5874,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //State: + // // SimpleState | RefinedState; public StateElements getStateAccess() { return (pState != null) ? pState : (pState = new StateElements()); @@ -5622,7 +5885,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //StateGraph: + // // {StateGraph} "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | + // // refinedTransitions+=RefinedTransition)* "}"; public StateGraphElements getStateGraphAccess() { return (pStateGraph != null) ? pStateGraph : (pStateGraph = new StateGraphElements()); @@ -5633,8 +5898,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //StateMachine returns StateGraph: - // {StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition | - // refinedTransitions+=RefinedTransition)* "}"; + // + // {StateGraph} "StateMachine" "{" (states+=State | trPoints+=TrPoint | chPoints+=ChoicePoint | transitions+=Transition + // + // | refinedTransitions+=RefinedTransition)* "}"; public StateMachineElements getStateMachineAccess() { return (pStateMachine != null) ? pStateMachine : (pStateMachine = new StateMachineElements()); } @@ -5644,7 +5911,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SimpleState: + // // "State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("do" + // // doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")?; public SimpleStateElements getSimpleStateAccess() { return (pSimpleState != null) ? pSimpleState : (pSimpleState = new SimpleStateElements()); @@ -5655,7 +5924,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //RefinedState: + // // "RefinedState" target=[State|FQN] docu=Documentation? "{" ("entry" entryCode=DetailCode)? ("exit" + // // exitCode=DetailCode)? ("do" doCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}"; public RefinedStateElements getRefinedStateAccess() { return (pRefinedState != null) ? pRefinedState : (pRefinedState = new RefinedStateElements()); @@ -5670,6 +5941,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// super() keyword or flag like in Trice // //DetailCode: + // // "{" commands+=STRING+ "}"; public DetailCodeElements getDetailCodeAccess() { return (pDetailCode != null) ? pDetailCode : (pDetailCode = new DetailCodeElements()); @@ -5680,6 +5952,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //TrPoint: + // // TransitionPoint | EntryPoint | ExitPoint; public TrPointElements getTrPointAccess() { return (pTrPoint != null) ? pTrPoint : (pTrPoint = new TrPointElements()); @@ -5690,6 +5963,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //TransitionPoint: + // // handler?="handler"? "TransitionPoint" name=ID; public TransitionPointElements getTransitionPointAccess() { return (pTransitionPoint != null) ? pTransitionPoint : (pTransitionPoint = new TransitionPointElements()); @@ -5700,6 +5974,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //EntryPoint: + // // "EntryPoint" name=ID; public EntryPointElements getEntryPointAccess() { return (pEntryPoint != null) ? pEntryPoint : (pEntryPoint = new EntryPointElements()); @@ -5710,6 +5985,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ExitPoint: + // // "ExitPoint" name=ID; public ExitPointElements getExitPointAccess() { return (pExitPoint != null) ? pExitPoint : (pExitPoint = new ExitPointElements()); @@ -5720,6 +5996,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ChoicePoint: + // // "ChoicePoint" name=ID docu=Documentation?; public ChoicePointElements getChoicePointAccess() { return (pChoicePoint != null) ? pChoicePoint : (pChoicePoint = new ChoicePointElements()); @@ -5730,6 +6007,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //Transition: + // // InitialTransition | NonInitialTransition; public TransitionElements getTransitionAccess() { return (pTransition != null) ? pTransition : (pTransition = new TransitionElements()); @@ -5740,6 +6018,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //NonInitialTransition: + // // TransitionChainStartTransition | ContinuationTransition | CPBranchTransition; public NonInitialTransitionElements getNonInitialTransitionAccess() { return (pNonInitialTransition != null) ? pNonInitialTransition : (pNonInitialTransition = new NonInitialTransitionElements()); @@ -5750,6 +6029,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //TransitionChainStartTransition: + // // TriggeredTransition | GuardedTransition; public TransitionChainStartTransitionElements getTransitionChainStartTransitionAccess() { return (pTransitionChainStartTransition != null) ? pTransitionChainStartTransition : (pTransitionChainStartTransition = new TransitionChainStartTransitionElements()); @@ -5760,7 +6040,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //InitialTransition: + // // "Transition" name=ID? ":" "initial" "->" to=TransitionTerminal docu=Documentation? "{" ("action" action=DetailCode)? + // // "}"; public InitialTransitionElements getInitialTransitionAccess() { return (pInitialTransition != null) ? pInitialTransition : (pInitialTransition = new InitialTransitionElements()); @@ -5771,7 +6053,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ContinuationTransition: + // // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? ("{" ("action" + // // action=DetailCode)? "}")?; public ContinuationTransitionElements getContinuationTransitionAccess() { return (pContinuationTransition != null) ? pContinuationTransition : (pContinuationTransition = new ContinuationTransitionElements()); @@ -5782,7 +6066,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //TriggeredTransition: + // // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "triggers" "{" + // // triggers+=Trigger ("or" triggers+=Trigger)* "}" ("action" action=DetailCode)? "}"; public TriggeredTransitionElements getTriggeredTransitionAccess() { return (pTriggeredTransition != null) ? pTriggeredTransition : (pTriggeredTransition = new TriggeredTransitionElements()); @@ -5793,7 +6079,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //GuardedTransition: + // // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "guard" + // // guard=DetailCode ("action" action=DetailCode)? "}"; public GuardedTransitionElements getGuardedTransitionAccess() { return (pGuardedTransition != null) ? pGuardedTransition : (pGuardedTransition = new GuardedTransitionElements()); @@ -5804,7 +6092,9 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //CPBranchTransition: + // // "Transition" name=ID? ":" from=TransitionTerminal "->" to=TransitionTerminal docu=Documentation? "{" "cond" + // // condition=DetailCode ("action" action=DetailCode)? "}"; public CPBranchTransitionElements getCPBranchTransitionAccess() { return (pCPBranchTransition != null) ? pCPBranchTransition : (pCPBranchTransition = new CPBranchTransitionElements()); @@ -5814,7 +6104,10 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { return getCPBranchTransitionAccess().getRule(); } + //// by validation RefinedTransition can only be contained in the top level state graph + // //RefinedTransition: + // // "RefinedTransition" target=[Transition|FQN] docu=Documentation? "{" "action" action=DetailCode "}"; public RefinedTransitionElements getRefinedTransitionAccess() { return (pRefinedTransition != null) ? pRefinedTransition : (pRefinedTransition = new RefinedTransitionElements()); @@ -5825,6 +6118,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //TransitionTerminal: + // // StateTerminal | TrPointTerminal | SubStateTrPointTerminal | ChoicepointTerminal; public TransitionTerminalElements getTransitionTerminalAccess() { return (pTransitionTerminal != null) ? pTransitionTerminal : (pTransitionTerminal = new TransitionTerminalElements()); @@ -5835,6 +6129,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //StateTerminal: + // // state=[State]; public StateTerminalElements getStateTerminalAccess() { return (pStateTerminal != null) ? pStateTerminal : (pStateTerminal = new StateTerminalElements()); @@ -5845,6 +6140,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //TrPointTerminal: + // // "my" trPoint=[TrPoint]; public TrPointTerminalElements getTrPointTerminalAccess() { return (pTrPointTerminal != null) ? pTrPointTerminal : (pTrPointTerminal = new TrPointTerminalElements()); @@ -5855,6 +6151,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //SubStateTrPointTerminal: + // // trPoint=[TrPoint] "of" state=[State]; public SubStateTrPointTerminalElements getSubStateTrPointTerminalAccess() { return (pSubStateTrPointTerminal != null) ? pSubStateTrPointTerminal : (pSubStateTrPointTerminal = new SubStateTrPointTerminalElements()); @@ -5865,6 +6162,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ChoicepointTerminal: + // // "cp" cp=[ChoicePoint]; public ChoicepointTerminalElements getChoicepointTerminalAccess() { return (pChoicepointTerminal != null) ? pChoicepointTerminal : (pChoicepointTerminal = new ChoicepointTerminalElements()); @@ -5875,6 +6173,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //Trigger: + // // "<" msgFromIfPairs+=MessageFromIf ("|" msgFromIfPairs+=MessageFromIf)* guard=Guard? ">"; public TriggerElements getTriggerAccess() { return (pTrigger != null) ? pTrigger : (pTrigger = new TriggerElements()); @@ -5885,6 +6184,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //MessageFromIf: + // // message=[Message] ":" from=[InterfaceItem]; public MessageFromIfElements getMessageFromIfAccess() { return (pMessageFromIf != null) ? pMessageFromIf : (pMessageFromIf = new MessageFromIfElements()); @@ -5895,6 +6195,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //Guard: + // // "guard" guard=DetailCode; public GuardElements getGuardAccess() { return (pGuard != null) ? pGuard : (pGuard = new GuardElements()); @@ -5909,6 +6210,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// general // //Documentation: + // // "[" text+=STRING+ "]"; public DocumentationElements getDocumentationAccess() { return (pDocumentation != null) ? pDocumentation : (pDocumentation = new DocumentationElements()); @@ -5919,6 +6221,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //Annotation: + // // "@" name=ID ("(" attributes+=KeyValue ("," attributes+=KeyValue)* ")")?; public AnnotationElements getAnnotationAccess() { return (pAnnotation != null) ? pAnnotation : (pAnnotation = new AnnotationElements()); @@ -5929,6 +6232,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //KeyValue: + // // key=ID "=" value=STRING; public KeyValueElements getKeyValueAccess() { return (pKeyValue != null) ? pKeyValue : (pKeyValue = new KeyValueElements()); @@ -5975,6 +6279,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// the attribute 'importURI' is picked up by the ImportUriGlobalScopeProvider // //Import: + // // "import" (importedNamespace=ImportedFQN "from" | "model") importURI=STRING; public ImportElements getImportAccess() { return (pImport != null) ? pImport : (pImport = new ImportElements()); @@ -5985,6 +6290,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //ImportedFQN: + // // FQN ".*"?; public ImportedFQNElements getImportedFQNAccess() { return (pImportedFQN != null) ? pImportedFQN : (pImportedFQN = new ImportedFQNElements()); @@ -5995,6 +6301,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //FQN: + // // ID ("." ID)*; public FQNElements getFQNAccess() { return (pFQN != null) ? pFQN : (pFQN = new FQNElements()); @@ -6009,6 +6316,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { //// (because then the lexer already would find this in places where it is not expected, e.g. in an Attribute) // //MULTIPLICITY returns ecore::EInt: + // // "[" ("*" | INT) "]"; public MULTIPLICITYElements getMULTIPLICITYAccess() { return (pMULTIPLICITY != null) ? pMULTIPLICITY : (pMULTIPLICITY = new MULTIPLICITYElements()); @@ -6019,43 +6327,51 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder { } //terminal ID: + // // "^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*; public TerminalRule getIDRule() { return gaTerminals.getIDRule(); } //terminal INT returns ecore::EInt: + // // "0".."9"+; public TerminalRule getINTRule() { return gaTerminals.getINTRule(); } //terminal STRING: + // // "\"" ("\\" ("b" | "t" | "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\""))* "\"" | "\'" ("\\" ("b" | "t" | + // // "n" | "f" | "r" | "u" | "\"" | "\'" | "\\") | !("\\" | "\'"))* "\'"; public TerminalRule getSTRINGRule() { return gaTerminals.getSTRINGRule(); } //terminal ML_COMMENT: + // // "/ *"->"* /"; public TerminalRule getML_COMMENTRule() { return gaTerminals.getML_COMMENTRule(); } //terminal SL_COMMENT: + // // "//" !("\n" | "\r")* ("\r"? "\n")?; public TerminalRule getSL_COMMENTRule() { return gaTerminals.getSL_COMMENTRule(); } //terminal WS: + // // (" " | "\t" | "\r" | "\n")+; public TerminalRule getWSRule() { return gaTerminals.getWSRule(); } //terminal ANY_OTHER: + // // .; public TerminalRule getANY_OTHERRule() { return gaTerminals.getANY_OTHERRule(); diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java index ff6f76e1b..8eebd878f 100644 --- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java +++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java @@ -988,6 +988,6 @@ public class ValidationUtil { }
public static boolean isValidID(String name) {
- return !name.matches("\\^?[a-zA-Z_][a-zA-Z_0-9]*");
+ return name.matches("\\^?[a-zA-Z_][a-zA-Z_0-9]*");
}
}
diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java index 688325721..2f9331703 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java @@ -265,6 +265,8 @@ public class EtUnitReportConverter { ++count;
if (!line.equals("etUnit report")) {
System.err.println("Error: file "+report+", line "+line+" is missing header line - no etunit file");
+ bufRead.close();
+ input.close();
return null;
}
@@ -294,6 +296,8 @@ public class EtUnitReportConverter { TestcaseType tc = id2case.get(id);
if (tc==null) {
System.err.println("Error: in file "+report+", line "+count+" - unknown test case id");
+ bufRead.close();
+ input.close();
return null;
}
FailureType fail = EtunitFactory.eINSTANCE.createFailureType();
@@ -322,6 +326,8 @@ public class EtUnitReportConverter { TestcaseType tc = id2case.get(id);
if (tc==null) {
System.err.println("Error: in file "+report+", line "+count+" - unknown test case id");
+ bufRead.close();
+ input.close();
return null;
}
tc.setTime(BigDecimal.valueOf(time));
diff --git a/plugins/org.eclipse.etrice.generator.c/.gitignore b/plugins/org.eclipse.etrice.generator.c/.gitignore index 092357e47..d1b2f933f 100644 --- a/plugins/org.eclipse.etrice.generator.c/.gitignore +++ b/plugins/org.eclipse.etrice.generator.c/.gitignore @@ -1 +1,2 @@ bin
+*._trace
diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF index 4fc3bfe41..e9a528d86 100644 --- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.2.0", org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
+ org.eclipse.xtend.lib;bundle-version="2.3.0",
org.eclipse.xtext.generator;bundle-version="2.1.1",
org.eclipse.xtext.util;bundle-version="2.1.1"
Import-Package: org.apache.log4j
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend index 07d018bd3..ad81991e2 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend @@ -27,7 +27,6 @@ import org.eclipse.xtext.generator.JavaIoFileSystemAccess import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
-import org.eclipse.etrice.generator.generic.TypeHelpers
import org.eclipse.etrice.generator.generic.GenericActorClassGenerator
@@ -39,7 +38,6 @@ class ActorClassGen extends GenericActorClassGenerator { @Inject extension RoomExtensions
@Inject extension ProcedureHelpers
- @Inject extension TypeHelpers
@Inject extension StateMachineGen
@Inject ILogger logger
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend index cf39a6dca..de1df9339 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend @@ -15,7 +15,6 @@ package org.eclipse.etrice.generator.c.gen import com.google.inject.Inject
import com.google.inject.Singleton
-import org.eclipse.etrice.core.room.Message
import org.eclipse.etrice.core.room.ProtocolClass
import org.eclipse.etrice.core.room.CommunicationType
import org.eclipse.etrice.core.room.PrimitiveType
@@ -217,7 +216,6 @@ class ProtocolClassGen extends GenericProtocolClassGenerator { «FOR message : messages»
«var typeName =message.data.refType.type.typeName»
«var refp = if (!(message.data.refType.type instanceof PrimitiveType)) "*" else ""»
- «var refa = if ((message.data.refType.type instanceof PrimitiveType)) "&" else ""»
«var data = ", "+typeName+refp+" data"»
«messageSetterSignature(pc.getPortClassName(true), message.name, data)» {
self->«message.name» = data;
@@ -322,10 +320,6 @@ class ProtocolClassGen extends GenericProtocolClassGenerator { def private messageGetterSignature(String className, String messageName, String type) {
type+" "+className+"_"+messageName+"_get(const "+className+"* const self)"
}
-
- def private messageCall(Message m) {'''
- «m.name»(«IF m.data!=null» «m.data.name»«ENDIF»)
- '''}
// def sendMessage(Message m, boolean conj) {'''
// «var dir = if (conj) "IN" else "OUT"»
@@ -341,7 +335,6 @@ class ProtocolClassGen extends GenericProtocolClassGenerator { def private genReceiveHandlers(ProtocolClass pc, Boolean conj){
var portClassName = pc.getPortClassName(conj)
- var replPortClassName = pc.getPortClassName(conj, true)
'''
/* receiver handlers */
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend index ca52d7653..f9038caf3 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend @@ -338,7 +338,6 @@ class SubSystemClassGen { var dataPorts = simplePorts.filter(p|p.protocol.commType==CommunicationType::DATA_DRIVEN)
var recvPorts = dataPorts.filter(p|p instanceof PortInstance && !(p as PortInstance).port.conjugated)
- var sendPorts = dataPorts.filter(p|p instanceof PortInstance && (p as PortInstance).port.conjugated)
// compute replicated port offsets
var offsets = new HashMap<InterfaceItemInstance, Integer>()
@@ -381,7 +380,6 @@ class SubSystemClassGen { '''}
def private String genPortInitializer(Root root, ActorInstance ai, InterfaceItemInstance pi) {
- var recvMsg = if (pi.peers.empty) "NULL" else ai.actorClass.name+"_receiveMessage"
var objId = if (pi.peers.empty) 0 else pi.peers.get(0).objId
var idx = if (pi.peers.empty) 0 else pi.peers.get(0).peers.indexOf(pi)
@@ -508,4 +506,4 @@ class SubSystemClassGen { '''
}
-}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java index 74bf959c1..5e1afeec5 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.c.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.HashSet;
@@ -28,17 +29,13 @@ import org.eclipse.etrice.generator.c.gen.StateMachineGen; import org.eclipse.etrice.generator.generic.GenericActorClassGenerator;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.etrice.generator.generic.TypeHelpers;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class ActorClassGen extends GenericActorClassGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -53,9 +50,6 @@ public class ActorClassGen extends GenericActorClassGenerator { private ProcedureHelpers _procedureHelpers;
@Inject
- private TypeHelpers _typeHelpers;
-
- @Inject
private StateMachineGen _stateMachineGen;
@Inject
@@ -69,129 +63,121 @@ public class ActorClassGen extends GenericActorClassGenerator { String _generationTargetPath = this._roomExtensions.getGenerationTargetPath(_actorClass);
ActorClass _actorClass_1 = xpac.getActorClass();
String _path = this._roomExtensions.getPath(_actorClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
+ String path = (_generationTargetPath + _path);
ActorClass _actorClass_2 = xpac.getActorClass();
String _cHeaderFileName = this._cExtensions.getCHeaderFileName(_actorClass_2);
- String _operator_plus_1 = StringExtensions.operator_plus("generating ActorClass header \'", _cHeaderFileName);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String _plus = ("generating ActorClass header \'" + _cHeaderFileName);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
ActorClass _actorClass_3 = xpac.getActorClass();
String _cHeaderFileName_1 = this._cExtensions.getCHeaderFileName(_actorClass_3);
ActorClass _actorClass_4 = xpac.getActorClass();
- StringConcatenation _generateHeaderFile = this.generateHeaderFile(root, xpac, _actorClass_4);
+ CharSequence _generateHeaderFile = this.generateHeaderFile(root, xpac, _actorClass_4);
this.fileAccess.generateFile(_cHeaderFileName_1, _generateHeaderFile);
boolean _hasBehaviorAnnotation = this.hasBehaviorAnnotation(xpac, "BehaviorManual");
if (_hasBehaviorAnnotation) {
ActorClass _actorClass_5 = xpac.getActorClass();
String _name = _actorClass_5.getName();
- String _operator_plus_5 = StringExtensions.operator_plus("omitting ActorClass source for \'", _name);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "\' since @BehaviorManual is specified");
- this.logger.logInfo(_operator_plus_6);
+ String _plus_4 = ("omitting ActorClass source for \'" + _name);
+ String _plus_5 = (_plus_4 + "\' since @BehaviorManual is specified");
+ this.logger.logInfo(_plus_5);
} else {
- {
- ActorClass _actorClass_6 = xpac.getActorClass();
- String _cSourceFileName = this._cExtensions.getCSourceFileName(_actorClass_6);
- String _operator_plus_7 = StringExtensions.operator_plus("generating ActorClass source \'", _cSourceFileName);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "\' in \'");
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, path);
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_9, "\'");
- this.logger.logInfo(_operator_plus_10);
- this.fileAccess.setOutputPath(path);
- ActorClass _actorClass_7 = xpac.getActorClass();
- String _cSourceFileName_1 = this._cExtensions.getCSourceFileName(_actorClass_7);
- ActorClass _actorClass_8 = xpac.getActorClass();
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, xpac, _actorClass_8);
- this.fileAccess.generateFile(_cSourceFileName_1, _generateSourceFile);
- }
+ ActorClass _actorClass_6 = xpac.getActorClass();
+ String _cSourceFileName = this._cExtensions.getCSourceFileName(_actorClass_6);
+ String _plus_6 = ("generating ActorClass source \'" + _cSourceFileName);
+ String _plus_7 = (_plus_6 + "\' in \'");
+ String _plus_8 = (_plus_7 + path);
+ String _plus_9 = (_plus_8 + "\'");
+ this.logger.logInfo(_plus_9);
+ this.fileAccess.setOutputPath(path);
+ ActorClass _actorClass_7 = xpac.getActorClass();
+ String _cSourceFileName_1 = this._cExtensions.getCSourceFileName(_actorClass_7);
+ ActorClass _actorClass_8 = xpac.getActorClass();
+ CharSequence _generateSourceFile = this.generateSourceFile(root, xpac, _actorClass_8);
+ this.fileAccess.generateFile(_cSourceFileName_1, _generateSourceFile);
}
}
}
}
private boolean hasBehaviorAnnotation(final ExpandedActorClass xpac, final String annotation) {
- ActorClass _actorClass = xpac.getActorClass();
- EList<Annotation> _behaviorAnnotations = _actorClass.getBehaviorAnnotations();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_behaviorAnnotations, null);
- if (_operator_notEquals) {
- ActorClass _actorClass_1 = xpac.getActorClass();
- EList<Annotation> _behaviorAnnotations_1 = _actorClass_1.getBehaviorAnnotations();
- final Function1<Annotation,Boolean> _function = new Function1<Annotation,Boolean>() {
- public Boolean apply(final Annotation e) {
- String _name = e.getName();
- boolean _operator_equals = ObjectExtensions.operator_equals(_name, annotation);
- return ((Boolean)_operator_equals);
- }
- };
- Annotation _findFirst = IterableExtensions.<Annotation>findFirst(_behaviorAnnotations_1, _function);
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_findFirst, null);
- if (_operator_notEquals_1) {
- return true;
- }
+ ActorClass _actorClass = xpac.getActorClass();
+ EList<Annotation> _behaviorAnnotations = _actorClass.getBehaviorAnnotations();
+ boolean _notEquals = (!Objects.equal(_behaviorAnnotations, null));
+ if (_notEquals) {
+ ActorClass _actorClass_1 = xpac.getActorClass();
+ EList<Annotation> _behaviorAnnotations_1 = _actorClass_1.getBehaviorAnnotations();
+ final Function1<Annotation,Boolean> _function = new Function1<Annotation,Boolean>() {
+ public Boolean apply(final Annotation e) {
+ String _name = e.getName();
+ boolean _equals = Objects.equal(_name, annotation);
+ return Boolean.valueOf(_equals);
+ }
+ };
+ Annotation _findFirst = IterableExtensions.<Annotation>findFirst(_behaviorAnnotations_1, _function);
+ boolean _notEquals_1 = (!Objects.equal(_findFirst, null));
+ if (_notEquals_1) {
+ return true;
}
- return false;
+ }
+ return false;
}
- private StringConcatenation generateHeaderFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence generateHeaderFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
List<Port> _allEndPorts = this._roomExtensions.getAllEndPorts(ac);
final Function1<Port,Boolean> _function = new Function1<Port,Boolean>() {
public Boolean apply(final Port p) {
GeneralProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
}
};
- Iterable<Port> _filter = IterableExtensions.<Port>filter(_allEndPorts, _function);
- Iterable<Port> eventPorts = _filter;
+ Iterable<Port> eventPorts = IterableExtensions.<Port>filter(_allEndPorts, _function);
List<Port> _allEndPorts_1 = this._roomExtensions.getAllEndPorts(ac);
final Function1<Port,Boolean> _function_1 = new Function1<Port,Boolean>() {
public Boolean apply(final Port p) {
- boolean _operator_and = false;
+ boolean _and = false;
GeneralProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.DATA_DRIVEN);
- if (!_operator_equals) {
- _operator_and = false;
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ if (!_equals) {
+ _and = false;
} else {
boolean _isConjugated = p.isConjugated();
- _operator_and = BooleanExtensions.operator_and(_operator_equals, _isConjugated);
+ _and = (_equals && _isConjugated);
}
- return ((Boolean)_operator_and);
+ return Boolean.valueOf(_and);
}
};
- Iterable<Port> _filter_1 = IterableExtensions.<Port>filter(_allEndPorts_1, _function_1);
- Iterable<Port> sendPorts = _filter_1;
+ Iterable<Port> sendPorts = IterableExtensions.<Port>filter(_allEndPorts_1, _function_1);
List<Port> _allEndPorts_2 = this._roomExtensions.getAllEndPorts(ac);
final Function1<Port,Boolean> _function_2 = new Function1<Port,Boolean>() {
public Boolean apply(final Port p) {
- boolean _operator_and = false;
+ boolean _and = false;
GeneralProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = ((ProtocolClass) _protocol).getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.DATA_DRIVEN);
- if (!_operator_equals) {
- _operator_and = false;
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ if (!_equals) {
+ _and = false;
} else {
boolean _isConjugated = p.isConjugated();
- boolean _operator_not = BooleanExtensions.operator_not(_isConjugated);
- _operator_and = BooleanExtensions.operator_and(_operator_equals, _operator_not);
+ boolean _not = (!_isConjugated);
+ _and = (_equals && _not);
}
- return ((Boolean)_operator_and);
+ return Boolean.valueOf(_and);
}
};
- Iterable<Port> _filter_2 = IterableExtensions.<Port>filter(_allEndPorts_2, _function_2);
- Iterable<Port> recvPorts = _filter_2;
+ Iterable<Port> recvPorts = IterableExtensions.<Port>filter(_allEndPorts_2, _function_2);
ActorCommunicationType _commType = ac.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.DATA_DRIVEN);
- boolean dataDriven = _operator_equals;
+ boolean dataDriven = Objects.equal(_commType, ActorCommunicationType.DATA_DRIVEN);
ActorCommunicationType _commType_1 = ac.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.ASYNCHRONOUS);
- boolean async = _operator_equals_1;
+ boolean async = Objects.equal(_commType_1, ActorCommunicationType.ASYNCHRONOUS);
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -214,7 +200,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.newLine();
String _name_1 = ac.getName();
- StringConcatenation _generateIncludeGuardBegin = this._cExtensions.generateIncludeGuardBegin(_name_1);
+ CharSequence _generateIncludeGuardBegin = this._cExtensions.generateIncludeGuardBegin(_name_1);
_builder.append(_generateIncludeGuardBegin, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -244,7 +230,7 @@ public class ActorClassGen extends GenericActorClassGenerator { }
}
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(ac, 1);
+ CharSequence _userCode = this._procedureHelpers.userCode(ac, 1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -260,31 +246,31 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("/* const part of ActorClass (ROM) */");
_builder.newLine();
{
- boolean _operator_and = false;
- boolean _operator_and_1 = false;
- boolean _operator_and_2 = false;
+ boolean _and = false;
+ boolean _and_1 = false;
+ boolean _and_2 = false;
boolean _isEmpty = IterableExtensions.isEmpty(eventPorts);
if (!_isEmpty) {
- _operator_and_2 = false;
+ _and_2 = false;
} else {
boolean _isEmpty_1 = IterableExtensions.isEmpty(recvPorts);
- _operator_and_2 = BooleanExtensions.operator_and(_isEmpty, _isEmpty_1);
+ _and_2 = (_isEmpty && _isEmpty_1);
}
- if (!_operator_and_2) {
- _operator_and_1 = false;
+ if (!_and_2) {
+ _and_1 = false;
} else {
List<SAPRef> _allSAPs = this._roomExtensions.getAllSAPs(ac);
boolean _isEmpty_2 = _allSAPs.isEmpty();
- _operator_and_1 = BooleanExtensions.operator_and(_operator_and_2, _isEmpty_2);
+ _and_1 = (_and_2 && _isEmpty_2);
}
- if (!_operator_and_1) {
- _operator_and = false;
+ if (!_and_1) {
+ _and = false;
} else {
List<ServiceImplementation> _allServiceImplementations = this._roomExtensions.getAllServiceImplementations(ac);
boolean _isEmpty_3 = _allServiceImplementations.isEmpty();
- _operator_and = BooleanExtensions.operator_and(_operator_and_1, _isEmpty_3);
+ _and = (_and_1 && _isEmpty_3);
}
- if (_operator_and) {
+ if (_and) {
_builder.append("/* this actor class has no ports and thus no constant data */");
_builder.newLine();
} else {
@@ -300,8 +286,8 @@ public class ActorClassGen extends GenericActorClassGenerator { for(final Port ep : eventPorts) {
{
int _multiplicity = ep.getMultiplicity();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(((Integer)_multiplicity), ((Integer)1));
- if (_operator_equals_2) {
+ boolean _equals = (_multiplicity == 1);
+ if (_equals) {
_builder.append("\t");
_builder.append("const ");
String _portClassName = this._roomExtensions.getPortClassName(ep);
@@ -324,8 +310,8 @@ public class ActorClassGen extends GenericActorClassGenerator { for(final Port ep_1 : recvPorts) {
{
int _multiplicity_1 = ep_1.getMultiplicity();
- boolean _operator_equals_3 = ObjectExtensions.operator_equals(((Integer)_multiplicity_1), ((Integer)1));
- if (_operator_equals_3) {
+ boolean _equals_1 = (_multiplicity_1 == 1);
+ if (_equals_1) {
_builder.append("\t");
_builder.append("const ");
String _portClassName_1 = this._roomExtensions.getPortClassName(ep_1);
@@ -367,8 +353,8 @@ public class ActorClassGen extends GenericActorClassGenerator { for(final Port ep_2 : _allEndPorts_3) {
{
int _multiplicity_2 = ep_2.getMultiplicity();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(((Integer)_multiplicity_2), ((Integer)1));
- if (_operator_notEquals) {
+ boolean _notEquals = (_multiplicity_2 != 1);
+ if (_notEquals) {
_builder.append("\t");
_builder.append("const etReplPort ");
String _name_10 = ep_2.getName();
@@ -407,10 +393,10 @@ public class ActorClassGen extends GenericActorClassGenerator { {
StateGraph _stateMachine = xpac.getStateMachine();
boolean _isEmpty_4 = RoomHelpers.isEmpty(_stateMachine);
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty_4);
- if (_operator_not) {
+ boolean _not = (!_isEmpty_4);
+ if (_not) {
_builder.newLine();
- StringConcatenation _genHeaderConstants = this._stateMachineGen.genHeaderConstants(xpac);
+ CharSequence _genHeaderConstants = this._stateMachineGen.genHeaderConstants(xpac);
_builder.append(_genHeaderConstants, "");
_builder.newLineIfNotEmpty();
}
@@ -424,32 +410,32 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_and_3 = false;
- boolean _operator_and_4 = false;
- boolean _operator_and_5 = false;
+ boolean _and_3 = false;
+ boolean _and_4 = false;
+ boolean _and_5 = false;
boolean _isEmpty_5 = IterableExtensions.isEmpty(eventPorts);
if (!_isEmpty_5) {
- _operator_and_5 = false;
+ _and_5 = false;
} else {
boolean _isEmpty_6 = IterableExtensions.isEmpty(recvPorts);
- _operator_and_5 = BooleanExtensions.operator_and(_isEmpty_5, _isEmpty_6);
+ _and_5 = (_isEmpty_5 && _isEmpty_6);
}
- if (!_operator_and_5) {
- _operator_and_4 = false;
+ if (!_and_5) {
+ _and_4 = false;
} else {
List<SAPRef> _allSAPs_2 = this._roomExtensions.getAllSAPs(ac);
boolean _isEmpty_7 = _allSAPs_2.isEmpty();
- _operator_and_4 = BooleanExtensions.operator_and(_operator_and_5, _isEmpty_7);
+ _and_4 = (_and_5 && _isEmpty_7);
}
- if (!_operator_and_4) {
- _operator_and_3 = false;
+ if (!_and_4) {
+ _and_3 = false;
} else {
List<ServiceImplementation> _allServiceImplementations_2 = this._roomExtensions.getAllServiceImplementations(ac);
boolean _isEmpty_8 = _allServiceImplementations_2.isEmpty();
- _operator_and_3 = BooleanExtensions.operator_and(_operator_and_4, _isEmpty_8);
+ _and_3 = (_and_4 && _isEmpty_8);
}
- boolean _operator_not_1 = BooleanExtensions.operator_not(_operator_and_3);
- if (_operator_not_1) {
+ boolean _not_1 = (!_and_3);
+ if (_not_1) {
_builder.append("\t");
_builder.append("const ");
String _name_14 = ac.getName();
@@ -467,8 +453,8 @@ public class ActorClassGen extends GenericActorClassGenerator { for(final Port ep_3 : sendPorts) {
{
int _multiplicity_3 = ep_3.getMultiplicity();
- boolean _operator_equals_4 = ObjectExtensions.operator_equals(((Integer)_multiplicity_3), ((Integer)1));
- if (_operator_equals_4) {
+ boolean _equals_2 = (_multiplicity_3 == 1);
+ if (_equals_2) {
_builder.append("\t");
String _portClassName_3 = this._roomExtensions.getPortClassName(ep_3);
_builder.append(_portClassName_3, " ");
@@ -484,7 +470,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t");
List<Attribute> _allAttributes = this._roomExtensions.getAllAttributes(ac);
- StringConcatenation _attributes = this._procedureHelpers.attributes(_allAttributes);
+ CharSequence _attributes = this._procedureHelpers.attributes(_allAttributes);
_builder.append(_attributes, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -493,14 +479,14 @@ public class ActorClassGen extends GenericActorClassGenerator { for(final Attribute a : _allAttributes_1) {
{
String _defaultValueLiteral = a.getDefaultValueLiteral();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals_1) {
String _name_16 = ac.getName();
- String _operator_plus = StringExtensions.operator_plus(_name_16, " ");
+ String _plus = (_name_16 + " ");
String _name_17 = a.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name_17);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ": Attribute initialization not supported in C");
- this.logger.logInfo(_operator_plus_2);
+ String _plus_1 = (_plus + _name_17);
+ String _plus_2 = (_plus_1 + ": Attribute initialization not supported in C");
+ this.logger.logInfo(_plus_2);
_builder.newLineIfNotEmpty();
}
}
@@ -511,13 +497,13 @@ public class ActorClassGen extends GenericActorClassGenerator { {
StateGraph _stateMachine_1 = xpac.getStateMachine();
boolean _isEmpty_9 = RoomHelpers.isEmpty(_stateMachine_1);
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isEmpty_9);
- if (_operator_not_2) {
+ boolean _not_2 = (!_isEmpty_9);
+ if (_not_2) {
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genDataMembers = this._stateMachineGen.genDataMembers(xpac);
+ CharSequence _genDataMembers = this._stateMachineGen.genDataMembers(xpac);
_builder.append(_genDataMembers, " ");
_builder.newLineIfNotEmpty();
}
@@ -541,13 +527,13 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLineIfNotEmpty();
_builder.newLine();
{
- boolean _operator_or = false;
+ boolean _or = false;
if (dataDriven) {
- _operator_or = true;
+ _or = true;
} else {
- _operator_or = BooleanExtensions.operator_or(dataDriven, async);
+ _or = (dataDriven || async);
}
- if (_operator_or) {
+ if (_or) {
_builder.append("void ");
String _name_21 = ac.getName();
_builder.append(_name_21, "");
@@ -561,16 +547,16 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
EList<StandardOperation> _operations = ac.getOperations();
String _name_23 = ac.getName();
- StringConcatenation _operationsDeclaration = this._procedureHelpers.operationsDeclaration(_operations, _name_23);
+ CharSequence _operationsDeclaration = this._procedureHelpers.operationsDeclaration(_operations, _name_23);
_builder.append(_operationsDeclaration, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
- StringConcatenation _userCode_1 = this._procedureHelpers.userCode(ac, 2);
+ CharSequence _userCode_1 = this._procedureHelpers.userCode(ac, 2);
_builder.append(_userCode_1, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
String _name_24 = ac.getName();
- StringConcatenation _generateIncludeGuardEnd = this._cExtensions.generateIncludeGuardEnd(_name_24);
+ CharSequence _generateIncludeGuardEnd = this._cExtensions.generateIncludeGuardEnd(_name_24);
_builder.append(_generateIncludeGuardEnd, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -579,25 +565,22 @@ public class ActorClassGen extends GenericActorClassGenerator { return _xblockexpression;
}
- private StringConcatenation generateSourceFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence generateSourceFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
ActorCommunicationType _commType = ac.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.ASYNCHRONOUS);
- boolean async = _operator_equals;
+ boolean async = Objects.equal(_commType, ActorCommunicationType.ASYNCHRONOUS);
ActorCommunicationType _commType_1 = ac.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
- boolean eventDriven = _operator_equals_1;
+ boolean eventDriven = Objects.equal(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
ActorCommunicationType _commType_2 = ac.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, ActorCommunicationType.DATA_DRIVEN);
- boolean dataDriven = _operator_equals_2;
- boolean _operator_or = false;
+ boolean dataDriven = Objects.equal(_commType_2, ActorCommunicationType.DATA_DRIVEN);
+ boolean _or = false;
if (async) {
- _operator_or = true;
+ _or = true;
} else {
- _operator_or = BooleanExtensions.operator_or(async, eventDriven);
+ _or = (async || eventDriven);
}
- boolean handleEvents = _operator_or;
+ boolean handleEvents = _or;
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -645,7 +628,7 @@ public class ActorClassGen extends GenericActorClassGenerator { }
}
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(ac, 3);
+ CharSequence _userCode = this._procedureHelpers.userCode(ac, 3);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -658,9 +641,9 @@ public class ActorClassGen extends GenericActorClassGenerator { {
StateGraph _stateMachine = xpac.getStateMachine();
boolean _isEmpty = RoomHelpers.isEmpty(_stateMachine);
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
- StringConcatenation _genStateMachine = this._stateMachineGen.genStateMachine(xpac);
+ boolean _not = (!_isEmpty);
+ if (_not) {
+ CharSequence _genStateMachine = this._stateMachineGen.genStateMachine(xpac);
_builder.append(_genStateMachine, "");
_builder.newLineIfNotEmpty();
}
@@ -683,10 +666,10 @@ public class ActorClassGen extends GenericActorClassGenerator { {
StateGraph _stateMachine_1 = xpac.getStateMachine();
boolean _isEmpty_1 = RoomHelpers.isEmpty(_stateMachine_1);
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not_1) {
+ boolean _not_1 = (!_isEmpty_1);
+ if (_not_1) {
_builder.append("\t");
- StringConcatenation _genInitialization = this._stateMachineGen.genInitialization(xpac);
+ CharSequence _genInitialization = this._stateMachineGen.genInitialization(xpac);
_builder.append(_genInitialization, " ");
_builder.newLineIfNotEmpty();
}
@@ -712,8 +695,8 @@ public class ActorClassGen extends GenericActorClassGenerator { {
StateGraph _stateMachine_2 = xpac.getStateMachine();
boolean _isEmpty_2 = RoomHelpers.isEmpty(_stateMachine_2);
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isEmpty_2);
- if (_operator_not_2) {
+ boolean _not_2 = (!_isEmpty_2);
+ if (_not_2) {
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
@@ -736,13 +719,13 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.newLine();
{
- boolean _operator_or_1 = false;
+ boolean _or_1 = false;
if (dataDriven) {
- _operator_or_1 = true;
+ _or_1 = true;
} else {
- _operator_or_1 = BooleanExtensions.operator_or(dataDriven, async);
+ _or_1 = (dataDriven || async);
}
- if (_operator_or_1) {
+ if (_or_1) {
_builder.append("void ");
String _name_6 = ac.getName();
_builder.append(_name_6, "");
@@ -760,8 +743,8 @@ public class ActorClassGen extends GenericActorClassGenerator { {
StateGraph _stateMachine_3 = xpac.getStateMachine();
boolean _isEmpty_3 = RoomHelpers.isEmpty(_stateMachine_3);
- boolean _operator_not_3 = BooleanExtensions.operator_not(_isEmpty_3);
- if (_operator_not_3) {
+ boolean _not_3 = (!_isEmpty_3);
+ if (_not_3) {
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
@@ -785,7 +768,7 @@ public class ActorClassGen extends GenericActorClassGenerator { }
}
_builder.newLine();
- StringConcatenation _operationsImplementation = this._procedureHelpers.operationsImplementation(ac);
+ CharSequence _operationsImplementation = this._procedureHelpers.operationsImplementation(ac);
_builder.append(_operationsImplementation, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java index a6234c72c..ca33e2853 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java @@ -8,20 +8,18 @@ import org.eclipse.etrice.core.room.RoomClass; import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.generator.generic.AbstractTransitionChainGenerator;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.Pair;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class CExtensions implements ILanguageExtension {
@Inject
private AbstractTransitionChainGenerator chainGenerator;
public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
- String _generateTypedData = this.chainGenerator.generateTypedData(_data);
- return _generateTypedData;
+ return this.chainGenerator.generateTypedData(_data);
}
public String accessLevelPrivate() {
@@ -47,8 +45,8 @@ public class CExtensions implements ILanguageExtension { } else {
_xifexpression = "* self";
}
- String _operator_plus = StringExtensions.operator_plus(classname, _xifexpression);
- return _operator_plus;
+ String _plus = (classname + _xifexpression);
+ return _plus;
}
public String selfPointer(final boolean hasArgs) {
@@ -62,20 +60,18 @@ public class CExtensions implements ILanguageExtension { }
public String operationScope(final String classname, final boolean isDeclaration) {
- String _operator_plus = StringExtensions.operator_plus(classname, "_");
- return _operator_plus;
+ String _plus = (classname + "_");
+ return _plus;
}
public String memberInDeclaration(final String namespace, final String member) {
- String _operator_plus = StringExtensions.operator_plus(namespace, "_");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, member);
- return _operator_plus_1;
+ String _plus = (namespace + "_");
+ return (_plus + member);
}
public String memberInUse(final String namespace, final String member) {
- String _operator_plus = StringExtensions.operator_plus(namespace, "_");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, member);
- return _operator_plus_1;
+ String _plus = (namespace + "_");
+ return (_plus + member);
}
/**
@@ -83,29 +79,25 @@ public class CExtensions implements ILanguageExtension { */
public String getCHeaderFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".h");
- return _operator_plus;
+ return (_name + ".h");
}
public String getCSourceFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".c");
- return _operator_plus;
+ return (_name + ".c");
}
public String getInstSourceFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, "_Inst.h");
- return _operator_plus;
+ return (_name + "_Inst.h");
}
public String getDispSourceFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, "_Disp.h");
- return _operator_plus;
+ return (_name + "_Disp.h");
}
- public StringConcatenation getIncludeGuardString(final String filename) {
+ public CharSequence getIncludeGuardString(final String filename) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("_");
String _upperCase = filename.toUpperCase();
@@ -114,23 +106,23 @@ public class CExtensions implements ILanguageExtension { return _builder;
}
- public StringConcatenation generateIncludeGuardBegin(final String filename) {
+ public CharSequence generateIncludeGuardBegin(final String filename) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("#ifndef ");
- StringConcatenation _includeGuardString = this.getIncludeGuardString(filename);
+ CharSequence _includeGuardString = this.getIncludeGuardString(filename);
_builder.append(_includeGuardString, "");
_builder.newLineIfNotEmpty();
_builder.append("#define ");
- StringConcatenation _includeGuardString_1 = this.getIncludeGuardString(filename);
+ CharSequence _includeGuardString_1 = this.getIncludeGuardString(filename);
_builder.append(_includeGuardString_1, "");
_builder.newLineIfNotEmpty();
return _builder;
}
- public StringConcatenation generateIncludeGuardEnd(final String filename) {
+ public CharSequence generateIncludeGuardEnd(final String filename) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("#endif /* ");
- StringConcatenation _includeGuardString = this.getIncludeGuardString(filename);
+ CharSequence _includeGuardString = this.getIncludeGuardString(filename);
_builder.append(_includeGuardString, "");
_builder.append(" */");
_builder.newLineIfNotEmpty();
@@ -154,10 +146,10 @@ public class CExtensions implements ILanguageExtension { _builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Pair<String,String> entry : entries) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -203,19 +195,19 @@ public class CExtensions implements ILanguageExtension { public String arrayDeclaration(final String type, final int size, final String name, final boolean isRef) {
String _xifexpression = null;
if (isRef) {
- String _operator_plus = StringExtensions.operator_plus(type, "* ");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "[");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, ((Integer)size));
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "]");
- _xifexpression = _operator_plus_4;
+ String _plus = (type + "* ");
+ String _plus_1 = (_plus + name);
+ String _plus_2 = (_plus_1 + "[");
+ String _plus_3 = (_plus_2 + Integer.valueOf(size));
+ String _plus_4 = (_plus_3 + "]");
+ _xifexpression = _plus_4;
} else {
- String _operator_plus_5 = StringExtensions.operator_plus(type, " ");
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, name);
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, "[");
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, ((Integer)size));
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, "]");
- _xifexpression = _operator_plus_9;
+ String _plus_5 = (type + " ");
+ String _plus_6 = (_plus_5 + name);
+ String _plus_7 = (_plus_6 + "[");
+ String _plus_8 = (_plus_7 + Integer.valueOf(size));
+ String _plus_9 = (_plus_8 + "]");
+ _xifexpression = _plus_9;
}
return _xifexpression;
}
@@ -237,9 +229,9 @@ public class CExtensions implements ILanguageExtension { }
public String toCharArrayExpr(final String s) {
- String _operator_plus = StringExtensions.operator_plus("\"", s);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "\"");
- return _operator_plus_1;
+ String _plus = ("\"" + s);
+ String _plus_1 = (_plus + "\"");
+ return _plus_1;
}
public String superCall(final String baseClassName, final String method, final String args) {
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java index 7d603907d..61236fc9c 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.c.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.HashSet;
@@ -13,13 +14,11 @@ import org.eclipse.etrice.core.room.StandardOperation; import org.eclipse.etrice.generator.c.gen.CExtensions;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class DataClassGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -42,33 +41,32 @@ public class DataClassGen { {
String _generationTargetPath = this._roomExtensions.getGenerationTargetPath(dc);
String _path = this._roomExtensions.getPath(dc);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
+ String path = (_generationTargetPath + _path);
String _cHeaderFileName = this._cExtensions.getCHeaderFileName(dc);
- String _operator_plus_1 = StringExtensions.operator_plus("generating DataClass header \'", _cHeaderFileName);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String _plus = ("generating DataClass header \'" + _cHeaderFileName);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
String _cHeaderFileName_1 = this._cExtensions.getCHeaderFileName(dc);
- StringConcatenation _generateHeaderFile = this.generateHeaderFile(root, dc);
+ CharSequence _generateHeaderFile = this.generateHeaderFile(root, dc);
this.fileAccess.generateFile(_cHeaderFileName_1, _generateHeaderFile);
String _cSourceFileName = this._cExtensions.getCSourceFileName(dc);
- String _operator_plus_5 = StringExtensions.operator_plus("generating DataClass source \'", _cSourceFileName);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "\' in \'");
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, path);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "\'");
- this.logger.logInfo(_operator_plus_8);
+ String _plus_4 = ("generating DataClass source \'" + _cSourceFileName);
+ String _plus_5 = (_plus_4 + "\' in \'");
+ String _plus_6 = (_plus_5 + path);
+ String _plus_7 = (_plus_6 + "\'");
+ this.logger.logInfo(_plus_7);
this.fileAccess.setOutputPath(path);
String _cSourceFileName_1 = this._cExtensions.getCSourceFileName(dc);
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, dc);
+ CharSequence _generateSourceFile = this.generateSourceFile(root, dc);
this.fileAccess.generateFile(_cSourceFileName_1, _generateSourceFile);
}
}
}
- public StringConcatenation generateHeaderFile(final Root root, final DataClass dc) {
+ public CharSequence generateHeaderFile(final Root root, final DataClass dc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -91,7 +89,7 @@ public class DataClassGen { _builder.newLine();
_builder.newLine();
String _name_1 = dc.getName();
- StringConcatenation _generateIncludeGuardBegin = this._cExtensions.generateIncludeGuardBegin(_name_1);
+ CharSequence _generateIncludeGuardBegin = this._cExtensions.generateIncludeGuardBegin(_name_1);
_builder.append(_generateIncludeGuardBegin, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -109,7 +107,7 @@ public class DataClassGen { }
}
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(dc, 1);
+ CharSequence _userCode = this._procedureHelpers.userCode(dc, 1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
@@ -118,7 +116,7 @@ public class DataClassGen { _builder.newLine();
_builder.append("\t");
List<Attribute> _allAttributes = this._roomExtensions.getAllAttributes(dc);
- StringConcatenation _attributes = this._procedureHelpers.attributes(_allAttributes);
+ CharSequence _attributes = this._procedureHelpers.attributes(_allAttributes);
_builder.append(_attributes, " ");
_builder.newLineIfNotEmpty();
_builder.append("} ");
@@ -132,14 +130,14 @@ public class DataClassGen { for(final Attribute a : _allAttributes_1) {
{
String _defaultValueLiteral = a.getDefaultValueLiteral();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals) {
String _name_4 = dc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name_4, " ");
+ String _plus = (_name_4 + " ");
String _name_5 = a.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name_5);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ": Attribute initialization not supported in C");
- this.logger.logInfo(_operator_plus_2);
+ String _plus_1 = (_plus + _name_5);
+ String _plus_2 = (_plus_1 + ": Attribute initialization not supported in C");
+ this.logger.logInfo(_plus_2);
_builder.newLineIfNotEmpty();
}
}
@@ -149,7 +147,7 @@ public class DataClassGen { _builder.newLine();
EList<StandardOperation> _operations = dc.getOperations();
String _name_6 = dc.getName();
- StringConcatenation _operationsDeclaration = this._procedureHelpers.operationsDeclaration(_operations, _name_6);
+ CharSequence _operationsDeclaration = this._procedureHelpers.operationsDeclaration(_operations, _name_6);
_builder.append(_operationsDeclaration, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -167,19 +165,19 @@ public class DataClassGen { _builder.append("* target);");
_builder.newLineIfNotEmpty();
_builder.newLine();
- StringConcatenation _userCode_1 = this._procedureHelpers.userCode(dc, 2);
+ CharSequence _userCode_1 = this._procedureHelpers.userCode(dc, 2);
_builder.append(_userCode_1, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
String _name_10 = dc.getName();
- StringConcatenation _generateIncludeGuardEnd = this._cExtensions.generateIncludeGuardEnd(_name_10);
+ CharSequence _generateIncludeGuardEnd = this._cExtensions.generateIncludeGuardEnd(_name_10);
_builder.append(_generateIncludeGuardEnd, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
return _builder;
}
- public StringConcatenation generateSourceFile(final Root root, final DataClass dc) {
+ public CharSequence generateSourceFile(final Root root, final DataClass dc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -210,14 +208,14 @@ public class DataClassGen { _builder.append("#include <string.h>");
_builder.newLine();
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(dc, 3);
+ CharSequence _userCode = this._procedureHelpers.userCode(dc, 3);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
_builder.newLine();
EList<StandardOperation> _operations = dc.getOperations();
String _name_1 = dc.getName();
- StringConcatenation _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations, _name_1);
+ CharSequence _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations, _name_1);
_builder.append(_operationsImplementation, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.smap b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.smap new file mode 100644 index 000000000..b5624d6f5 --- /dev/null +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.smap @@ -0,0 +1,49 @@ +SMAP +DataClassGen.java +Xtend +*S Xtend +*F ++ 0 DataClassGen.xtend +src/org/eclipse/etrice/generator/c/gen/DataClassGen.xtend +*L +36:39,3 +37:42,3 +40:45,6 +41:51 +42:52,3 +45:55,6 +46:61 +47:62,3 +36:65,2 +52:70,11 +56:81,10 +60:91,8 +52:99 +65:100,3 +66:103,4 +52:107,2 +67:109 +69:110,8 +72:118,5 +73:123,5 +52:128 +75:129,2 +52:131 +76:132,3 +77:135,7 +52:142,4 +79:146,2 +83:148,9 +86:157,11 +88:168,4 +90:172,5 +52:177 +95:181,11 +99:192,11 +103:203,8 +107:211,5 +111:216,9 +114:225,12 +115:237,8 +95:245 +*E diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java index b1947492b..26daa4b46 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java @@ -14,10 +14,9 @@ import org.eclipse.etrice.generator.c.gen.SubSystemRunnerGen; import org.eclipse.etrice.generator.generic.PrepareFileSystem;
import org.eclipse.xtext.generator.IFileSystemAccess;
import org.eclipse.xtext.generator.IGenerator;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class MainGen implements IGenerator {
@Inject
private DataClassGen dataClassGen;
@@ -38,24 +37,24 @@ public class MainGen implements IGenerator { private PrepareFileSystem prepFS;
public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- this.prepFS.prepare(resource);
- EList<EObject> _contents = resource.getContents();
- for (final EObject e : _contents) {
- if ((e instanceof Root)) {
- this.doGenerate(((Root) e));
- }
+ this.prepFS.prepare(resource);
+ EList<EObject> _contents = resource.getContents();
+ for (final EObject e : _contents) {
+ if ((e instanceof Root)) {
+ this.doGenerate(((Root) e));
}
+ }
}
public void doGenerate(final Root e) {
- this.dataClassGen.doGenerate(e);
- this.protocolClassGen.doGenerate(e);
- this.actorClassGen.doGenerate(e);
- this.subsystemClassGen.doGenerate(e);
- boolean _isLibrary = e.isLibrary();
- boolean _operator_not = BooleanExtensions.operator_not(_isLibrary);
- if (_operator_not) {
- this.subsystemRunnerGen.doGenerate(e);
- }
+ this.dataClassGen.doGenerate(e);
+ this.protocolClassGen.doGenerate(e);
+ this.actorClassGen.doGenerate(e);
+ this.subsystemClassGen.doGenerate(e);
+ boolean _isLibrary = e.isLibrary();
+ boolean _not = (!_isLibrary);
+ if (_not) {
+ this.subsystemRunnerGen.doGenerate(e);
+ }
}
}
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java index e592ce836..91dcd5e39 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.c.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.HashSet;
@@ -25,16 +26,13 @@ import org.eclipse.etrice.generator.generic.GenericProtocolClassGenerator; import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -60,33 +58,32 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { {
String _generationTargetPath = this._roomExtensions.getGenerationTargetPath(pc);
String _path = this._roomExtensions.getPath(pc);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
+ String path = (_generationTargetPath + _path);
String _cHeaderFileName = this._cExtensions.getCHeaderFileName(pc);
- String _operator_plus_1 = StringExtensions.operator_plus("generating ProtocolClass header \'", _cHeaderFileName);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String _plus = ("generating ProtocolClass header \'" + _cHeaderFileName);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
String _cHeaderFileName_1 = this._cExtensions.getCHeaderFileName(pc);
- StringConcatenation _generateHeaderFile = this.generateHeaderFile(root, pc);
+ CharSequence _generateHeaderFile = this.generateHeaderFile(root, pc);
this.fileAccess.generateFile(_cHeaderFileName_1, _generateHeaderFile);
String _cSourceFileName = this._cExtensions.getCSourceFileName(pc);
- String _operator_plus_5 = StringExtensions.operator_plus("generating ProtocolClass source \'", _cSourceFileName);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "\' in \'");
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, path);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "\'");
- this.logger.logInfo(_operator_plus_8);
+ String _plus_4 = ("generating ProtocolClass source \'" + _cSourceFileName);
+ String _plus_5 = (_plus_4 + "\' in \'");
+ String _plus_6 = (_plus_5 + path);
+ String _plus_7 = (_plus_6 + "\'");
+ this.logger.logInfo(_plus_7);
this.fileAccess.setOutputPath(path);
String _cSourceFileName_1 = this._cExtensions.getCSourceFileName(pc);
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, pc);
+ CharSequence _generateSourceFile = this.generateSourceFile(root, pc);
this.fileAccess.generateFile(_cSourceFileName_1, _generateSourceFile);
}
}
}
- private StringConcatenation generateHeaderFile(final Root root, final ProtocolClass pc) {
+ private CharSequence generateHeaderFile(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -109,7 +106,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.newLine();
String _name_1 = pc.getName();
- StringConcatenation _generateIncludeGuardBegin = this._cExtensions.generateIncludeGuardBegin(_name_1);
+ CharSequence _generateIncludeGuardBegin = this._cExtensions.generateIncludeGuardBegin(_name_1);
_builder.append(_generateIncludeGuardBegin, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -118,7 +115,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("#include \"modelbase/etPort.h\"");
_builder.newLine();
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(pc, 1);
+ CharSequence _userCode = this._procedureHelpers.userCode(pc, 1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -135,8 +132,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
{
CommunicationType _commType = pc.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ if (_equals) {
_builder.newLine();
_builder.append("/* message IDs */");
_builder.newLine();
@@ -146,25 +143,25 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.append("/*--------------------- port structs and methods */");
_builder.newLine();
- StringConcatenation _portClassHeader = this.portClassHeader(pc, ((Boolean)false));
+ CharSequence _portClassHeader = this.portClassHeader(pc, Boolean.valueOf(false));
_builder.append(_portClassHeader, "");
_builder.newLineIfNotEmpty();
- StringConcatenation _portClassHeader_1 = this.portClassHeader(pc, ((Boolean)true));
+ CharSequence _portClassHeader_1 = this.portClassHeader(pc, Boolean.valueOf(true));
_builder.append(_portClassHeader_1, "");
_builder.newLineIfNotEmpty();
} else {
CommunicationType _commType_1 = pc.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, CommunicationType.DATA_DRIVEN);
- if (_operator_equals_1) {
+ boolean _equals_1 = Objects.equal(_commType_1, CommunicationType.DATA_DRIVEN);
+ if (_equals_1) {
_builder.append("/*--------------------- port structs and methods */");
_builder.newLine();
- StringConcatenation _genDataDrivenPortHeaders = this.genDataDrivenPortHeaders(pc);
+ CharSequence _genDataDrivenPortHeaders = this.genDataDrivenPortHeaders(pc);
_builder.append(_genDataDrivenPortHeaders, "");
_builder.newLineIfNotEmpty();
} else {
CommunicationType _commType_2 = pc.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, CommunicationType.SYNCHRONOUS);
- if (_operator_equals_2) {
+ boolean _equals_2 = Objects.equal(_commType_2, CommunicationType.SYNCHRONOUS);
+ if (_equals_2) {
_builder.append("#error \"synchronoue protocols not implemented yet\"");
_builder.newLine();
}
@@ -183,19 +180,19 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("_getMessageString(int msg_id);");
_builder.newLineIfNotEmpty();
_builder.newLine();
- StringConcatenation _userCode_1 = this._procedureHelpers.userCode(pc, 2);
+ CharSequence _userCode_1 = this._procedureHelpers.userCode(pc, 2);
_builder.append(_userCode_1, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
String _name_4 = pc.getName();
- StringConcatenation _generateIncludeGuardEnd = this._cExtensions.generateIncludeGuardEnd(_name_4);
+ CharSequence _generateIncludeGuardEnd = this._cExtensions.generateIncludeGuardEnd(_name_4);
_builder.append(_generateIncludeGuardEnd, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
return _builder;
}
- private StringConcatenation generateSourceFile(final Root root, final ProtocolClass pc) {
+ private CharSequence generateSourceFile(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -225,7 +222,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("#include \"debugging/etMSCLogger.h\"");
_builder.newLine();
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(pc, 3);
+ CharSequence _userCode = this._procedureHelpers.userCode(pc, 3);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -233,31 +230,31 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
{
CommunicationType _commType = pc.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- if (_operator_equals) {
- StringConcatenation _portClassSource = this.portClassSource(pc, ((Boolean)false));
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ if (_equals) {
+ CharSequence _portClassSource = this.portClassSource(pc, Boolean.valueOf(false));
_builder.append(_portClassSource, "");
_builder.newLineIfNotEmpty();
- StringConcatenation _portClassSource_1 = this.portClassSource(pc, ((Boolean)true));
+ CharSequence _portClassSource_1 = this.portClassSource(pc, Boolean.valueOf(true));
_builder.append(_portClassSource_1, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("/*--------------------- debug helpers */");
_builder.newLine();
- StringConcatenation _generateDebugHelpersImplementation = this.generateDebugHelpersImplementation(root, pc);
+ CharSequence _generateDebugHelpersImplementation = this.generateDebugHelpersImplementation(root, pc);
_builder.append(_generateDebugHelpersImplementation, "");
_builder.newLineIfNotEmpty();
} else {
CommunicationType _commType_1 = pc.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, CommunicationType.DATA_DRIVEN);
- if (_operator_equals_1) {
- StringConcatenation _genDataDrivenPortSources = this.genDataDrivenPortSources(pc);
+ boolean _equals_1 = Objects.equal(_commType_1, CommunicationType.DATA_DRIVEN);
+ if (_equals_1) {
+ CharSequence _genDataDrivenPortSources = this.genDataDrivenPortSources(pc);
_builder.append(_genDataDrivenPortSources, "");
_builder.newLineIfNotEmpty();
} else {
CommunicationType _commType_2 = pc.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, CommunicationType.SYNCHRONOUS);
- if (_operator_equals_2) {
+ boolean _equals_2 = Objects.equal(_commType_2, CommunicationType.SYNCHRONOUS);
+ if (_equals_2) {
_builder.append("#error \"synchronous protocols not implemented yet\"");
_builder.newLine();
}
@@ -267,15 +264,13 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _builder;
}
- private StringConcatenation portClassHeader(final ProtocolClass pc, final Boolean conj) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence portClassHeader(final ProtocolClass pc, final Boolean conj) {
+ CharSequence _xblockexpression = null;
{
- String _portClassName = this._roomExtensions.getPortClassName(pc, conj);
- String portClassName = _portClassName;
- String _portClassName_1 = this._roomExtensions.getPortClassName(pc, conj, true);
- String replPortClassName = _portClassName_1;
+ String portClassName = this._roomExtensions.getPortClassName(pc, (conj).booleanValue());
+ String replPortClassName = this._roomExtensions.getPortClassName(pc, (conj).booleanValue(), true);
List<Message> _xifexpression = null;
- if (conj) {
+ if ((conj).booleanValue()) {
List<Message> _allIncomingMessages = this._roomExtensions.getAllIncomingMessages(pc);
_xifexpression = _allIncomingMessages;
} else {
@@ -294,15 +289,15 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLineIfNotEmpty();
_builder.newLine();
{
- PortClass _portClass = this._roomExtensions.getPortClass(pc, conj);
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_portClass, null);
- if (_operator_notEquals) {
+ PortClass _portClass = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
+ boolean _notEquals = (!Objects.equal(_portClass, null));
+ if (_notEquals) {
{
- PortClass _portClass_1 = this._roomExtensions.getPortClass(pc, conj);
+ PortClass _portClass_1 = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
EList<Attribute> _attributes = _portClass_1.getAttributes();
boolean _isEmpty = _attributes.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append("/* variable part of PortClass (RAM) */");
_builder.newLine();
_builder.append("typedef struct ");
@@ -316,27 +311,27 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("_var {");
_builder.newLineIfNotEmpty();
_builder.append("\t");
- PortClass _portClass_2 = this._roomExtensions.getPortClass(pc, conj);
+ PortClass _portClass_2 = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
EList<Attribute> _attributes_1 = _portClass_2.getAttributes();
- StringConcatenation _attributes_2 = this._procedureHelpers.attributes(_attributes_1);
+ CharSequence _attributes_2 = this._procedureHelpers.attributes(_attributes_1);
_builder.append(_attributes_2, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("};");
_builder.newLine();
{
- PortClass _portClass_3 = this._roomExtensions.getPortClass(pc, conj);
+ PortClass _portClass_3 = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
EList<Attribute> _attributes_3 = _portClass_3.getAttributes();
for(final Attribute a : _attributes_3) {
{
String _defaultValueLiteral = a.getDefaultValueLiteral();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals_1) {
- String _operator_plus = StringExtensions.operator_plus(portClassName, " ");
+ boolean _notEquals_1 = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals_1) {
+ String _plus = (portClassName + " ");
String _name = a.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ": Attribute initialization not supported in C");
- this.logger.logInfo(_operator_plus_2);
+ String _plus_1 = (_plus + _name);
+ String _plus_2 = (_plus_1 + ": Attribute initialization not supported in C");
+ this.logger.logInfo(_plus_2);
_builder.newLineIfNotEmpty();
}
}
@@ -350,8 +345,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { {
for(final Message message : messages) {
VarDecl _data = message.getData();
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_data, null);
- boolean hasData = _operator_notEquals_2;
+ boolean hasData = (!Objects.equal(_data, null));
_builder.newLineIfNotEmpty();
String _xifexpression_1 = null;
if (hasData) {
@@ -366,26 +360,26 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { String typeName = _xifexpression_1;
_builder.newLineIfNotEmpty();
String _xifexpression_2 = null;
- boolean _operator_and = false;
+ boolean _and = false;
if (!hasData) {
- _operator_and = false;
+ _and = false;
} else {
- boolean _operator_or = false;
+ boolean _or = false;
VarDecl _data_2 = message.getData();
RefableType _refType_1 = _data_2.getRefType();
DataType _type_1 = _refType_1.getType();
- boolean _operator_not_1 = BooleanExtensions.operator_not((_type_1 instanceof PrimitiveType));
- if (_operator_not_1) {
- _operator_or = true;
+ boolean _not_1 = (!(_type_1 instanceof PrimitiveType));
+ if (_not_1) {
+ _or = true;
} else {
VarDecl _data_3 = message.getData();
RefableType _refType_2 = _data_3.getRefType();
boolean _isRef = _refType_2.isRef();
- _operator_or = BooleanExtensions.operator_or(_operator_not_1, _isRef);
+ _or = (_not_1 || _isRef);
}
- _operator_and = BooleanExtensions.operator_and(hasData, _operator_or);
+ _and = (hasData && _or);
}
- if (_operator_and) {
+ if (_and) {
_xifexpression_2 = "*";
} else {
_xifexpression_2 = "";
@@ -394,10 +388,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLineIfNotEmpty();
String _xifexpression_3 = null;
if (hasData) {
- String _operator_plus_3 = StringExtensions.operator_plus(", ", typeName);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, refp);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, " data");
- _xifexpression_3 = _operator_plus_5;
+ String _plus_3 = (", " + typeName);
+ String _plus_4 = (_plus_3 + refp);
+ String _plus_5 = (_plus_4 + " data");
+ _xifexpression_3 = _plus_5;
} else {
_xifexpression_3 = "";
}
@@ -414,8 +408,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append(";");
_builder.newLineIfNotEmpty();
String _name_3 = message.getName();
- String _operator_plus_6 = StringExtensions.operator_plus(", int idx", data);
- String _messageSignature_2 = this.messageSignature(replPortClassName, _name_3, "", _operator_plus_6);
+ String _plus_6 = (", int idx" + data);
+ String _messageSignature_2 = this.messageSignature(replPortClassName, _name_3, "", _plus_6);
_builder.append(_messageSignature_2, "");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -423,27 +417,27 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { }
_builder.newLine();
{
- PortClass _portClass_4 = this._roomExtensions.getPortClass(pc, conj);
- boolean _operator_notEquals_3 = ObjectExtensions.operator_notEquals(_portClass_4, null);
- if (_operator_notEquals_3) {
- PortClass _portClass_5 = this._roomExtensions.getPortClass(pc, conj);
+ PortClass _portClass_4 = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
+ boolean _notEquals_2 = (!Objects.equal(_portClass_4, null));
+ if (_notEquals_2) {
+ PortClass _portClass_5 = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
EList<PortOperation> _operations = _portClass_5.getOperations();
- StringConcatenation _operationsDeclaration = this._procedureHelpers.operationsDeclaration(_operations, portClassName);
+ CharSequence _operationsDeclaration = this._procedureHelpers.operationsDeclaration(_operations, portClassName);
_builder.append(_operationsDeclaration, "");
_builder.newLineIfNotEmpty();
- PortClass _portClass_6 = this._roomExtensions.getPortClass(pc, conj);
+ PortClass _portClass_6 = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
EList<PortOperation> _operations_1 = _portClass_6.getOperations();
- StringConcatenation _operationsDeclaration_1 = this._procedureHelpers.operationsDeclaration(_operations_1, replPortClassName);
+ CharSequence _operationsDeclaration_1 = this._procedureHelpers.operationsDeclaration(_operations_1, replPortClassName);
_builder.append(_operationsDeclaration_1, "");
_builder.newLineIfNotEmpty();
}
}
_builder.newLine();
{
- boolean _handlesReceive = this._roomExtensions.handlesReceive(pc, conj);
+ boolean _handlesReceive = this._roomExtensions.handlesReceive(pc, (conj).booleanValue());
if (_handlesReceive) {
{
- List<MessageHandler> _receiveHandlers = this._roomExtensions.getReceiveHandlers(pc, conj);
+ List<MessageHandler> _receiveHandlers = this._roomExtensions.getReceiveHandlers(pc, (conj).booleanValue());
for(final MessageHandler h : _receiveHandlers) {
_builder.append("void ");
_builder.append(portClassName, "");
@@ -470,19 +464,18 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- private StringConcatenation genDataDrivenPortHeaders(final ProtocolClass pc) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genDataDrivenPortHeaders(final ProtocolClass pc) {
+ CharSequence _xblockexpression = null;
{
List<Message> _allIncomingMessages = this._roomExtensions.getAllIncomingMessages(pc);
final Function1<Message,Boolean> _function = new Function1<Message,Boolean>() {
public Boolean apply(final Message m) {
VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- return ((Boolean)_operator_notEquals);
+ boolean _notEquals = (!Objects.equal(_data, null));
+ return Boolean.valueOf(_notEquals);
}
};
- Iterable<Message> _filter = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
- Iterable<Message> sentMsgs = _filter;
+ Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* data driven send port (conjugated) */");
_builder.newLine();
@@ -494,8 +487,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { VarDecl _data = msg.getData();
RefableType _refType = _data.getRefType();
DataType _type = _refType.getType();
- String _typeName = this._typeHelpers.typeName(_type);
- String typeName = _typeName;
+ String typeName = this._typeHelpers.typeName(_type);
_builder.newLineIfNotEmpty();
_builder.append("\t");
String _xifexpression = null;
@@ -546,33 +538,32 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { {
for(final Message message : sentMsgs) {
VarDecl _data_2 = message.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data_2, null);
- boolean hasData = _operator_notEquals;
+ boolean hasData = (!Objects.equal(_data_2, null));
_builder.newLineIfNotEmpty();
String _xifexpression_1 = null;
if (hasData) {
VarDecl _data_3 = message.getData();
RefableType _refType_2 = _data_3.getRefType();
DataType _type_1 = _refType_2.getType();
- String _typeName_1 = this._typeHelpers.typeName(_type_1);
- _xifexpression_1 = _typeName_1;
+ String _typeName = this._typeHelpers.typeName(_type_1);
+ _xifexpression_1 = _typeName;
} else {
_xifexpression_1 = "";
}
String typeName_1 = _xifexpression_1;
_builder.newLineIfNotEmpty();
String _xifexpression_2 = null;
- boolean _operator_and = false;
+ boolean _and = false;
if (!hasData) {
- _operator_and = false;
+ _and = false;
} else {
VarDecl _data_4 = message.getData();
RefableType _refType_3 = _data_4.getRefType();
DataType _type_2 = _refType_3.getType();
- boolean _operator_not = BooleanExtensions.operator_not((_type_2 instanceof PrimitiveType));
- _operator_and = BooleanExtensions.operator_and(hasData, _operator_not);
+ boolean _not = (!(_type_2 instanceof PrimitiveType));
+ _and = (hasData && _not);
}
- if (_operator_and) {
+ if (_and) {
_xifexpression_2 = "*";
} else {
_xifexpression_2 = "";
@@ -581,10 +572,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLineIfNotEmpty();
String _xifexpression_3 = null;
if (hasData) {
- String _operator_plus = StringExtensions.operator_plus(", ", typeName_1);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, refp_1);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, " data");
- _xifexpression_3 = _operator_plus_2;
+ String _plus = (", " + typeName_1);
+ String _plus_1 = (_plus + refp_1);
+ String _plus_2 = (_plus_1 + " data");
+ _xifexpression_3 = _plus_2;
} else {
_xifexpression_3 = "";
}
@@ -610,55 +601,41 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- private StringConcatenation genDataDrivenPortSources(final ProtocolClass pc) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genDataDrivenPortSources(final ProtocolClass pc) {
+ CharSequence _xblockexpression = null;
{
List<Message> _allIncomingMessages = this._roomExtensions.getAllIncomingMessages(pc);
final Function1<Message,Boolean> _function = new Function1<Message,Boolean>() {
public Boolean apply(final Message m) {
VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- return ((Boolean)_operator_notEquals);
+ boolean _notEquals = (!Objects.equal(_data, null));
+ return Boolean.valueOf(_notEquals);
}
};
- Iterable<Message> _filter = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
- Iterable<Message> messages = _filter;
+ Iterable<Message> messages = IterableExtensions.<Message>filter(_allIncomingMessages, _function);
StringConcatenation _builder = new StringConcatenation();
{
for(final Message message : messages) {
VarDecl _data = message.getData();
RefableType _refType = _data.getRefType();
DataType _type = _refType.getType();
- String _typeName = this._typeHelpers.typeName(_type);
- String typeName = _typeName;
+ String typeName = this._typeHelpers.typeName(_type);
_builder.newLineIfNotEmpty();
String _xifexpression = null;
VarDecl _data_1 = message.getData();
RefableType _refType_1 = _data_1.getRefType();
DataType _type_1 = _refType_1.getType();
- boolean _operator_not = BooleanExtensions.operator_not((_type_1 instanceof PrimitiveType));
- if (_operator_not) {
+ boolean _not = (!(_type_1 instanceof PrimitiveType));
+ if (_not) {
_xifexpression = "*";
} else {
_xifexpression = "";
}
String refp = _xifexpression;
_builder.newLineIfNotEmpty();
- String _xifexpression_1 = null;
- VarDecl _data_2 = message.getData();
- RefableType _refType_2 = _data_2.getRefType();
- DataType _type_2 = _refType_2.getType();
- if ((_type_2 instanceof PrimitiveType)) {
- _xifexpression_1 = "&";
- } else {
- _xifexpression_1 = "";
- }
- String refa = _xifexpression_1;
- _builder.newLineIfNotEmpty();
- String _operator_plus = StringExtensions.operator_plus(", ", typeName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, refp);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, " data");
- String data = _operator_plus_2;
+ String _plus = (", " + typeName);
+ String _plus_1 = (_plus + refp);
+ String data = (_plus_1 + " data");
_builder.newLineIfNotEmpty();
String _portClassName = this._roomExtensions.getPortClassName(pc, true);
String _name = message.getName();
@@ -696,15 +673,13 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- private StringConcatenation portClassSource(final ProtocolClass pc, final Boolean conj) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence portClassSource(final ProtocolClass pc, final Boolean conj) {
+ CharSequence _xblockexpression = null;
{
- String _portClassName = this._roomExtensions.getPortClassName(pc, conj);
- String portClassName = _portClassName;
- String _portClassName_1 = this._roomExtensions.getPortClassName(pc, conj, true);
- String replPortClassName = _portClassName_1;
+ String portClassName = this._roomExtensions.getPortClassName(pc, (conj).booleanValue());
+ String replPortClassName = this._roomExtensions.getPortClassName(pc, (conj).booleanValue(), true);
List<Message> _xifexpression = null;
- if (conj) {
+ if ((conj).booleanValue()) {
List<Message> _allIncomingMessages = this._roomExtensions.getAllIncomingMessages(pc);
_xifexpression = _allIncomingMessages;
} else {
@@ -713,7 +688,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { }
List<Message> messages = _xifexpression;
String _xifexpression_1 = null;
- if (conj) {
+ if ((conj).booleanValue()) {
_xifexpression_1 = "IN_";
} else {
_xifexpression_1 = "OUT_";
@@ -723,8 +698,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { {
for(final Message message : messages) {
VarDecl _data = message.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- boolean hasData = _operator_notEquals;
+ boolean hasData = (!Objects.equal(_data, null));
_builder.newLineIfNotEmpty();
String _xifexpression_2 = null;
if (hasData) {
@@ -739,16 +713,16 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { String typeName = _xifexpression_2;
_builder.newLineIfNotEmpty();
String _xifexpression_3 = null;
- boolean _operator_and = false;
+ boolean _and = false;
if (!hasData) {
- _operator_and = false;
+ _and = false;
} else {
VarDecl _data_2 = message.getData();
RefableType _refType_1 = _data_2.getRefType();
boolean _isRef = _refType_1.isRef();
- _operator_and = BooleanExtensions.operator_and(hasData, _isRef);
+ _and = (hasData && _isRef);
}
- if (_operator_and) {
+ if (_and) {
_xifexpression_3 = "*";
} else {
_xifexpression_3 = "";
@@ -756,26 +730,26 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { String refp = _xifexpression_3;
_builder.newLineIfNotEmpty();
String _xifexpression_4 = null;
- boolean _operator_and_1 = false;
+ boolean _and_1 = false;
if (!hasData) {
- _operator_and_1 = false;
+ _and_1 = false;
} else {
- boolean _operator_or = false;
+ boolean _or = false;
VarDecl _data_3 = message.getData();
RefableType _refType_2 = _data_3.getRefType();
DataType _type_1 = _refType_2.getType();
- boolean _operator_not = BooleanExtensions.operator_not((_type_1 instanceof PrimitiveType));
- if (_operator_not) {
- _operator_or = true;
+ boolean _not = (!(_type_1 instanceof PrimitiveType));
+ if (_not) {
+ _or = true;
} else {
VarDecl _data_4 = message.getData();
RefableType _refType_3 = _data_4.getRefType();
boolean _isRef_1 = _refType_3.isRef();
- _operator_or = BooleanExtensions.operator_or(_operator_not, _isRef_1);
+ _or = (_not || _isRef_1);
}
- _operator_and_1 = BooleanExtensions.operator_and(hasData, _operator_or);
+ _and_1 = (hasData && _or);
}
- if (_operator_and_1) {
+ if (_and_1) {
_xifexpression_4 = "*";
} else {
_xifexpression_4 = "";
@@ -783,27 +757,27 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { String refpd = _xifexpression_4;
_builder.newLineIfNotEmpty();
String _xifexpression_5 = null;
- boolean _operator_and_2 = false;
- boolean _operator_and_3 = false;
+ boolean _and_2 = false;
+ boolean _and_3 = false;
if (!hasData) {
- _operator_and_3 = false;
+ _and_3 = false;
} else {
VarDecl _data_5 = message.getData();
RefableType _refType_4 = _data_5.getRefType();
DataType _type_2 = _refType_4.getType();
- boolean _operator_not_1 = BooleanExtensions.operator_not((_type_2 instanceof PrimitiveType));
- _operator_and_3 = BooleanExtensions.operator_and(hasData, _operator_not_1);
+ boolean _not_1 = (!(_type_2 instanceof PrimitiveType));
+ _and_3 = (hasData && _not_1);
}
- if (!_operator_and_3) {
- _operator_and_2 = false;
+ if (!_and_3) {
+ _and_2 = false;
} else {
VarDecl _data_6 = message.getData();
RefableType _refType_5 = _data_6.getRefType();
boolean _isRef_2 = _refType_5.isRef();
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isRef_2);
- _operator_and_2 = BooleanExtensions.operator_and(_operator_and_3, _operator_not_2);
+ boolean _not_2 = (!_isRef_2);
+ _and_2 = (_and_3 && _not_2);
}
- if (_operator_and_2) {
+ if (_and_2) {
_xifexpression_5 = "";
} else {
_xifexpression_5 = "&";
@@ -812,10 +786,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLineIfNotEmpty();
String _xifexpression_6 = null;
if (hasData) {
- String _operator_plus = StringExtensions.operator_plus(", ", typeName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, refpd);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, " data");
- _xifexpression_6 = _operator_plus_2;
+ String _plus = (", " + typeName);
+ String _plus_1 = (_plus + refpd);
+ String _plus_2 = (_plus_1 + " data");
+ _xifexpression_6 = _plus_2;
} else {
_xifexpression_6 = "";
}
@@ -829,8 +803,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { }
String dataCall = _xifexpression_7;
_builder.newLineIfNotEmpty();
- MessageHandler _sendHandler = this._roomExtensions.getSendHandler(message, conj);
- MessageHandler hdlr = _sendHandler;
+ MessageHandler hdlr = this._roomExtensions.getSendHandler(message, (conj).booleanValue());
_builder.newLineIfNotEmpty();
_builder.newLine();
String _name = message.getName();
@@ -839,8 +812,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(hdlr, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals = (!Objects.equal(hdlr, null));
+ if (_notEquals) {
_builder.append("\t");
{
DetailCode _detailCode = hdlr.getDetailCode();
@@ -864,11 +837,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
String _name_2 = pc.getName();
String _name_3 = message.getName();
- String _operator_plus_3 = StringExtensions.operator_plus(dir, _name_3);
- String _memberInUse = this._cExtensions.memberInUse(_name_2, _operator_plus_3);
- String _operator_plus_4 = StringExtensions.operator_plus(typeName, refp);
- String _operator_plus_5 = StringExtensions.operator_plus(refa, "data");
- String _sendMessageCall = this.sendMessageCall(hasData, "self", _memberInUse, _operator_plus_4, _operator_plus_5);
+ String _plus_3 = (dir + _name_3);
+ String _memberInUse = this._cExtensions.memberInUse(_name_2, _plus_3);
+ String _plus_4 = (typeName + refp);
+ String _plus_5 = (refa + "data");
+ String _sendMessageCall = this.sendMessageCall(hasData, "self", _memberInUse, _plus_4, _plus_5);
_builder.append(_sendMessageCall, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -885,8 +858,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(hdlr, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_1 = (!Objects.equal(hdlr, null));
+ if (_notEquals_1) {
_builder.append("\t");
_builder.append("int i;");
_builder.newLine();
@@ -925,11 +898,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
String _name_7 = pc.getName();
String _name_8 = message.getName();
- String _operator_plus_6 = StringExtensions.operator_plus(dir, _name_8);
- String _memberInUse_1 = this._cExtensions.memberInUse(_name_7, _operator_plus_6);
- String _operator_plus_7 = StringExtensions.operator_plus(typeName, refp);
- String _operator_plus_8 = StringExtensions.operator_plus(refa, "data");
- String _sendMessageCall_1 = this.sendMessageCall(hasData, "((etPort*)&((etReplPort*)self)->ports[i])", _memberInUse_1, _operator_plus_7, _operator_plus_8);
+ String _plus_6 = (dir + _name_8);
+ String _memberInUse_1 = this._cExtensions.memberInUse(_name_7, _plus_6);
+ String _plus_7 = (typeName + refp);
+ String _plus_8 = (refa + "data");
+ String _sendMessageCall_1 = this.sendMessageCall(hasData, "((etPort*)&((etReplPort*)self)->ports[i])", _memberInUse_1, _plus_7, _plus_8);
_builder.append(_sendMessageCall_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -944,14 +917,14 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.newLine();
String _name_9 = message.getName();
- String _operator_plus_9 = StringExtensions.operator_plus(", int idx", data);
- String _messageSignature_2 = this.messageSignature(replPortClassName, _name_9, "", _operator_plus_9);
+ String _plus_9 = (", int idx" + data);
+ String _messageSignature_2 = this.messageSignature(replPortClassName, _name_9, "", _plus_9);
_builder.append(_messageSignature_2, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals_3 = ObjectExtensions.operator_notEquals(hdlr, null);
- if (_operator_notEquals_3) {
+ boolean _notEquals_2 = (!Objects.equal(hdlr, null));
+ if (_notEquals_2) {
_builder.append("\t");
_builder.append(portClassName, " ");
_builder.append("_");
@@ -977,11 +950,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
String _name_12 = pc.getName();
String _name_13 = message.getName();
- String _operator_plus_10 = StringExtensions.operator_plus(dir, _name_13);
- String _memberInUse_2 = this._cExtensions.memberInUse(_name_12, _operator_plus_10);
- String _operator_plus_11 = StringExtensions.operator_plus(typeName, refp);
- String _operator_plus_12 = StringExtensions.operator_plus(refa, "data");
- String _sendMessageCall_2 = this.sendMessageCall(hasData, "((etPort*)&((etReplPort*)self)->ports[idx])", _memberInUse_2, _operator_plus_11, _operator_plus_12);
+ String _plus_10 = (dir + _name_13);
+ String _memberInUse_2 = this._cExtensions.memberInUse(_name_12, _plus_10);
+ String _plus_11 = (typeName + refp);
+ String _plus_12 = (refa + "data");
+ String _sendMessageCall_2 = this.sendMessageCall(hasData, "((etPort*)&((etReplPort*)self)->ports[idx])", _memberInUse_2, _plus_11, _plus_12);
_builder.append(_sendMessageCall_2, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -998,17 +971,17 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { }
_builder.newLine();
{
- PortClass _portClass = this._roomExtensions.getPortClass(pc, conj);
- boolean _operator_notEquals_4 = ObjectExtensions.operator_notEquals(_portClass, null);
- if (_operator_notEquals_4) {
- PortClass _portClass_1 = this._roomExtensions.getPortClass(pc, conj);
+ PortClass _portClass = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
+ boolean _notEquals_3 = (!Objects.equal(_portClass, null));
+ if (_notEquals_3) {
+ PortClass _portClass_1 = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
EList<PortOperation> _operations = _portClass_1.getOperations();
- StringConcatenation _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations, portClassName);
+ CharSequence _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations, portClassName);
_builder.append(_operationsImplementation, "");
_builder.newLineIfNotEmpty();
- PortClass _portClass_2 = this._roomExtensions.getPortClass(pc, conj);
+ PortClass _portClass_2 = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
EList<PortOperation> _operations_1 = _portClass_2.getOperations();
- StringConcatenation _operationsImplementation_1 = this._procedureHelpers.operationsImplementation(_operations_1, replPortClassName);
+ CharSequence _operationsImplementation_1 = this._procedureHelpers.operationsImplementation(_operations_1, replPortClassName);
_builder.append(_operationsImplementation_1, "");
_builder.newLineIfNotEmpty();
}
@@ -1029,9 +1002,9 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.newLine();
{
- boolean _handlesReceive = this._roomExtensions.handlesReceive(pc, conj);
+ boolean _handlesReceive = this._roomExtensions.handlesReceive(pc, (conj).booleanValue());
if (_handlesReceive) {
- StringConcatenation _genReceiveHandlers = this.genReceiveHandlers(pc, conj);
+ CharSequence _genReceiveHandlers = this.genReceiveHandlers(pc, conj);
_builder.append(_genReceiveHandlers, "");
_builder.newLineIfNotEmpty();
}
@@ -1045,93 +1018,70 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { private String sendMessageCall(final boolean hasData, final String self, final String msg, final String typeName, final String data) {
String _xifexpression = null;
if (hasData) {
- String _operator_plus = StringExtensions.operator_plus("etPort_sendMessage(", self);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, ", ");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, msg);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, ", sizeof(");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, typeName);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, "), ");
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, data);
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, ");");
- _xifexpression = _operator_plus_7;
+ String _plus = ("etPort_sendMessage(" + self);
+ String _plus_1 = (_plus + ", ");
+ String _plus_2 = (_plus_1 + msg);
+ String _plus_3 = (_plus_2 + ", sizeof(");
+ String _plus_4 = (_plus_3 + typeName);
+ String _plus_5 = (_plus_4 + "), ");
+ String _plus_6 = (_plus_5 + data);
+ String _plus_7 = (_plus_6 + ");");
+ _xifexpression = _plus_7;
} else {
- String _operator_plus_8 = StringExtensions.operator_plus("etPort_sendMessage(", self);
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, ", ");
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_9, msg);
- String _operator_plus_11 = StringExtensions.operator_plus(_operator_plus_10, ", 0, NULL);");
- _xifexpression = _operator_plus_11;
+ String _plus_8 = ("etPort_sendMessage(" + self);
+ String _plus_9 = (_plus_8 + ", ");
+ String _plus_10 = (_plus_9 + msg);
+ String _plus_11 = (_plus_10 + ", 0, NULL);");
+ _xifexpression = _plus_11;
}
return _xifexpression;
}
private String messageSignature(final String className, final String messageName, final String methodSuffix, final String data) {
- String _operator_plus = StringExtensions.operator_plus("void ", className);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "_");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, messageName);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, methodSuffix);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "(const ");
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, className);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "* self");
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, data);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, ")");
- return _operator_plus_8;
+ String _plus = ("void " + className);
+ String _plus_1 = (_plus + "_");
+ String _plus_2 = (_plus_1 + messageName);
+ String _plus_3 = (_plus_2 + methodSuffix);
+ String _plus_4 = (_plus_3 + "(const ");
+ String _plus_5 = (_plus_4 + className);
+ String _plus_6 = (_plus_5 + "* self");
+ String _plus_7 = (_plus_6 + data);
+ String _plus_8 = (_plus_7 + ")");
+ return _plus_8;
}
private String messageSetterSignature(final String className, final String messageName, final String data) {
- String _operator_plus = StringExtensions.operator_plus("void ", className);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "_");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, messageName);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "_set(");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, className);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, "* self");
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, data);
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, ")");
- return _operator_plus_7;
+ String _plus = ("void " + className);
+ String _plus_1 = (_plus + "_");
+ String _plus_2 = (_plus_1 + messageName);
+ String _plus_3 = (_plus_2 + "_set(");
+ String _plus_4 = (_plus_3 + className);
+ String _plus_5 = (_plus_4 + "* self");
+ String _plus_6 = (_plus_5 + data);
+ String _plus_7 = (_plus_6 + ")");
+ return _plus_7;
}
private String messageGetterSignature(final String className, final String messageName, final String type) {
- String _operator_plus = StringExtensions.operator_plus(type, " ");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, className);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, messageName);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "_get(const ");
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, className);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "* const self)");
- return _operator_plus_6;
- }
-
- private StringConcatenation messageCall(final Message m) {
- StringConcatenation _builder = new StringConcatenation();
- String _name = m.getName();
- _builder.append(_name, "");
- _builder.append("(");
- {
- VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- if (_operator_notEquals) {
- _builder.append(" ");
- VarDecl _data_1 = m.getData();
- String _name_1 = _data_1.getName();
- _builder.append(_name_1, "");
- }
- }
- _builder.append(")");
- _builder.newLineIfNotEmpty();
- return _builder;
+ String _plus = (type + " ");
+ String _plus_1 = (_plus + className);
+ String _plus_2 = (_plus_1 + "_");
+ String _plus_3 = (_plus_2 + messageName);
+ String _plus_4 = (_plus_3 + "_get(const ");
+ String _plus_5 = (_plus_4 + className);
+ String _plus_6 = (_plus_5 + "* const self)");
+ return _plus_6;
}
- private StringConcatenation genReceiveHandlers(final ProtocolClass pc, final Boolean conj) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genReceiveHandlers(final ProtocolClass pc, final Boolean conj) {
+ CharSequence _xblockexpression = null;
{
- String _portClassName = this._roomExtensions.getPortClassName(pc, conj);
- String portClassName = _portClassName;
- String _portClassName_1 = this._roomExtensions.getPortClassName(pc, conj, true);
- String replPortClassName = _portClassName_1;
+ String portClassName = this._roomExtensions.getPortClassName(pc, (conj).booleanValue());
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* receiver handlers */");
_builder.newLine();
{
- List<MessageHandler> _receiveHandlers = this._roomExtensions.getReceiveHandlers(pc, conj);
+ List<MessageHandler> _receiveHandlers = this._roomExtensions.getReceiveHandlers(pc, (conj).booleanValue());
for(final MessageHandler h : _receiveHandlers) {
_builder.append("void ");
_builder.append(portClassName, "");
@@ -1145,7 +1095,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLineIfNotEmpty();
_builder.append("\t");
DetailCode _detailCode = h.getDetailCode();
- StringConcatenation _userCode = this._procedureHelpers.userCode(_detailCode);
+ CharSequence _userCode = this._procedureHelpers.userCode(_detailCode);
_builder.append(_userCode, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1163,7 +1113,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- private StringConcatenation generateDebugHelpersImplementation(final Root root, final ProtocolClass pc) {
+ private CharSequence generateDebugHelpersImplementation(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
_builder.append("/* message names as strings for debugging (generate MSC) */");
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.smap b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.smap new file mode 100644 index 000000000..0408611b4 --- /dev/null +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.smap @@ -0,0 +1,243 @@ +SMAP +ProtocolClassGen.java +Xtend +*S Xtend +*F ++ 0 ProtocolClassGen.xtend +src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend +*L +42:56,3 +43:59,3 +45:62,6 +46:68 +47:69,3 +49:72,6 +50:78 +51:79,3 +42:82,2 +56:87,11 +60:98,10 +64:108,10 +69:118,4 +56:122 +71:123,3 +72:126,4 +56:130,2 +73:132 +56:133 +75:134,6 +78:140,6 +81:146,3 +82:149,3 +56:152 +83:153,5 +85:158,3 +56:161 +86:162,5 +56:167,4 +88:171,7 +95:178,5 +97:183,4 +99:187,5 +56:192 +104:196,11 +108:207,11 +112:218,7 +115:225,6 +104:231 +118:232,3 +119:235,3 +120:238,6 +123:244,3 +104:247 +124:248,3 +125:251,3 +104:254 +126:255,5 +104:260,5 +132:268,2 +133:270 +134:271 +135:272,9 +132:281 +137:282 +138:283,4 +139:287,4 +132:291 +141:292,3 +132:295 +142:296,8 +144:304,6 +145:310,4 +146:314,8 +132:322 +148:323,3 +132:326 +149:327,3 +150:330,6 +132:336,8 +154:344 +132:345 +156:346 +157:347,3 +158:350,12 +159:362,27 +160:389,11 +161:400,5 +162:405,5 +163:410,6 +132:416,2 +164:418 +132:419 +166:420,3 +167:423,5 +168:428,5 +132:433,2 +169:435 +132:436 +171:437,2 +132:439 +172:440,3 +173:443,9 +132:452,4 +175:456 +176:457,5 +137:462 +132:463,2 +182:468,2 +183:470,9 +182:479 +185:480,4 +182:484 +188:485,2 +189:487,6 +190:493,12 +191:505,7 +182:512,2 +192:514,2 +194:516,11 +198:527,6 +200:533,5 +182:538 +202:539 +203:540,3 +204:543,12 +205:555,18 +206:573,11 +207:584,6 +208:590,7 +182:597,2 +185:599 +182:600,2 +213:605,2 +214:607,9 +213:616,2 +216:618 +217:619,5 +218:624,12 +219:636,4 +220:640,8 +221:648,6 +223:654,8 +224:662,7 +213:669,2 +215:671 +213:672,2 +231:677,2 +232:679 +233:680 +234:681,9 +235:690,7 +231:697,2 +238:699 +239:700,3 +240:703,12 +241:715,17 +242:732,27 +243:759,28 +244:787,11 +245:798,8 +246:806,3 +248:809,5 +231:814 +249:815,3 +231:818 +250:819,6 +231:825,3 +252:828,2 +253:830,8 +254:838,12 +231:850,2 +256:852,3 +259:855,5 +231:860 +260:861,10 +263:871,11 +231:882 +265:883,5 +267:888,11 +269:899,15 +231:914,2 +272:916,3 +275:919,6 +231:925 +276:926,3 +277:929,8 +231:937 +278:938,2 +279:940,11 +281:951,15 +231:966,2 +284:968,2 +231:970,2 +286:972 +231:973 +288:974,3 +289:977,5 +290:982,5 +231:987,2 +291:989,4 +294:993,11 +231:1004 +298:1005,2 +299:1007,3 +231:1010,2 +300:1012 +237:1013 +231:1014,2 +306:1019,2 +307:1021,8 +306:1029,2 +309:1031,4 +306:1035,2 +305:1037 +313:1041,9 +312:1050 +317:1054,8 +316:1062 +321:1066,7 +320:1073 +336:1077,2 +337:1079 +336:1080 +339:1081,2 +336:1083 +341:1084,3 +342:1087,10 +343:1097,12 +336:1109,2 +339:1111 +336:1112,2 +352:1117,5 +356:1122,3 +352:1125 +356:1126,6 +352:1132,3 +356:1135,6 +352:1141,2 +356:1143,4 +358:1147,6 +359:1153,21 +364:1174,9 +352:1183 +*E diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java index 45f8bedda..de6d18f93 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java @@ -8,27 +8,24 @@ import org.eclipse.etrice.core.room.ActorClass; import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator;
import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
+import org.eclipse.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class StateMachineGen extends GenericStateMachineGenerator {
@Inject
private RoomExtensions _roomExtensions;
- public StringConcatenation genHeaderConstants(final ExpandedActorClass xpac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence genHeaderConstants(final ExpandedActorClass xpac) {
+ CharSequence _xblockexpression = null;
{
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
+ final ActorClass ac = xpac.getActorClass();
List<State> _allBaseStates = this._roomExtensions.getAllBaseStates(ac);
int _size = _allBaseStates.size();
List<State> _allLeafStates = this._roomExtensions.getAllLeafStates(ac);
int _size_1 = _allLeafStates.size();
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)_size), ((Integer)_size_1));
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_operator_minus), ((Integer)2));
- final int historySize = _operator_plus;
+ int _minus = (_size - _size_1);
+ final int historySize = (_minus + 2);
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* constant for state machine data */");
_builder.newLine();
@@ -44,11 +41,10 @@ public class StateMachineGen extends GenericStateMachineGenerator { return _xblockexpression;
}
- public StringConcatenation genDataMembers(final ExpandedActorClass xpac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence genDataMembers(final ExpandedActorClass xpac) {
+ CharSequence _xblockexpression = null;
{
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
+ final ActorClass ac = xpac.getActorClass();
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* state machine variables */");
_builder.newLine();
@@ -65,11 +61,10 @@ public class StateMachineGen extends GenericStateMachineGenerator { return _xblockexpression;
}
- public StringConcatenation genInitialization(final ExpandedActorClass xpac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence genInitialization(final ExpandedActorClass xpac) {
+ CharSequence _xblockexpression = null;
{
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
+ final ActorClass ac = xpac.getActorClass();
StringConcatenation _builder = new StringConcatenation();
_builder.append("self->state = STATE_TOP;");
_builder.newLine();
@@ -97,11 +92,10 @@ public class StateMachineGen extends GenericStateMachineGenerator { return _xblockexpression;
}
- public StringConcatenation genExtra(final ExpandedActorClass xpac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence genExtra(final ExpandedActorClass xpac) {
+ CharSequence _xblockexpression = null;
{
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
+ final ActorClass ac = xpac.getActorClass();
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
String _accessLevelPrivate = this.langExt.accessLevelPrivate();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java index 260c15e3a..ddf22e279 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java @@ -1,5 +1,7 @@ package org.eclipse.etrice.generator.c.gen;
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.ArrayList;
@@ -35,20 +37,14 @@ import org.eclipse.etrice.generator.generic.ILanguageExtension; import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.CollectionExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class SubSystemClassGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -79,61 +75,59 @@ public class SubSystemClassGen { String _generationTargetPath = this.roomExt.getGenerationTargetPath(_subSystemClass);
SubSystemClass _subSystemClass_1 = ssi.getSubSystemClass();
String _path = this.roomExt.getPath(_subSystemClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
+ String path = (_generationTargetPath + _path);
SubSystemClass _subSystemClass_2 = ssi.getSubSystemClass();
- String _cHeaderFileName = this.stdExt.getCHeaderFileName(_subSystemClass_2);
- String file = _cHeaderFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating SubSystemClass declaration: \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String file = this.stdExt.getCHeaderFileName(_subSystemClass_2);
+ String _plus = ("generating SubSystemClass declaration: \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_3 = ssi.getSubSystemClass();
- StringConcatenation _generateHeaderFile = this.generateHeaderFile(root, ssi, _subSystemClass_3);
+ CharSequence _generateHeaderFile = this.generateHeaderFile(root, ssi, _subSystemClass_3);
this.fileAccess.generateFile(file, _generateHeaderFile);
SubSystemClass _subSystemClass_4 = ssi.getSubSystemClass();
String _cSourceFileName = this.stdExt.getCSourceFileName(_subSystemClass_4);
file = _cSourceFileName;
- String _operator_plus_5 = StringExtensions.operator_plus("generating SubSystemClass implementation: \'", file);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "\' in \'");
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, path);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "\'");
- this.logger.logInfo(_operator_plus_8);
+ String _plus_4 = ("generating SubSystemClass implementation: \'" + file);
+ String _plus_5 = (_plus_4 + "\' in \'");
+ String _plus_6 = (_plus_5 + path);
+ String _plus_7 = (_plus_6 + "\'");
+ this.logger.logInfo(_plus_7);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_5 = ssi.getSubSystemClass();
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, ssi, _subSystemClass_5);
+ CharSequence _generateSourceFile = this.generateSourceFile(root, ssi, _subSystemClass_5);
this.fileAccess.generateFile(file, _generateSourceFile);
SubSystemClass _subSystemClass_6 = ssi.getSubSystemClass();
String _instSourceFileName = this.stdExt.getInstSourceFileName(_subSystemClass_6);
file = _instSourceFileName;
- String _operator_plus_9 = StringExtensions.operator_plus("generating SubSystemClass instance file: \'", file);
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_9, "\' in \'");
- String _operator_plus_11 = StringExtensions.operator_plus(_operator_plus_10, path);
- String _operator_plus_12 = StringExtensions.operator_plus(_operator_plus_11, "\'");
- this.logger.logInfo(_operator_plus_12);
+ String _plus_8 = ("generating SubSystemClass instance file: \'" + file);
+ String _plus_9 = (_plus_8 + "\' in \'");
+ String _plus_10 = (_plus_9 + path);
+ String _plus_11 = (_plus_10 + "\'");
+ this.logger.logInfo(_plus_11);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_7 = ssi.getSubSystemClass();
- StringConcatenation _generateInstanceFile = this.generateInstanceFile(root, ssi, _subSystemClass_7);
+ CharSequence _generateInstanceFile = this.generateInstanceFile(root, ssi, _subSystemClass_7);
this.fileAccess.generateFile(file, _generateInstanceFile);
SubSystemClass _subSystemClass_8 = ssi.getSubSystemClass();
String _dispSourceFileName = this.stdExt.getDispSourceFileName(_subSystemClass_8);
file = _dispSourceFileName;
- String _operator_plus_13 = StringExtensions.operator_plus("generating SubSystemClass dispatcher file: \'", file);
- String _operator_plus_14 = StringExtensions.operator_plus(_operator_plus_13, "\' in \'");
- String _operator_plus_15 = StringExtensions.operator_plus(_operator_plus_14, path);
- String _operator_plus_16 = StringExtensions.operator_plus(_operator_plus_15, "\'");
- this.logger.logInfo(_operator_plus_16);
+ String _plus_12 = ("generating SubSystemClass dispatcher file: \'" + file);
+ String _plus_13 = (_plus_12 + "\' in \'");
+ String _plus_14 = (_plus_13 + path);
+ String _plus_15 = (_plus_14 + "\'");
+ this.logger.logInfo(_plus_15);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_9 = ssi.getSubSystemClass();
- StringConcatenation _generateDispatcherFile = this.generateDispatcherFile(root, ssi, _subSystemClass_9);
+ CharSequence _generateDispatcherFile = this.generateDispatcherFile(root, ssi, _subSystemClass_9);
this.fileAccess.generateFile(file, _generateDispatcherFile);
}
}
}
- private StringConcatenation generateHeaderFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ private CharSequence generateHeaderFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -156,12 +150,12 @@ public class SubSystemClassGen { _builder.newLine();
_builder.newLine();
String _name_1 = ssc.getName();
- StringConcatenation _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
+ CharSequence _generateIncludeGuardBegin = this.stdExt.generateIncludeGuardBegin(_name_1);
_builder.append(_generateIncludeGuardBegin, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
DetailCode _userCode1 = ssc.getUserCode1();
- StringConcatenation _userCode = this.helpers.userCode(_userCode1);
+ CharSequence _userCode = this.helpers.userCode(_userCode1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -210,12 +204,12 @@ public class SubSystemClassGen { _builder.newLineIfNotEmpty();
_builder.newLine();
DetailCode _userCode2 = ssc.getUserCode2();
- StringConcatenation _userCode_1 = this.helpers.userCode(_userCode2);
+ CharSequence _userCode_1 = this.helpers.userCode(_userCode2);
_builder.append(_userCode_1, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
String _name_8 = ssc.getName();
- StringConcatenation _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_8);
+ CharSequence _generateIncludeGuardEnd = this.stdExt.generateIncludeGuardEnd(_name_8);
_builder.append(_generateIncludeGuardEnd, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -223,7 +217,7 @@ public class SubSystemClassGen { return _builder;
}
- private StringConcatenation generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ private CharSequence generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -275,7 +269,7 @@ public class SubSystemClassGen { _builder.newLine();
_builder.newLine();
DetailCode _userCode3 = ssc.getUserCode3();
- StringConcatenation _userCode = this.helpers.userCode(_userCode3);
+ CharSequence _userCode = this.helpers.userCode(_userCode3);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -420,7 +414,7 @@ public class SubSystemClassGen { _builder.append("etMessageService_execute(&msgService_Thread1);");
_builder.newLine();
_builder.append("\t\t\t\t");
- StringConcatenation _generateDatadrivenExecutes = this.generateDatadrivenExecutes(root, ssi);
+ CharSequence _generateDatadrivenExecutes = this.generateDatadrivenExecutes(root, ssi);
_builder.append(_generateDatadrivenExecutes, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
@@ -448,7 +442,7 @@ public class SubSystemClassGen { _builder.append("etMessageService_execute(&msgService_Thread1);");
_builder.newLine();
_builder.append("\t\t\t\t");
- StringConcatenation _generateDatadrivenExecutes_1 = this.generateDatadrivenExecutes(root, ssi);
+ CharSequence _generateDatadrivenExecutes_1 = this.generateDatadrivenExecutes(root, ssi);
_builder.append(_generateDatadrivenExecutes_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t\t");
@@ -516,7 +510,7 @@ public class SubSystemClassGen { _builder.newLineIfNotEmpty();
{
EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();
- Iterable<ActorInstance> _reverseView = ListExtensions.<ActorInstance>reverseView(_allContainedInstances);
+ List<ActorInstance> _reverseView = ListExtensions.<ActorInstance>reverseView(_allContainedInstances);
for(final ActorInstance ai : _reverseView) {
{
ActorClass _actorClass = ai.getActorClass();
@@ -524,13 +518,13 @@ public class SubSystemClassGen { final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isDestructor = op.isDestructor();
- return ((Boolean)_isDestructor);
+ return Boolean.valueOf(_isDestructor);
}
};
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
boolean _isEmpty = IterableExtensions.isEmpty(_filter);
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append("\t");
ActorClass _actorClass_1 = ai.getActorClass();
String _name_22 = _actorClass_1.getName();
@@ -598,13 +592,13 @@ public class SubSystemClassGen { final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isConstructor = RoomHelpers.isConstructor(op);
- return ((Boolean)_isConstructor);
+ return Boolean.valueOf(_isConstructor);
}
};
Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
boolean _isEmpty_1 = IterableExtensions.isEmpty(_filter_1);
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not_1) {
+ boolean _not_1 = (!_isEmpty_1);
+ if (_not_1) {
_builder.append("\t");
ActorClass _actorClass_3 = ai_1.getActorClass();
String _name_28 = _actorClass_3.getName();
@@ -661,7 +655,7 @@ public class SubSystemClassGen { return _builder;
}
- private StringConcatenation generateInstanceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ private CharSequence generateInstanceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -769,16 +763,16 @@ public class SubSystemClassGen { ProtocolClass _protocol = pi.getProtocol();
boolean _isConjugated = this.roomExt.isConjugated(pi);
PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_portClass, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_portClass, null));
+ if (_notEquals) {
{
ProtocolClass _protocol_1 = pi.getProtocol();
boolean _isConjugated_1 = this.roomExt.isConjugated(pi);
PortClass _portClass_1 = this.roomExt.getPortClass(_protocol_1, _isConjugated_1);
EList<Attribute> _attributes = _portClass_1.getAttributes();
boolean _isEmpty_1 = _attributes.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not) {
+ boolean _not = (!_isEmpty_1);
+ if (_not) {
{
boolean _isReplicated = pi.isReplicated();
if (_isReplicated) {
@@ -811,7 +805,7 @@ public class SubSystemClassGen { String _pathName_2 = this.roomExt.getPathName(_path_2);
_builder.append(_pathName_2, "");
_builder.append("_var={");
- StringConcatenation _genPortAttributeInitializer = this.genPortAttributeInitializer(pi);
+ CharSequence _genPortAttributeInitializer = this.genPortAttributeInitializer(pi);
_builder.append(_genPortAttributeInitializer, "");
_builder.append("};");
_builder.newLineIfNotEmpty();
@@ -845,7 +839,7 @@ public class SubSystemClassGen { _builder.append("/* no ports/saps/services - nothing to initialize statically */");
_builder.newLine();
} else {
- StringConcatenation _genActorInstanceInitializer = this.genActorInstanceInitializer(root, ai_2);
+ CharSequence _genActorInstanceInitializer = this.genActorInstanceInitializer(root, ai_2);
_builder.append(_genActorInstanceInitializer, "");
_builder.newLineIfNotEmpty();
}
@@ -857,52 +851,52 @@ public class SubSystemClassGen { }
private String genReplPortAttributeInitializer(final InterfaceItemInstance pi) {
- int i = 0;
- String retval = "";
- EList<InterfaceItemInstance> _peers = pi.getPeers();
- int _size = _peers.size();
- i = _size;
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)i), ((Integer)0));
- Boolean _xwhileexpression = _operator_greaterThan;
- while (_xwhileexpression) {
- {
- String _operator_plus = StringExtensions.operator_plus(retval, "\r\n\t\t\t{");
- StringConcatenation _genPortAttributeInitializer = this.genPortAttributeInitializer(pi);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _genPortAttributeInitializer);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "}");
- retval = _operator_plus_2;
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)i), ((Integer)1));
- i = _operator_minus;
- boolean _operator_greaterThan_1 = ComparableExtensions.<Integer>operator_greaterThan(((Integer)i), ((Integer)0));
- if (_operator_greaterThan_1) {
- String _operator_plus_3 = StringExtensions.operator_plus(retval, ",");
- retval = _operator_plus_3;
- }
+ int i = 0;
+ String retval = "";
+ EList<InterfaceItemInstance> _peers = pi.getPeers();
+ int _size = _peers.size();
+ i = _size;
+ boolean _greaterThan = (i > 0);
+ boolean _while = _greaterThan;
+ while (_while) {
+ {
+ String _plus = (retval + "\r\n\t\t\t{");
+ CharSequence _genPortAttributeInitializer = this.genPortAttributeInitializer(pi);
+ String _plus_1 = (_plus + _genPortAttributeInitializer);
+ String _plus_2 = (_plus_1 + "}");
+ retval = _plus_2;
+ int _minus = (i - 1);
+ i = _minus;
+ boolean _greaterThan_1 = (i > 0);
+ if (_greaterThan_1) {
+ String _plus_3 = (retval + ",");
+ retval = _plus_3;
}
- boolean _operator_greaterThan_2 = ComparableExtensions.<Integer>operator_greaterThan(((Integer)i), ((Integer)0));
- _xwhileexpression = _operator_greaterThan_2;
}
- return retval;
+ boolean _greaterThan_1 = (i > 0);
+ _while = _greaterThan_1;
+ }
+ return retval;
}
- private StringConcatenation genPortAttributeInitializer(final InterfaceItemInstance pi) {
+ private CharSequence genPortAttributeInitializer(final InterfaceItemInstance pi) {
StringConcatenation _builder = new StringConcatenation();
{
ProtocolClass _protocol = pi.getProtocol();
boolean _isConjugated = this.roomExt.isConjugated(pi);
PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);
EList<Attribute> _attributes = _portClass.getAttributes();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Attribute attr : _attributes) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", "");
}
{
String _defaultValueLiteral = attr.getDefaultValueLiteral();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals) {
String _defaultValueLiteral_1 = attr.getDefaultValueLiteral();
_builder.append(_defaultValueLiteral_1, "");
} else {
@@ -917,113 +911,93 @@ public class SubSystemClassGen { return _builder;
}
- private StringConcatenation genActorInstanceInitializer(final Root root, final ActorInstance ai) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genActorInstanceInitializer(final Root root, final ActorInstance ai) {
+ CharSequence _xblockexpression = null;
{
String _path = ai.getPath();
- String _pathName = this.roomExt.getPathName(_path);
- String instName = _pathName;
+ String instName = this.roomExt.getPathName(_path);
ArrayList<InterfaceItemInstance> _arrayList = new ArrayList<InterfaceItemInstance>();
ArrayList<InterfaceItemInstance> replPorts = _arrayList;
EList<InterfaceItemInstance> _orderedIfItemInstances = ai.getOrderedIfItemInstances();
final Function1<InterfaceItemInstance,Boolean> _function = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance e) {
boolean _isReplicated = e.isReplicated();
- return ((Boolean)_isReplicated);
+ return Boolean.valueOf(_isReplicated);
}
};
Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function);
- CollectionExtensions.<InterfaceItemInstance>addAll(replPorts, _filter);
+ Iterables.<InterfaceItemInstance>addAll(replPorts, _filter);
final Function1<InterfaceItemInstance,Boolean> _function_1 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance e) {
EList<InterfaceItemInstance> _peers = e.getPeers();
boolean _isEmpty = _peers.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- return ((Boolean)_operator_not);
+ boolean _not = (!_isEmpty);
+ return Boolean.valueOf(_not);
}
};
InterfaceItemInstance _findFirst = IterableExtensions.<InterfaceItemInstance>findFirst(replPorts, _function_1);
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_findFirst, null);
- boolean haveReplSubPorts = _operator_notEquals;
+ boolean haveReplSubPorts = (!Objects.equal(_findFirst, null));
EList<InterfaceItemInstance> _orderedIfItemInstances_1 = ai.getOrderedIfItemInstances();
final Function1<InterfaceItemInstance,Boolean> _function_2 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance e) {
boolean _isSimple = e.isSimple();
- return ((Boolean)_isSimple);
+ return Boolean.valueOf(_isSimple);
}
};
- Iterable<InterfaceItemInstance> _filter_1 = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances_1, _function_2);
- Iterable<InterfaceItemInstance> simplePorts = _filter_1;
+ Iterable<InterfaceItemInstance> simplePorts = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances_1, _function_2);
ArrayList<InterfaceItemInstance> _arrayList_1 = new ArrayList<InterfaceItemInstance>();
ArrayList<InterfaceItemInstance> eventPorts = _arrayList_1;
final Function1<InterfaceItemInstance,Boolean> _function_3 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance p) {
ProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = _protocol.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
}
};
- Iterable<InterfaceItemInstance> _filter_2 = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_3);
- Iterable<InterfaceItemInstance> _union = this.roomExt.<InterfaceItemInstance>union(_filter_2, replPorts);
- CollectionExtensions.<InterfaceItemInstance>addAll(eventPorts, _union);
+ Iterable<InterfaceItemInstance> _filter_1 = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_3);
+ Iterable<InterfaceItemInstance> _union = this.roomExt.<InterfaceItemInstance>union(_filter_1, replPorts);
+ Iterables.<InterfaceItemInstance>addAll(eventPorts, _union);
final Function1<InterfaceItemInstance,Boolean> _function_4 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance p) {
ProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = _protocol.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.DATA_DRIVEN);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_commType, CommunicationType.DATA_DRIVEN);
+ return Boolean.valueOf(_equals);
}
};
- Iterable<InterfaceItemInstance> _filter_3 = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_4);
- Iterable<InterfaceItemInstance> dataPorts = _filter_3;
+ Iterable<InterfaceItemInstance> dataPorts = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_4);
final Function1<InterfaceItemInstance,Boolean> _function_5 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance p) {
- boolean _operator_and = false;
- if (!(p instanceof PortInstance)) {
- _operator_and = false;
- } else {
- Port _port = ((PortInstance) p).getPort();
- boolean _isConjugated = _port.isConjugated();
- boolean _operator_not = BooleanExtensions.operator_not(_isConjugated);
- _operator_and = BooleanExtensions.operator_and((p instanceof PortInstance), _operator_not);
- }
- return ((Boolean)_operator_and);
- }
- };
- Iterable<InterfaceItemInstance> _filter_4 = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_5);
- Iterable<InterfaceItemInstance> recvPorts = _filter_4;
- final Function1<InterfaceItemInstance,Boolean> _function_6 = new Function1<InterfaceItemInstance,Boolean>() {
- public Boolean apply(final InterfaceItemInstance p) {
- boolean _operator_and = false;
+ boolean _and = false;
if (!(p instanceof PortInstance)) {
- _operator_and = false;
+ _and = false;
} else {
Port _port = ((PortInstance) p).getPort();
boolean _isConjugated = _port.isConjugated();
- _operator_and = BooleanExtensions.operator_and((p instanceof PortInstance), _isConjugated);
+ boolean _not = (!_isConjugated);
+ _and = ((p instanceof PortInstance) && _not);
}
- return ((Boolean)_operator_and);
+ return Boolean.valueOf(_and);
}
};
- Iterable<InterfaceItemInstance> _filter_5 = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_6);
- Iterable<InterfaceItemInstance> sendPorts = _filter_5;
+ Iterable<InterfaceItemInstance> recvPorts = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_5);
HashMap<InterfaceItemInstance,Integer> _hashMap = new HashMap<InterfaceItemInstance,Integer>();
HashMap<InterfaceItemInstance,Integer> offsets = _hashMap;
int offset = 0;
for (final InterfaceItemInstance p : replPorts) {
{
- offsets.put(p, ((Integer)offset));
+ offsets.put(p, Integer.valueOf(offset));
EList<InterfaceItemInstance> _peers = p.getPeers();
int _size = _peers.size();
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)_size));
- offset = _operator_plus;
+ int _plus = (offset + _size);
+ offset = _plus;
}
}
String _xifexpression = null;
if (haveReplSubPorts) {
- String _operator_plus_1 = StringExtensions.operator_plus(instName, "_repl_sub_ports");
- _xifexpression = _operator_plus_1;
+ String _plus = (instName + "_repl_sub_ports");
+ _xifexpression = _plus;
} else {
_xifexpression = "NULL";
}
@@ -1041,19 +1015,19 @@ public class SubSystemClassGen { _builder.append("/* Replicated Sub Ports: {varData, msgService, peerAddress, localId, index} */");
_builder.newLine();
{
- final Function1<InterfaceItemInstance,Boolean> _function_7 = new Function1<InterfaceItemInstance,Boolean>() {
+ final Function1<InterfaceItemInstance,Boolean> _function_6 = new Function1<InterfaceItemInstance,Boolean>() {
public Boolean apply(final InterfaceItemInstance e) {
EList<InterfaceItemInstance> _peers = e.getPeers();
boolean _isEmpty = _peers.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- return ((Boolean)_operator_not);
+ boolean _not = (!_isEmpty);
+ return Boolean.valueOf(_not);
}
};
- Iterable<InterfaceItemInstance> _filter_6 = IterableExtensions.<InterfaceItemInstance>filter(replPorts, _function_7);
- boolean hasAnyElements = false;
- for(final InterfaceItemInstance pi : _filter_6) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ Iterable<InterfaceItemInstance> _filter_2 = IterableExtensions.<InterfaceItemInstance>filter(replPorts, _function_6);
+ boolean _hasElements = false;
+ for(final InterfaceItemInstance pi : _filter_2) {
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -1068,16 +1042,16 @@ public class SubSystemClassGen { }
}
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _isEmpty = eventPorts.isEmpty();
if (!_isEmpty) {
- _operator_and = false;
+ _and = false;
} else {
boolean _isEmpty_1 = IterableExtensions.isEmpty(recvPorts);
- _operator_and = BooleanExtensions.operator_and(_isEmpty, _isEmpty_1);
+ _and = (_isEmpty && _isEmpty_1);
}
- boolean _operator_not = BooleanExtensions.operator_not(_operator_and);
- if (_operator_not) {
+ boolean _not = (!_and);
+ if (_not) {
_builder.append("static const ");
ActorClass _actorClass = ai.getActorClass();
String _name = _actorClass.getName();
@@ -1090,10 +1064,10 @@ public class SubSystemClassGen { _builder.append("/* Ports: {varData, msgService, peerAddress, localId} */");
_builder.newLine();
{
- boolean hasAnyElements_1 = false;
+ boolean _hasElements_1 = false;
for(final InterfaceItemInstance pi_1 : eventPorts) {
- if (!hasAnyElements_1) {
- hasAnyElements_1 = true;
+ if (!_hasElements_1) {
+ _hasElements_1 = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -1107,9 +1081,9 @@ public class SubSystemClassGen { } else {
_builder.append("\t");
_builder.append("{");
- EList<InterfaceItemInstance> _peers_1 = pi_1.getPeers();
- int _size_1 = _peers_1.size();
- _builder.append(_size_1, " ");
+ EList<InterfaceItemInstance> _peers = pi_1.getPeers();
+ int _size = _peers.size();
+ _builder.append(_size, " ");
_builder.append(", ");
_builder.append(replSubPortsArray, " ");
_builder.append("+");
@@ -1123,17 +1097,17 @@ public class SubSystemClassGen { }
_builder.append("\t");
{
- boolean _operator_and_1 = false;
+ boolean _and_1 = false;
boolean _isEmpty_2 = eventPorts.isEmpty();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_2);
- if (!_operator_not_1) {
- _operator_and_1 = false;
+ boolean _not_1 = (!_isEmpty_2);
+ if (!_not_1) {
+ _and_1 = false;
} else {
boolean _isEmpty_3 = IterableExtensions.isEmpty(recvPorts);
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isEmpty_3);
- _operator_and_1 = BooleanExtensions.operator_and(_operator_not_1, _operator_not_2);
+ boolean _not_2 = (!_isEmpty_3);
+ _and_1 = (_not_1 && _not_2);
}
- if (_operator_and_1) {
+ if (_and_1) {
_builder.append(",");
}
}
@@ -1144,10 +1118,10 @@ public class SubSystemClassGen { _builder.append("/* data receive ports */");
_builder.newLine();
{
- boolean hasAnyElements_2 = false;
+ boolean _hasElements_2 = false;
for(final InterfaceItemInstance pi_2 : recvPorts) {
- if (!hasAnyElements_2) {
- hasAnyElements_2 = true;
+ if (!_hasElements_2) {
+ _hasElements_2 = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -1179,86 +1153,73 @@ public class SubSystemClassGen { private String genPortInitializer(final Root root, final ActorInstance ai, final InterfaceItemInstance pi) {
String _xblockexpression = null;
{
- String _xifexpression = null;
+ int _xifexpression = (int) 0;
EList<InterfaceItemInstance> _peers = pi.getPeers();
boolean _isEmpty = _peers.isEmpty();
if (_isEmpty) {
- _xifexpression = "NULL";
+ _xifexpression = 0;
} else {
- ActorClass _actorClass = ai.getActorClass();
- String _name = _actorClass.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, "_receiveMessage");
- _xifexpression = _operator_plus;
+ EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
+ InterfaceItemInstance _get = _peers_1.get(0);
+ int _objId = _get.getObjId();
+ _xifexpression = _objId;
}
- String recvMsg = _xifexpression;
+ int objId = _xifexpression;
int _xifexpression_1 = (int) 0;
- EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
- boolean _isEmpty_1 = _peers_1.isEmpty();
+ EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
+ boolean _isEmpty_1 = _peers_2.isEmpty();
if (_isEmpty_1) {
_xifexpression_1 = 0;
} else {
- EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
- InterfaceItemInstance _get = _peers_2.get(0);
- int _objId = _get.getObjId();
- _xifexpression_1 = _objId;
- }
- int objId = _xifexpression_1;
- int _xifexpression_2 = (int) 0;
- EList<InterfaceItemInstance> _peers_3 = pi.getPeers();
- boolean _isEmpty_2 = _peers_3.isEmpty();
- if (_isEmpty_2) {
- _xifexpression_2 = 0;
- } else {
- EList<InterfaceItemInstance> _peers_4 = pi.getPeers();
- InterfaceItemInstance _get_1 = _peers_4.get(0);
- EList<InterfaceItemInstance> _peers_5 = _get_1.getPeers();
- int _indexOf = _peers_5.indexOf(pi);
- _xifexpression_2 = _indexOf;
+ EList<InterfaceItemInstance> _peers_3 = pi.getPeers();
+ InterfaceItemInstance _get_1 = _peers_3.get(0);
+ EList<InterfaceItemInstance> _peers_4 = _get_1.getPeers();
+ int _indexOf = _peers_4.indexOf(pi);
+ _xifexpression_1 = _indexOf;
}
- int idx = _xifexpression_2;
+ int idx = _xifexpression_1;
String _interfaceItemInstanceData = this.getInterfaceItemInstanceData(pi);
- String _operator_plus_1 = StringExtensions.operator_plus("{", _interfaceItemInstanceData);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ",");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "&msgService_Thread1, ");
- int _operator_plus_4 = IntegerExtensions.operator_plus(((Integer)objId), ((Integer)idx));
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_3, ((Integer)_operator_plus_4));
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, ", ");
+ String _plus = ("{" + _interfaceItemInstanceData);
+ String _plus_1 = (_plus + ",");
+ String _plus_2 = (_plus_1 + "&msgService_Thread1, ");
+ int _plus_3 = (objId + idx);
+ String _plus_4 = (_plus_2 + Integer.valueOf(_plus_3));
+ String _plus_5 = (_plus_4 + ", ");
ExpandedActorClass _expandedActorClass = root.getExpandedActorClass(ai);
InterfaceItem _interfaceItem = pi.getInterfaceItem();
int _interfaceItemLocalId = _expandedActorClass.getInterfaceItemLocalId(_interfaceItem);
- int _operator_plus_7 = IntegerExtensions.operator_plus(((Integer)_interfaceItemLocalId), ((Integer)1));
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_6, ((Integer)_operator_plus_7));
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, "} /* Port ");
- String _name_1 = pi.getName();
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_9, _name_1);
- String _operator_plus_11 = StringExtensions.operator_plus(_operator_plus_10, " */");
- _xblockexpression = (_operator_plus_11);
+ int _plus_6 = (_interfaceItemLocalId + 1);
+ String _plus_7 = (_plus_5 + Integer.valueOf(_plus_6));
+ String _plus_8 = (_plus_7 + "} /* Port ");
+ String _name = pi.getName();
+ String _plus_9 = (_plus_8 + _name);
+ String _plus_10 = (_plus_9 + " */");
+ _xblockexpression = (_plus_10);
}
return _xblockexpression;
}
private String getInterfaceItemInstanceData(final InterfaceItemInstance pi) {
- ProtocolClass _protocol = pi.getProtocol();
- boolean _isConjugated = this.roomExt.isConjugated(pi);
- PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
- return "0";
- }
- ProtocolClass _protocol_1 = pi.getProtocol();
- boolean _isConjugated_1 = this.roomExt.isConjugated(pi);
- PortClass _portClass_1 = this.roomExt.getPortClass(_protocol_1, _isConjugated_1);
- EList<Attribute> _attributes = _portClass_1.getAttributes();
- boolean _isEmpty = _attributes.isEmpty();
- if (_isEmpty) {
- return "0";
- } else {
- String _path = pi.getPath();
- String _pathName = this.roomExt.getPathName(_path);
- String _operator_plus = StringExtensions.operator_plus("&", _pathName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "_var");
- return _operator_plus_1;
- }
+ ProtocolClass _protocol = pi.getProtocol();
+ boolean _isConjugated = this.roomExt.isConjugated(pi);
+ PortClass _portClass = this.roomExt.getPortClass(_protocol, _isConjugated);
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
+ return "0";
+ }
+ ProtocolClass _protocol_1 = pi.getProtocol();
+ boolean _isConjugated_1 = this.roomExt.isConjugated(pi);
+ PortClass _portClass_1 = this.roomExt.getPortClass(_protocol_1, _isConjugated_1);
+ EList<Attribute> _attributes = _portClass_1.getAttributes();
+ boolean _isEmpty = _attributes.isEmpty();
+ if (_isEmpty) {
+ return "0";
+ } else {
+ String _path = pi.getPath();
+ String _pathName = this.roomExt.getPathName(_path);
+ String _plus = ("&" + _pathName);
+ return (_plus + "_var");
+ }
}
private String genRecvPortInitializer(final Root root, final ActorInstance ai, final InterfaceItemInstance pi) {
@@ -1270,86 +1231,83 @@ public class SubSystemClassGen { return "{NULL}";
}
EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
- InterfaceItemInstance _get = _peers_1.get(0);
- InterfaceItemInstance peer = _get;
+ InterfaceItemInstance peer = _peers_1.get(0);
EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
- InterfaceItemInstance _get_1 = _peers_2.get(0);
- EObject _eContainer = _get_1.eContainer();
+ InterfaceItemInstance _get = _peers_2.get(0);
+ EObject _eContainer = _get.eContainer();
ActorInstance peerInst = ((ActorInstance) _eContainer);
String _path = peerInst.getPath();
- String _pathName = this.roomExt.getPathName(_path);
- String instName = _pathName;
- String _operator_plus = StringExtensions.operator_plus("{&", instName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, ".");
+ String instName = this.roomExt.getPathName(_path);
+ String _plus = ("{&" + instName);
+ String _plus_1 = (_plus + ".");
String _name = peer.getName();
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, _name);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "}");
- _xblockexpression = (_operator_plus_3);
+ String _plus_2 = (_plus_1 + _name);
+ String _plus_3 = (_plus_2 + "}");
+ _xblockexpression = (_plus_3);
}
return _xblockexpression;
}
private String genReplSubPortInitializers(final Root root, final ActorInstance ai, final InterfaceItemInstance pi) {
- String result = "";
- EList<InterfaceItemInstance> _peers = pi.getPeers();
- for (final InterfaceItemInstance p : _peers) {
- {
- EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
- int _indexOf = _peers_1.indexOf(p);
- int idx = _indexOf;
- String _xifexpression = null;
- EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
- int _size = _peers_2.size();
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)_size), ((Integer)1));
- boolean _operator_lessThan = ComparableExtensions.<Integer>operator_lessThan(((Integer)idx), ((Integer)_operator_minus));
- if (_operator_lessThan) {
- _xifexpression = ",";
- } else {
- _xifexpression = "";
- }
- String comma = _xifexpression;
- String _interfaceItemInstanceData = this.getInterfaceItemInstanceData(pi);
- String iiiD = _interfaceItemInstanceData;
- String _xifexpression_1 = null;
- boolean _equals = iiiD.equals("0");
- if (_equals) {
- String _operator_plus = StringExtensions.operator_plus(iiiD, ",");
- _xifexpression_1 = _operator_plus;
- } else {
- String _operator_plus_1 = StringExtensions.operator_plus(iiiD, "[");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ((Integer)idx));
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "],");
- _xifexpression_1 = _operator_plus_3;
- }
- iiiD = _xifexpression_1;
- String _operator_plus_4 = StringExtensions.operator_plus(result, "{");
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, iiiD);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, "&msgService_Thread1, ");
- int _objId = p.getObjId();
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, ((Integer)_objId));
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, ", ");
- ExpandedActorClass _expandedActorClass = root.getExpandedActorClass(ai);
- InterfaceItem _interfaceItem = pi.getInterfaceItem();
- int _interfaceItemLocalId = _expandedActorClass.getInterfaceItemLocalId(_interfaceItem);
- int _operator_plus_9 = IntegerExtensions.operator_plus(((Integer)_interfaceItemLocalId), ((Integer)1));
- String _operator_plus_10 = StringExtensions.operator_plus(_operator_plus_8, ((Integer)_operator_plus_9));
- String _operator_plus_11 = StringExtensions.operator_plus(_operator_plus_10, ", ");
- String _operator_plus_12 = StringExtensions.operator_plus(_operator_plus_11, ((Integer)idx));
- String _operator_plus_13 = StringExtensions.operator_plus(_operator_plus_12, "}");
- String _operator_plus_14 = StringExtensions.operator_plus(_operator_plus_13, comma);
- String _operator_plus_15 = StringExtensions.operator_plus(_operator_plus_14, " /* Repl Sub Port ");
- String _name = pi.getName();
- String _operator_plus_16 = StringExtensions.operator_plus(_operator_plus_15, _name);
- String _operator_plus_17 = StringExtensions.operator_plus(_operator_plus_16, " idx +");
- String _operator_plus_18 = StringExtensions.operator_plus(_operator_plus_17, ((Integer)idx));
- String _operator_plus_19 = StringExtensions.operator_plus(_operator_plus_18, "*/\n");
- result = _operator_plus_19;
+ String result = "";
+ EList<InterfaceItemInstance> _peers = pi.getPeers();
+ for (final InterfaceItemInstance p : _peers) {
+ {
+ EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
+ int idx = _peers_1.indexOf(p);
+ String _xifexpression = null;
+ EList<InterfaceItemInstance> _peers_2 = pi.getPeers();
+ int _size = _peers_2.size();
+ int _minus = (_size - 1);
+ boolean _lessThan = (idx < _minus);
+ if (_lessThan) {
+ _xifexpression = ",";
+ } else {
+ _xifexpression = "";
+ }
+ String comma = _xifexpression;
+ String iiiD = this.getInterfaceItemInstanceData(pi);
+ String _xifexpression_1 = null;
+ boolean _equals = iiiD.equals("0");
+ if (_equals) {
+ String _plus = (iiiD + ",");
+ _xifexpression_1 = _plus;
+ } else {
+ String _plus_1 = (iiiD + "[");
+ String _plus_2 = (_plus_1 + Integer.valueOf(idx));
+ String _plus_3 = (_plus_2 + "],");
+ _xifexpression_1 = _plus_3;
}
+ iiiD = _xifexpression_1;
+ String _plus_4 = (result +
+ "{");
+ String _plus_5 = (_plus_4 + iiiD);
+ String _plus_6 = (_plus_5 + "&msgService_Thread1, ");
+ int _objId = p.getObjId();
+ String _plus_7 = (_plus_6 + Integer.valueOf(_objId));
+ String _plus_8 = (_plus_7 + ", ");
+ ExpandedActorClass _expandedActorClass = root.getExpandedActorClass(ai);
+ InterfaceItem _interfaceItem = pi.getInterfaceItem();
+ int _interfaceItemLocalId = _expandedActorClass.getInterfaceItemLocalId(_interfaceItem);
+ int _plus_9 = (_interfaceItemLocalId + 1);
+ String _plus_10 = (_plus_8 + Integer.valueOf(_plus_9));
+ String _plus_11 = (_plus_10 + ", ");
+ String _plus_12 = (_plus_11 + Integer.valueOf(idx));
+ String _plus_13 = (_plus_12 + "}");
+ String _plus_14 = (_plus_13 + comma);
+ String _plus_15 = (_plus_14 + " /* Repl Sub Port ");
+ String _name = pi.getName();
+ String _plus_16 = (_plus_15 + _name);
+ String _plus_17 = (_plus_16 + " idx +");
+ String _plus_18 = (_plus_17 + Integer.valueOf(idx));
+ String _plus_19 = (_plus_18 + "*/\n");
+ result = _plus_19;
}
- return result;
+ }
+ return result;
}
- private StringConcatenation generateDispatcherFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ private CharSequence generateDispatcherFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -1403,8 +1361,8 @@ public class SubSystemClassGen { public Boolean apply(final InterfaceItemInstance p) {
ProtocolClass _protocol = p.getProtocol();
CommunicationType _commType = _protocol.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, CommunicationType.EVENT_DRIVEN);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_commType, CommunicationType.EVENT_DRIVEN);
+ return Boolean.valueOf(_equals);
}
};
Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function);
@@ -1420,8 +1378,8 @@ public class SubSystemClassGen { int _objId = pi.getObjId();
EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
int _indexOf = _peers_1.indexOf(peer);
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_objId), ((Integer)_indexOf));
- _builder.append(_operator_plus, " ");
+ int _plus = (_objId + _indexOf);
+ _builder.append(_plus, " ");
_builder.append(":");
_builder.newLineIfNotEmpty();
{
@@ -1684,25 +1642,25 @@ public class SubSystemClassGen { return _builder;
}
- private StringConcatenation generateDatadrivenExecutes(final Root root, final SubSystemInstance ssi) {
+ private CharSequence generateDatadrivenExecutes(final Root root, final SubSystemInstance ssi) {
StringConcatenation _builder = new StringConcatenation();
{
EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances();
for(final ActorInstance ai : _allContainedInstances) {
{
- boolean _operator_or = false;
+ boolean _or = false;
ActorClass _actorClass = ai.getActorClass();
ActorCommunicationType _commType = _actorClass.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.ASYNCHRONOUS);
- if (_operator_equals) {
- _operator_or = true;
+ boolean _equals = Objects.equal(_commType, ActorCommunicationType.ASYNCHRONOUS);
+ if (_equals) {
+ _or = true;
} else {
ActorClass _actorClass_1 = ai.getActorClass();
ActorCommunicationType _commType_1 = _actorClass_1.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.DATA_DRIVEN);
- _operator_or = BooleanExtensions.operator_or(_operator_equals, _operator_equals_1);
+ boolean _equals_1 = Objects.equal(_commType_1, ActorCommunicationType.DATA_DRIVEN);
+ _or = (_equals || _equals_1);
}
- if (_operator_or) {
+ if (_or) {
ActorClass _actorClass_2 = ai.getActorClass();
String _name = _actorClass_2.getName();
_builder.append(_name, "");
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java index c2116359d..a1a5d02f7 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java @@ -7,12 +7,11 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root; import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.etrice.generator.generic.RoomExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class SubSystemRunnerGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -28,18 +27,18 @@ public class SubSystemRunnerGen { String _generationTargetPath = this.roomExt.getGenerationTargetPath(_subSystemClass);
SubSystemClass _subSystemClass_1 = sc.getSubSystemClass();
String _path = this.roomExt.getPath(_subSystemClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- this.fileAccess.setOutputPath(_operator_plus);
+ String _plus = (_generationTargetPath + _path);
+ this.fileAccess.setOutputPath(_plus);
String _name = sc.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_name, "_Runner.c");
+ String _plus_1 = (_name + "_Runner.c");
SubSystemClass _subSystemClass_2 = sc.getSubSystemClass();
- StringConcatenation _generateSourceFile = this.generateSourceFile(root, sc, _subSystemClass_2);
- this.fileAccess.generateFile(_operator_plus_1, _generateSourceFile);
+ CharSequence _generateSourceFile = this.generateSourceFile(root, sc, _subSystemClass_2);
+ this.fileAccess.generateFile(_plus_1, _generateSourceFile);
}
}
}
- public StringConcatenation generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
+ public CharSequence generateSourceFile(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.smap b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.smap new file mode 100644 index 000000000..a92dbe677 --- /dev/null +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.smap @@ -0,0 +1,23 @@ +SMAP +SubSystemRunnerGen.java +Xtend +*S Xtend +*F ++ 0 SubSystemRunnerGen.xtend +src/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.xtend +*L +31:23,3 +32:26,6 +33:32,5 +31:37,2 +37:42,11 +41:53,5 +42:58,10 +46:68,43 +65:111,5 +66:116,13 +71:129,13 +76:142,5 +77:147,22 +37:169 +*E diff --git a/plugins/org.eclipse.etrice.generator.doc/.gitignore b/plugins/org.eclipse.etrice.generator.doc/.gitignore index 092357e47..d1b2f933f 100644 --- a/plugins/org.eclipse.etrice.generator.doc/.gitignore +++ b/plugins/org.eclipse.etrice.generator.doc/.gitignore @@ -1 +1,2 @@ bin
+*._trace
diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF index b24f40370..d84b9e746 100644 --- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0", org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
+ org.eclipse.xtend.lib;bundle-version="2.3.0",
+ org.eclipse.xtext.util;bundle-version="2.1.1",
org.eclipse.xtext.generator;bundle-version="2.1.1"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java deleted file mode 100644 index 4ba396681..000000000 --- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java +++ /dev/null @@ -1,1075 +0,0 @@ -package org.eclipse.etrice.generator.doc.gen;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.etrice.core.genmodel.base.ILogger;
-import org.eclipse.etrice.core.genmodel.etricegen.Root;
-import org.eclipse.etrice.core.room.ActorClass;
-import org.eclipse.etrice.core.room.Attribute;
-import org.eclipse.etrice.core.room.ChoicePoint;
-import org.eclipse.etrice.core.room.CompoundProtocolClass;
-import org.eclipse.etrice.core.room.DataClass;
-import org.eclipse.etrice.core.room.DataType;
-import org.eclipse.etrice.core.room.Documentation;
-import org.eclipse.etrice.core.room.GeneralProtocolClass;
-import org.eclipse.etrice.core.room.Message;
-import org.eclipse.etrice.core.room.ProtocolClass;
-import org.eclipse.etrice.core.room.RefableType;
-import org.eclipse.etrice.core.room.RoomModel;
-import org.eclipse.etrice.core.room.StandardOperation;
-import org.eclipse.etrice.core.room.State;
-import org.eclipse.etrice.core.room.StateGraph;
-import org.eclipse.etrice.core.room.SubProtocol;
-import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.core.room.VarDecl;
-import org.eclipse.etrice.core.room.util.RoomHelpers;
-import org.eclipse.etrice.generator.base.IRoomGenerator;
-import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-
-@SuppressWarnings("all")
-@Singleton
-public class DocGen implements IRoomGenerator {
- @Inject
- private JavaIoFileSystemAccess fileAccess;
-
- @Inject
- private RoomExtensions roomExt;
-
- @Inject
- private ILogger logger;
-
- public void doGenerate(final Root root) {
- EList<RoomModel> _models = root.getModels();
- for (final RoomModel model : _models) {
- {
- String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String path = _docGenerationTargetPath;
- String _name = model.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".tex");
- String file = _operator_plus;
- String _operator_plus_1 = StringExtensions.operator_plus("generating LaTeX documentation: \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
- this.fileAccess.setOutputPath(path);
- StringConcatenation _generateModelDoc = this.generateModelDoc(root, model);
- this.fileAccess.generateFile(file, _generateModelDoc);
- }
- }
- }
-
- public StringConcatenation generateModelDoc(final Root root, final RoomModel model) {
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\\documentclass[titlepage]{article}");
- _builder.newLine();
- _builder.append("\\usepackage{graphicx}");
- _builder.newLine();
- _builder.append("\\usepackage[a4paper,text={160mm,255mm},centering,headsep=5mm,footskip=10mm]{geometry}");
- _builder.newLine();
- _builder.append("\\usepackage{nonfloat}");
- _builder.newLine();
- _builder.append("\\parindent 0pt");
- _builder.newLine();
- _builder.append("\\makeatletter");
- _builder.newLine();
- _builder.append("\\newcommand\\level[1]{%");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\ifcase#1\\relax\\expandafter\\chapter\\or");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\expandafter\\section\\or");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\expandafter\\subsection\\or");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\expandafter\\subsubsection\\else");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\def\\next{\\@level{#1}}\\expandafter\\next");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\fi}");
- _builder.newLine();
- _builder.newLine();
- _builder.append("\\newcommand{\\@level}[1]{%");
- _builder.newLine();
- _builder.append("\\@startsection{level#1}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("{#1}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("{\\z@}%");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("{-3.25ex\\@plus -1ex \\@minus -.2ex}%");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("{1.5ex \\@plus .2ex}%");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("{\\normalfont\\normalsize\\bfseries}}");
- _builder.newLine();
- _builder.newLine();
- _builder.append("\\newdimen\\@leveldim");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\newdimen\\@dotsdim");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("{\\normalfont\\normalsize");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\sbox\\z@{0}\\global\\@leveldim=\\wd\\z@");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\sbox\\z@{.}\\global\\@dotsdim=\\wd\\z@");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("} ");
- _builder.newLine();
- _builder.append("\\newcounter{level4}[subsubsection]");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\@namedef{thelevel4}{\\thesubsubsection.\\arabic{level4}}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\@namedef{level4mark}#1{}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\def\\l@section{\\@dottedtocline{1}{0pt}{\\dimexpr\\@leveldim*4+\\@dotsdim*1+6pt\\relax}}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\def\\l@subsection{\\@dottedtocline{2}{0pt}{\\dimexpr\\@leveldim*5+\\@dotsdim*2+6pt\\relax}}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\def\\l@subsubsection{\\@dottedtocline{3}{0pt}{\\dimexpr\\@leveldim*6+\\@dotsdim*3+6pt\\relax}}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\@namedef{l@level4}{\\@dottedtocline{4}{0pt}{\\dimexpr\\@leveldim*7+\\@dotsdim*4+6pt\\relax}}");
- _builder.newLine();
- _builder.newLine();
- _builder.append("\\count@=4");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\def\\@ncp#1{\\number\\numexpr\\count@+#1\\relax}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\loop\\ifnum\\count@<100");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\begingroup\\edef\\x{\\endgroup");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\noexpand\\newcounter{level\\@ncp{1}}[level\\number\\count@]");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\noexpand\\@namedef{thelevel\\@ncp{1}}{%");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\noexpand\\@nameuse{thelevel\\@ncp{0}}.\\noexpand\\arabic{level\\@ncp{0}}}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\noexpand\\@namedef{level\\@ncp{1}mark}####1{}%");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\noexpand\\@namedef{l@level\\@ncp{1}}%");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("{\\noexpand\\@dottedtocline{\\@ncp{1}}{0pt}{\\the\\dimexpr\\@leveldim*\\@ncp{5}+\\@dotsdim*\\@ncp{0}\\relax}}}%");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\x");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\advance\\count@\\@ne");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\repeat");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\makeatother");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\setcounter{secnumdepth}{100}");
- _builder.newLine();
- _builder.append(" ");
- _builder.append("\\setcounter{tocdepth}{100}");
- _builder.newLine();
- _builder.newLine();
- _builder.newLine();
- _builder.append("\\title{");
- String _name = model.getName();
- _builder.append(_name, "");
- _builder.append(" Modeldocumentation}");
- _builder.newLineIfNotEmpty();
- _builder.append("\\date{\\today}");
- _builder.newLine();
- _builder.append("\\author{generated by eTrice}");
- _builder.newLine();
- _builder.newLine();
- _builder.append("\\begin{document}");
- _builder.newLine();
- _builder.append("\\pagestyle{plain}");
- _builder.newLine();
- _builder.append("\\maketitle");
- _builder.newLine();
- _builder.append("\\tableofcontents");
- _builder.newLine();
- _builder.newLine();
- _builder.append("\\newpage");
- _builder.newLine();
- _builder.append("\\listoffigures");
- _builder.newLine();
- _builder.append("\\newpage");
- _builder.newLine();
- _builder.append("\\section{Model Description}");
- _builder.newLine();
- Documentation _docu = model.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
- _builder.append(_generateDocText, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\section{Subsystem Description}");
- _builder.newLine();
- StringConcatenation _generateAllSubSysClassDocs = this.generateAllSubSysClassDocs(root, model);
- _builder.append(_generateAllSubSysClassDocs, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\section{Protocol Class Description}");
- _builder.newLine();
- StringConcatenation _generateAllProtocolClassDocs = this.generateAllProtocolClassDocs(root, model);
- _builder.append(_generateAllProtocolClassDocs, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\section{Data Class Description}");
- _builder.newLine();
- StringConcatenation _generateAllDataClassDocs = this.generateAllDataClassDocs(root, model);
- _builder.append(_generateAllDataClassDocs, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\section{Actor Class Description}");
- _builder.newLine();
- StringConcatenation _generateAllActorClassDocs = this.generateAllActorClassDocs(root, model);
- _builder.append(_generateAllActorClassDocs, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\end{document}");
- _builder.newLine();
- return _builder;
- }
-
- public StringConcatenation generateAllSubSysClassDocs(final Root root, final RoomModel model) {
- StringConcatenation _builder = new StringConcatenation();
- {
- EList<SubSystemClass> _subSystemClasses = model.getSubSystemClasses();
- for(final SubSystemClass ssc : _subSystemClasses) {
- StringConcatenation _generateSubSysClassDoc = this.generateSubSysClassDoc(root, model, ssc);
- _builder.append(_generateSubSysClassDoc, "");
- _builder.newLineIfNotEmpty();
- }
- }
- return _builder;
- }
-
- public StringConcatenation generateSubSysClassDoc(final Root root, final RoomModel model, final SubSystemClass ssc) {
- StringConcatenation _xblockexpression = null;
- {
- String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "images\\");
- String _name = ssc.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_structure.jpg");
- String filename = _operator_plus_2;
- String _replaceAll = filename.replaceAll("\\\\", "/");
- filename = _replaceAll;
- String _replaceAll_1 = filename.replaceAll("/", "//");
- String latexFilename = _replaceAll_1;
- String _docGenerationTargetPath_1 = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus_3 = StringExtensions.operator_plus(_docGenerationTargetPath_1, "images\\");
- String _name_1 = ssc.getName();
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, _name_1);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, "_instanceTree.jpg");
- String filenamei = _operator_plus_5;
- String _replaceAll_2 = filenamei.replaceAll("\\\\", "/");
- filenamei = _replaceAll_2;
- String _replaceAll_3 = filenamei.replaceAll("/", "//");
- String latexFilenamei = _replaceAll_3;
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\\level{2}{");
- String _name_2 = ssc.getName();
- _builder.append(_name_2, "");
- _builder.append("}");
- _builder.newLineIfNotEmpty();
- Documentation _docu = ssc.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
- _builder.append(_generateDocText, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\level{3}{Structure}");
- _builder.newLine();
- {
- String _fileExists = this.fileExists(filename);
- boolean _equals = _fileExists.equals("true");
- if (_equals) {
- String _name_3 = ssc.getName();
- String _operator_plus_6 = StringExtensions.operator_plus(_name_3, " Structure");
- StringConcatenation _includeGraphics = this.includeGraphics(latexFilename, "0.4", _operator_plus_6);
- _builder.append(_includeGraphics, "");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.append("\\level{3}{Instance Tree}");
- _builder.newLine();
- {
- String _fileExists_1 = this.fileExists(filename);
- boolean _equals_1 = _fileExists_1.equals("true");
- if (_equals_1) {
- String _name_4 = ssc.getName();
- String _operator_plus_7 = StringExtensions.operator_plus(_name_4, " Instance Tree");
- StringConcatenation _includeGraphics_1 = this.includeGraphics(latexFilenamei, "0.5", _operator_plus_7);
- _builder.append(_includeGraphics_1, "");
- _builder.newLineIfNotEmpty();
- }
- }
- _xblockexpression = (_builder);
- }
- return _xblockexpression;
- }
-
- public StringConcatenation generateAllDataClassDocs(final Root root, final RoomModel model) {
- StringConcatenation _builder = new StringConcatenation();
- {
- EList<DataClass> _dataClasses = model.getDataClasses();
- for(final DataClass dc : _dataClasses) {
- StringConcatenation _generateDataClassDoc = this.generateDataClassDoc(root, dc);
- _builder.append(_generateDataClassDoc, "");
- _builder.newLineIfNotEmpty();
- }
- }
- return _builder;
- }
-
- public StringConcatenation generateDataClassDoc(final Root root, final DataClass dc) {
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\\level{2} {");
- String _name = dc.getName();
- _builder.append(_name, "");
- _builder.append("}");
- _builder.newLineIfNotEmpty();
- Documentation _docu = dc.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
- _builder.append(_generateDocText, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\level{3}{Attributes}");
- _builder.newLine();
- EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _generateAttributesDoc = this.generateAttributesDoc(_attributes);
- _builder.append(_generateAttributesDoc, "");
- _builder.newLineIfNotEmpty();
- _builder.newLine();
- _builder.append("\\level{3}{Operations}");
- _builder.newLine();
- EList<StandardOperation> _operations = dc.getOperations();
- StringConcatenation _generateOperationsDoc = this.generateOperationsDoc(_operations);
- _builder.append(_generateOperationsDoc, "");
- _builder.newLineIfNotEmpty();
- return _builder;
- }
-
- public StringConcatenation generateAllProtocolClassDocs(final Root root, final RoomModel model) {
- StringConcatenation _builder = new StringConcatenation();
- {
- EList<GeneralProtocolClass> _protocolClasses = model.getProtocolClasses();
- for(final GeneralProtocolClass pc : _protocolClasses) {
- StringConcatenation _generateProtocolClassDoc = this.generateProtocolClassDoc(root, pc);
- _builder.append(_generateProtocolClassDoc, "");
- _builder.newLineIfNotEmpty();
- }
- }
- return _builder;
- }
-
- protected StringConcatenation _generateProtocolClassDoc(final Root root, final ProtocolClass pc) {
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\t");
- _builder.append("\\level{2} {");
- String _name = pc.getName();
- _builder.append(_name, " ");
- _builder.append("}");
- _builder.newLineIfNotEmpty();
- _builder.append("\t");
- Documentation _docu = pc.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
- _builder.append(_generateDocText, " ");
- _builder.newLineIfNotEmpty();
- _builder.append("\t");
- _builder.append("\\level{3}{Incoming Messages}");
- _builder.newLine();
- _builder.newLine();
- _builder.append("\t");
- _builder.append("\\begin{tabular}[ht]{|l|l|l|}");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("Message & Data & Description\\\\");
- _builder.newLine();
- {
- List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
- for(final Message ims : _allIncomingMessages) {
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\t");
- String _name_1 = ims.getName();
- _builder.append(_name_1, " ");
- _builder.append(" & ");
- {
- VarDecl _data = ims.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- if (_operator_notEquals) {
- _builder.append(" ");
- VarDecl _data_1 = ims.getData();
- String _name_2 = _data_1.getName();
- _builder.append(_name_2, " ");
- _builder.append(" ");
- }
- }
- _builder.append(" & ");
- Documentation _docu_1 = ims.getDocu();
- StringConcatenation _generateDocText_1 = this.generateDocText(_docu_1);
- _builder.append(_generateDocText_1, " ");
- _builder.append("\\\\");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("\\end{tabular}");
- _builder.newLine();
- _builder.append("\t");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("\\level{3}{Outgoing Messages}");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("\\begin{tabular}[ht]{|l|l|l|}");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("Message & Data & Description\\\\");
- _builder.newLine();
- {
- List<Message> _allOutgoingMessages = this.roomExt.getAllOutgoingMessages(pc);
- for(final Message oms : _allOutgoingMessages) {
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\t");
- String _name_3 = oms.getName();
- _builder.append(_name_3, " ");
- _builder.append(" & ");
- {
- VarDecl _data_2 = oms.getData();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_data_2, null);
- if (_operator_notEquals_1) {
- _builder.append(" ");
- VarDecl _data_3 = oms.getData();
- String _name_4 = _data_3.getName();
- _builder.append(_name_4, " ");
- _builder.append(" ");
- }
- }
- _builder.append(" & ");
- Documentation _docu_2 = oms.getDocu();
- StringConcatenation _generateDocText_2 = this.generateDocText(_docu_2);
- _builder.append(_generateDocText_2, " ");
- _builder.append("\\\\");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("\\end{tabular}\t\t\t");
- _builder.newLine();
- return _builder;
- }
-
- protected StringConcatenation _generateProtocolClassDoc(final Root root, final CompoundProtocolClass pc) {
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\\level{2} {");
- String _name = pc.getName();
- _builder.append(_name, "");
- _builder.append("}");
- _builder.newLineIfNotEmpty();
- Documentation _docu = pc.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
- _builder.append(_generateDocText, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\level{3}{Sub Protocols}");
- _builder.newLine();
- _builder.newLine();
- _builder.append("\\begin{tabular}[ht]{|l|l|}");
- _builder.newLine();
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("Name & Protocol\\\\");
- _builder.newLine();
- {
- EList<SubProtocol> _subProtocols = pc.getSubProtocols();
- for(final SubProtocol sub : _subProtocols) {
- _builder.append("\\hline");
- _builder.newLine();
- String _name_1 = sub.getName();
- _builder.append(_name_1, "");
- _builder.append(" & ");
- GeneralProtocolClass _protocol = sub.getProtocol();
- String _name_2 = _protocol.getName();
- _builder.append(_name_2, "");
- _builder.append("\\\\");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\\end{tabular}");
- _builder.newLine();
- return _builder;
- }
-
- public StringConcatenation generateAllActorClassDocs(final Root root, final RoomModel model) {
- StringConcatenation _builder = new StringConcatenation();
- {
- EList<ActorClass> _actorClasses = model.getActorClasses();
- for(final ActorClass ac : _actorClasses) {
- StringConcatenation _generateActorClassDoc = this.generateActorClassDoc(root, model, ac);
- _builder.append(_generateActorClassDoc, "");
- _builder.newLineIfNotEmpty();
- }
- }
- return _builder;
- }
-
- public StringConcatenation generateActorClassDoc(final Root root, final RoomModel model, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
- {
- String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "images\\");
- String _name = ac.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_structure.jpg");
- String filename = _operator_plus_2;
- String _replaceAll = filename.replaceAll("\\\\", "/");
- filename = _replaceAll;
- String _replaceAll_1 = filename.replaceAll("/", "//");
- String latexFilename = _replaceAll_1;
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\\level{2}{");
- String _name_1 = ac.getName();
- _builder.append(_name_1, "");
- _builder.append("}");
- _builder.newLineIfNotEmpty();
- Documentation _docu = ac.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
- _builder.append(_generateDocText, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\level{3}{Structure}");
- _builder.newLine();
- _builder.newLine();
- {
- String _fileExists = this.fileExists(filename);
- boolean _equals = _fileExists.equals("true");
- if (_equals) {
- String _name_2 = ac.getName();
- String _operator_plus_3 = StringExtensions.operator_plus(_name_2, " Structure");
- StringConcatenation _includeGraphics = this.includeGraphics(latexFilename, "0.4", _operator_plus_3);
- _builder.append(_includeGraphics, "");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.newLine();
- _builder.append("\\level{3}{Attributes}");
- _builder.newLine();
- EList<Attribute> _attributes = ac.getAttributes();
- StringConcatenation _generateAttributesDoc = this.generateAttributesDoc(_attributes);
- _builder.append(_generateAttributesDoc, "");
- _builder.newLineIfNotEmpty();
- _builder.newLine();
- _builder.append("\\level{3}{Operations}");
- _builder.newLine();
- EList<StandardOperation> _operations = ac.getOperations();
- StringConcatenation _generateOperationsDoc = this.generateOperationsDoc(_operations);
- _builder.append(_generateOperationsDoc, "");
- _builder.newLineIfNotEmpty();
- {
- boolean _hasNonEmptyStateMachine = RoomHelpers.hasNonEmptyStateMachine(ac);
- if (_hasNonEmptyStateMachine) {
- _builder.append("\\level{3}{Statemachine}");
- _builder.newLine();
- StringConcatenation _generateFsmDoc = this.generateFsmDoc(model, ac);
- _builder.append(_generateFsmDoc, "");
- _builder.newLineIfNotEmpty();
- }
- }
- _xblockexpression = (_builder);
- }
- return _xblockexpression;
- }
-
- public StringConcatenation generateFsmDoc(final RoomModel model, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
- {
- String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "images\\");
- String _name = ac.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_behavior.jpg");
- String filename = _operator_plus_2;
- String _replaceAll = filename.replaceAll("\\\\", "/");
- filename = _replaceAll;
- String _replaceAll_1 = filename.replaceAll("/", "//");
- String latexFilename = _replaceAll_1;
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\\level{4}{Top Level}");
- _builder.newLine();
- {
- String _fileExists = this.fileExists(filename);
- boolean _equals = _fileExists.equals("true");
- if (_equals) {
- String _name_1 = ac.getName();
- String _operator_plus_3 = StringExtensions.operator_plus(_name_1, " Top State");
- StringConcatenation _includeGraphics = this.includeGraphics(latexFilename, "0.4", _operator_plus_3);
- _builder.append(_includeGraphics, "");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.newLine();
- _builder.append("\\begin{par}");
- _builder.newLine();
- {
- StateGraph _stateMachine = ac.getStateMachine();
- EList<State> _states = _stateMachine.getStates();
- for(final State s : _states) {
- {
- Documentation _docu = s.getDocu();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_docu, null);
- if (_operator_notEquals) {
- _builder.append("\\textbf{State description} \\textit{");
- String _statePathName = this.roomExt.getStatePathName(s);
- String _replaceAll_2 = _statePathName.replaceAll("_", "\\\\_");
- _builder.append(_replaceAll_2, "");
- _builder.append("}:");
- _builder.newLineIfNotEmpty();
- _builder.append("\\newline");
- _builder.newLine();
- Documentation _docu_1 = s.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu_1);
- _builder.append(_generateDocText, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\newline\\newline");
- _builder.newLine();
- }
- }
- }
- }
- _builder.newLine();
- {
- StateGraph _stateMachine_1 = ac.getStateMachine();
- EList<ChoicePoint> _chPoints = _stateMachine_1.getChPoints();
- for(final ChoicePoint c : _chPoints) {
- {
- Documentation _docu_2 = c.getDocu();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_docu_2, null);
- if (_operator_notEquals_1) {
- _builder.append("\\textbf{Choicepoint description} \\textit{");
- String _name_2 = c.getName();
- _builder.append(_name_2, "");
- _builder.append("}:");
- _builder.newLineIfNotEmpty();
- _builder.append("\\newline");
- _builder.newLine();
- Documentation _docu_3 = c.getDocu();
- StringConcatenation _generateDocText_1 = this.generateDocText(_docu_3);
- _builder.append(_generateDocText_1, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\newline\\newline");
- _builder.newLine();
- }
- }
- }
- }
- _builder.append("\\end{par}");
- _builder.newLine();
- _builder.newLine();
- {
- StateGraph _stateMachine_2 = ac.getStateMachine();
- EList<State> _states_1 = _stateMachine_2.getStates();
- for(final State s_1 : _states_1) {
- {
- boolean _isLeaf = this.roomExt.isLeaf(s_1);
- boolean _operator_not = BooleanExtensions.operator_not(_isLeaf);
- if (_operator_not) {
- StringConcatenation _generateStateDoc = this.generateStateDoc(model, ac, s_1);
- _builder.append(_generateStateDoc, "");
- _builder.newLineIfNotEmpty();
- }
- }
- }
- }
- _xblockexpression = (_builder);
- }
- return _xblockexpression;
- }
-
- public StringConcatenation generateStateDoc(final RoomModel model, final ActorClass ac, final State state) {
- StringConcatenation _xblockexpression = null;
- {
- String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "images\\");
- String _name = ac.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "_");
- String _statePathName = this.roomExt.getStatePathName(state);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, _statePathName);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "_behavior.jpg");
- String filename = _operator_plus_4;
- String _replaceAll = filename.replaceAll("\\\\", "/");
- filename = _replaceAll;
- String _replaceAll_1 = filename.replaceAll("/", "//");
- String latexFilename = _replaceAll_1;
- String _operator_plus_5 = StringExtensions.operator_plus("Gen Filename: ", filename);
- this.logger.logInfo(_operator_plus_5);
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\\level{4}{Subgraph ");
- String _statePathName_1 = this.roomExt.getStatePathName(state);
- String _replaceAll_2 = _statePathName_1.replaceAll("_", "\\\\_");
- _builder.append(_replaceAll_2, "");
- _builder.append("}");
- _builder.newLineIfNotEmpty();
- {
- String _fileExists = this.fileExists(filename);
- boolean _equals = _fileExists.equals("true");
- if (_equals) {
- String _name_1 = ac.getName();
- String _operator_plus_6 = StringExtensions.operator_plus(_name_1, "_");
- String _statePathName_2 = this.roomExt.getStatePathName(state);
- String _operator_plus_7 = StringExtensions.operator_plus(_operator_plus_6, _statePathName_2);
- StringConcatenation _includeGraphics = this.includeGraphics(latexFilename, "0.4", _operator_plus_7);
- _builder.append(_includeGraphics, "");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.newLine();
- _builder.append("\\begin{par}");
- _builder.newLine();
- {
- StateGraph _subgraph = state.getSubgraph();
- EList<State> _states = _subgraph.getStates();
- for(final State s : _states) {
- {
- Documentation _docu = s.getDocu();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_docu, null);
- if (_operator_notEquals) {
- _builder.append("\\textbf{State description} \\textit{");
- String _statePathName_3 = this.roomExt.getStatePathName(s);
- String _replaceAll_3 = _statePathName_3.replaceAll("_", "\\\\_");
- _builder.append(_replaceAll_3, "");
- _builder.append("}:");
- _builder.newLineIfNotEmpty();
- _builder.append("\\newline");
- _builder.newLine();
- Documentation _docu_1 = s.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu_1);
- _builder.append(_generateDocText, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\newline\\newline");
- _builder.newLine();
- }
- }
- }
- }
- _builder.newLine();
- {
- StateGraph _subgraph_1 = state.getSubgraph();
- EList<ChoicePoint> _chPoints = _subgraph_1.getChPoints();
- for(final ChoicePoint c : _chPoints) {
- {
- Documentation _docu_2 = c.getDocu();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_docu_2, null);
- if (_operator_notEquals_1) {
- _builder.append("\\textbf{Choicepoint description} \\textit{");
- String _name_2 = c.getName();
- _builder.append(_name_2, "");
- _builder.append("}:");
- _builder.newLineIfNotEmpty();
- _builder.append("\\newline");
- _builder.newLine();
- Documentation _docu_3 = c.getDocu();
- StringConcatenation _generateDocText_1 = this.generateDocText(_docu_3);
- _builder.append(_generateDocText_1, "");
- _builder.newLineIfNotEmpty();
- _builder.append("\\newline\\newline");
- _builder.newLine();
- }
- }
- }
- }
- _builder.append("\\end{par}");
- _builder.newLine();
- _builder.append("\t");
- _builder.newLine();
- {
- StateGraph _subgraph_2 = state.getSubgraph();
- EList<State> _states_1 = _subgraph_2.getStates();
- for(final State s_1 : _states_1) {
- {
- boolean _isLeaf = this.roomExt.isLeaf(s_1);
- boolean _operator_not = BooleanExtensions.operator_not(_isLeaf);
- if (_operator_not) {
- StringConcatenation _generateStateDoc = this.generateStateDoc(model, ac, s_1);
- _builder.append(_generateStateDoc, "");
- _builder.newLineIfNotEmpty();
- }
- }
- }
- }
- _xblockexpression = (_builder);
- }
- return _xblockexpression;
- }
-
- public StringConcatenation generateAttributesDoc(final List<Attribute> attributes) {
- StringConcatenation _builder = new StringConcatenation();
- {
- boolean _isEmpty = attributes.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
- _builder.append("\\begin{tabular}[ht]{|l|l|l|}");
- _builder.newLine();
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("Name & Type & Description\\\\");
- _builder.newLine();
- {
- for(final Attribute at : attributes) {
- _builder.append("\\hline");
- _builder.newLine();
- String _name = at.getName();
- _builder.append(_name, "");
- _builder.append(" & ");
- RefableType _refType = at.getRefType();
- DataType _type = _refType.getType();
- String _name_1 = _type.getName();
- _builder.append(_name_1, "");
- _builder.append(" & ");
- Documentation _docu = at.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu);
- _builder.append(_generateDocText, "");
- _builder.append("\\\\");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\\end{tabular}");
- _builder.newLine();
- }
- }
- return _builder;
- }
-
- public StringConcatenation generateOperationsDoc(final List<StandardOperation> operations) {
- StringConcatenation _builder = new StringConcatenation();
- {
- for(final StandardOperation op : operations) {
- _builder.append("\\begin{tabular}[ht]{|l|l|}");
- _builder.newLine();
- _builder.append("\\hline\t\t");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("Name: & ");
- String _name = op.getName();
- _builder.append(_name, " ");
- _builder.append("\\\\");
- _builder.newLineIfNotEmpty();
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("ReturnType: & ");
- {
- RefableType _returntype = op.getReturntype();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_returntype, null);
- if (_operator_notEquals) {
- RefableType _returntype_1 = op.getReturntype();
- DataType _type = _returntype_1.getType();
- String _name_1 = _type.getName();
- _builder.append(_name_1, " ");
- } else {
- _builder.append("void");
- }
- }
- _builder.append("\\\\");
- _builder.newLineIfNotEmpty();
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("Arguments: & ");
- {
- EList<VarDecl> _arguments = op.getArguments();
- boolean hasAnyElements = false;
- for(final VarDecl pa : _arguments) {
- if (!hasAnyElements) {
- hasAnyElements = true;
- } else {
- _builder.appendImmediate(", ", " ");
- }
- String _name_2 = pa.getName();
- _builder.append(_name_2, " ");
- _builder.append(":");
- RefableType _refType = pa.getRefType();
- DataType _type_1 = _refType.getType();
- String _name_3 = _type_1.getName();
- _builder.append(_name_3, " ");
- }
- }
- _builder.append("\\\\");
- _builder.newLineIfNotEmpty();
- {
- Documentation _docu = op.getDocu();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_docu, null);
- if (_operator_notEquals_1) {
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- {
- Documentation _docu_1 = op.getDocu();
- String _string = _docu_1.toString();
- int _length = _string.length();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_length), ((Integer)85));
- if (_operator_greaterThan) {
- _builder.append("\t");
- _builder.append("\\multicolumn{2} {|p{13cm}|} {");
- Documentation _docu_2 = op.getDocu();
- StringConcatenation _generateDocText = this.generateDocText(_docu_2);
- _builder.append(_generateDocText, " ");
- _builder.append("}\\\\");
- _builder.newLineIfNotEmpty();
- } else {
- _builder.append("\t");
- _builder.append("\\multicolumn{2} {|l|} {");
- Documentation _docu_3 = op.getDocu();
- StringConcatenation _generateDocText_1 = this.generateDocText(_docu_3);
- _builder.append(_generateDocText_1, " ");
- _builder.append("}\\\\");
- _builder.newLineIfNotEmpty();
- }
- }
- }
- }
- _builder.append("\t");
- _builder.append("\\hline");
- _builder.newLine();
- _builder.append("\\end{tabular}");
- _builder.newLine();
- _builder.append("\\newline\\newline\\newline");
- _builder.newLine();
- }
- }
- return _builder;
- }
-
- public StringConcatenation generateDocText(final Documentation doc) {
- StringConcatenation _builder = new StringConcatenation();
- {
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(doc, null);
- if (_operator_notEquals) {
- EList<String> _text = doc.getText();
- String _join = IterableExtensions.join(_text);
- _builder.append(_join, "");
- _builder.newLineIfNotEmpty();
- }
- }
- return _builder;
- }
-
- public String fileExists(final String f) {
- File _file = new File(f);
- final File file = _file;
- boolean _exists = file.exists();
- final boolean exist = _exists;
- boolean _operator_equals = ObjectExtensions.operator_equals(((Boolean)exist), ((Boolean)true));
- if (_operator_equals) {
- {
- String _operator_plus = StringExtensions.operator_plus("File found ! ", f);
- this.logger.logInfo(_operator_plus);
- return "true";
- }
- } else {
- {
- String _operator_plus_1 = StringExtensions.operator_plus("File not found ! ", f);
- this.logger.logInfo(_operator_plus_1);
- return "false";
- }
- }
- }
-
- public StringConcatenation includeGraphics(final String filename, final String scale, final String caption) {
- StringConcatenation _xblockexpression = null;
- {
- String _replaceAll = caption.replaceAll("_", "\\\\_");
- String latexCaption = _replaceAll;
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("\\begin{center}");
- _builder.newLine();
- _builder.append("\\includegraphics[scale=");
- _builder.append(scale, "");
- _builder.append("]{");
- _builder.append(filename, "");
- _builder.append("}");
- _builder.newLineIfNotEmpty();
- _builder.append("\\figcaption{");
- _builder.append(latexCaption, "");
- _builder.append("}");
- _builder.newLineIfNotEmpty();
- _builder.append("\\end{center}");
- _builder.newLine();
- _xblockexpression = (_builder);
- }
- return _xblockexpression;
- }
-
- public String irgendwas(final Root root, final ActorClass ac) {
- String _name = ac.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".bla");
- return _operator_plus;
- }
-
- public StringConcatenation generateProtocolClassDoc(final Root root, final GeneralProtocolClass pc) {
- if (pc instanceof CompoundProtocolClass) {
- return _generateProtocolClassDoc(root, (CompoundProtocolClass)pc);
- } else if (pc instanceof ProtocolClass) {
- return _generateProtocolClassDoc(root, (ProtocolClass)pc);
- } else {
- throw new IllegalArgumentException("Unhandled parameter types: " +
- Arrays.<Object>asList(root, pc).toString());
- }
- }
-}
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java deleted file mode 100644 index deb19cedc..000000000 --- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java +++ /dev/null @@ -1,170 +0,0 @@ -package org.eclipse.etrice.generator.doc.gen;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.genmodel.base.ILogger;
-import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;
-import org.eclipse.etrice.core.genmodel.etricegen.Root;
-import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance;
-import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
-import org.eclipse.etrice.core.room.ActorClass;
-import org.eclipse.etrice.core.room.RoomModel;
-import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.generator.base.IRoomGenerator;
-import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-
-@SuppressWarnings("all")
-@Singleton
-public class InstanceDiagramGen implements IRoomGenerator {
- @Inject
- private JavaIoFileSystemAccess fileAccess;
-
- @Inject
- private RoomExtensions roomExt;
-
- @Inject
- private ILogger logger;
-
- public void doGenerate(final Root root) {
- EList<RoomModel> _models = root.getModels();
- for (final RoomModel model : _models) {
- {
- String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
- String _operator_plus = StringExtensions.operator_plus(_docGenerationTargetPath, "/images");
- String path = _operator_plus;
- this.fileAccess.setOutputPath(path);
- String file2 = "dot2jpg.bat";
- EList<SubSystemInstance> _subSystemInstances = root.getSubSystemInstances();
- for (final SubSystemInstance sc : _subSystemInstances) {
- {
- String _name = sc.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_name, "_instanceTree.dot");
- String file = _operator_plus_1;
- String _operator_plus_2 = StringExtensions.operator_plus("generating LaTeX documentation: \'", file);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "\' in \'");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, path);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, "\'");
- this.logger.logInfo(_operator_plus_5);
- SubSystemClass _subSystemClass = sc.getSubSystemClass();
- StringConcatenation _generate = this.generate(root, sc, _subSystemClass);
- this.fileAccess.generateFile(file, _generate);
- }
- }
- StringConcatenation _generate2jpg = this.generate2jpg(root);
- this.fileAccess.generateFile(file2, _generate2jpg);
- this.runDot2Jpg();
- }
- }
- }
-
- public StringConcatenation generate2jpg(final Root root) {
- StringConcatenation _builder = new StringConcatenation();
- {
- EList<SubSystemInstance> _subSystemInstances = root.getSubSystemInstances();
- for(final SubSystemInstance sc : _subSystemInstances) {
- _builder.append("dot -Tjpg -o ");
- String _name = sc.getName();
- _builder.append(_name, "");
- _builder.append("_instanceTree.jpg ");
- String _name_1 = sc.getName();
- _builder.append(_name_1, "");
- _builder.append("_instanceTree.dot");
- _builder.newLineIfNotEmpty();
- }
- }
- return _builder;
- }
-
- public StringConcatenation generate(final Root root, final SubSystemInstance ssi, final SubSystemClass ssc) {
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("digraph ");
- String _name = ssi.getName();
- _builder.append(_name, "");
- _builder.append(" {");
- _builder.newLineIfNotEmpty();
- _builder.append("\t");
- _builder.append("rankdir=LR;");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("node [shape=box];");
- _builder.newLine();
- _builder.append("\t");
- String _path = ssi.getPath();
- String _pathName = this.roomExt.getPathName(_path);
- _builder.append(_pathName, " ");
- _builder.append(" [label=\"");
- String _name_1 = ssc.getName();
- _builder.append(_name_1, " ");
- _builder.append("\\n(");
- String _name_2 = ssi.getName();
- _builder.append(_name_2, " ");
- _builder.append(")\" style=filled color=yellow];");
- _builder.newLineIfNotEmpty();
- {
- EList<ActorInstance> _instances = ssi.getInstances();
- for(final ActorInstance ai : _instances) {
- _builder.append("\t");
- StringConcatenation _instance = this.instance(ai);
- _builder.append(_instance, " ");
- _builder.newLineIfNotEmpty();
- }
- }
- _builder.append("}");
- _builder.newLine();
- return _builder;
- }
-
- public StringConcatenation instance(final ActorInstance ai) {
- StringConcatenation _builder = new StringConcatenation();
- EObject _eContainer = ai.eContainer();
- StructureInstance parent = ((StructureInstance) _eContainer);
- _builder.newLineIfNotEmpty();
- String _path = ai.getPath();
- String _pathName = this.roomExt.getPathName(_path);
- _builder.append(_pathName, "");
- _builder.append(" [label=\"");
- String _name = ai.getName();
- _builder.append(_name, "");
- _builder.append("\\n(");
- ActorClass _actorClass = ai.getActorClass();
- String _name_1 = _actorClass.getName();
- _builder.append(_name_1, "");
- _builder.append(")\"];");
- _builder.newLineIfNotEmpty();
- String _path_1 = parent.getPath();
- String _pathName_1 = this.roomExt.getPathName(_path_1);
- _builder.append(_pathName_1, "");
- _builder.append(" -> ");
- String _path_2 = ai.getPath();
- String _pathName_2 = this.roomExt.getPathName(_path_2);
- _builder.append(_pathName_2, "");
- _builder.append("; ");
- _builder.newLineIfNotEmpty();
- {
- EList<ActorInstance> _instances = ai.getInstances();
- for(final ActorInstance sub_ai : _instances) {
- StringConcatenation _instance = this.instance(sub_ai);
- _builder.append(_instance, "");
- _builder.newLineIfNotEmpty();
- }
- }
- return _builder;
- }
-
- public Process runDot2Jpg() {
- Process _xtrycatchfinallyexpression = null;
- try {
- Runtime _runtime = Runtime.getRuntime();
- Process _exec = _runtime.exec("dot2jpg.bat");
- _xtrycatchfinallyexpression = _exec;
- } catch (final Exception e) {
- e.printStackTrace();
- }
- return _xtrycatchfinallyexpression;
- }
-}
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java index 9ea2869c4..28eaa6ec8 100644 --- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java +++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java @@ -12,8 +12,8 @@ import org.eclipse.etrice.generator.generic.PrepareFileSystem; import org.eclipse.xtext.generator.IFileSystemAccess;
import org.eclipse.xtext.generator.IGenerator;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class MainGen implements IGenerator {
@Inject
private InstanceDiagramGen instanceDiagramGen;
@@ -25,17 +25,17 @@ public class MainGen implements IGenerator { private DocGen docGen;
public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- this.prepFS.prepare(resource);
- EList<EObject> _contents = resource.getContents();
- for (final EObject e : _contents) {
- if ((e instanceof Root)) {
- this.doGenerate(((Root) e));
- }
+ this.prepFS.prepare(resource);
+ EList<EObject> _contents = resource.getContents();
+ for (final EObject e : _contents) {
+ if ((e instanceof Root)) {
+ this.doGenerate(((Root) e));
}
+ }
}
public void doGenerate(final Root e) {
- this.instanceDiagramGen.doGenerate(e);
- this.docGen.doGenerate(e);
+ this.instanceDiagramGen.doGenerate(e);
+ this.docGen.doGenerate(e);
}
}
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.smap b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.smap new file mode 100644 index 000000000..006177826 --- /dev/null +++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.smap @@ -0,0 +1,17 @@ +SMAP +MainGen.java +Xtend +*S Xtend +*F ++ 0 MainGen.xtend +src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend +*L +32:28 +33:29,2 +34:31 +35:32 +34:33 +33:34 +41:38 +42:39 +*E diff --git a/plugins/org.eclipse.etrice.generator.java/.gitignore b/plugins/org.eclipse.etrice.generator.java/.gitignore index 092357e47..d1b2f933f 100644 --- a/plugins/org.eclipse.etrice.generator.java/.gitignore +++ b/plugins/org.eclipse.etrice.generator.java/.gitignore @@ -1 +1,2 @@ bin
+*._trace
diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF index 4d600d78a..4f2245ce8 100644 --- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0", org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
+ org.eclipse.xtend.lib;bundle-version="2.3.0",
org.eclipse.etrice.generator.doc;bundle-version="0.1.0",
org.eclipse.xtext.generator;bundle-version="2.1.1",
org.eclipse.xtext.util;bundle-version="2.1.1",
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend index 7d86137d4..0023e239e 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend @@ -24,7 +24,6 @@ import static extension org.eclipse.etrice.core.room.util.RoomHelpers.* import org.eclipse.etrice.generator.base.AbstractGenerator
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
-import org.eclipse.etrice.generator.generic.TypeHelpers
import org.eclipse.etrice.generator.generic.GenericActorClassGenerator
@Singleton
@@ -34,7 +33,6 @@ class ActorClassGen extends GenericActorClassGenerator { @Inject extension JavaExtensions
@Inject extension RoomExtensions
- @Inject extension TypeHelpers
@Inject extension ProcedureHelpers
@Inject extension StateMachineGen
@Inject ILogger logger
@@ -75,7 +73,7 @@ class ActorClassGen extends GenericActorClassGenerator { «ac.userCode(1)»
- public «IF ac.abstract»abstract «ENDIF»class «ac.name» extends «IF ac.base!=null»«ac.base.name»«ELSE»ActorClassBase«ENDIF» {
+ public «IF ac.^abstract»abstract «ENDIF»class «ac.name» extends «IF ac.base!=null»«ac.base.name»«ELSE»ActorClassBase«ENDIF» {
«ac.userCode(2)»
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend index e59f47b95..416c0c988 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend @@ -25,7 +25,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.ProcedureHelpers
-import org.eclipse.etrice.generator.generic.TypeHelpers
@Singleton
@@ -35,7 +34,6 @@ class DataClassGen { @Inject extension JavaExtensions
@Inject extension RoomExtensions
@Inject extension ProcedureHelpers
- @Inject extension TypeHelpers
@Inject ILogger logger
def doGenerate(Root root) {
@@ -50,7 +48,6 @@ class DataClassGen { def generate(Root root, DataClass dc) {
val ctor = dc.operations.filter(op|op.constructor).head
- val dtor = dc.operations.filter(op|op.destructor).head
'''
package «dc.getPackage()»;
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend index c92199d8c..dd6428a84 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend @@ -193,7 +193,7 @@ class SubSystemClassGen { «ENDIF»
«ENDFOR»
«FOR portConfig : portConfigs»
- «var portName = "port"»«var item = portConfig.item»
+ «var item = portConfig.item»
«FOR attrConfig : portConfig.attributes»
«var a = attrConfig.attribute»
«var value = attrConfig.value.stringValue(a)»
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java index e13ab795c..935cf737e 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.java.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
@@ -22,19 +23,15 @@ import org.eclipse.etrice.generator.base.AbstractGenerator; import org.eclipse.etrice.generator.generic.GenericActorClassGenerator;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
import org.eclipse.etrice.generator.java.gen.StateMachineGen;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class ActorClassGen extends GenericActorClassGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -46,9 +43,6 @@ public class ActorClassGen extends GenericActorClassGenerator { private RoomExtensions _roomExtensions;
@Inject
- private TypeHelpers _typeHelpers;
-
- @Inject
private ProcedureHelpers _procedureHelpers;
@Inject
@@ -65,47 +59,43 @@ public class ActorClassGen extends GenericActorClassGenerator { String _generationTargetPath = this._roomExtensions.getGenerationTargetPath(_actorClass);
ActorClass _actorClass_1 = xpac.getActorClass();
String _path = this._roomExtensions.getPath(_actorClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
+ String path = (_generationTargetPath + _path);
ActorClass _actorClass_2 = xpac.getActorClass();
- String _javaFileName = this._javaExtensions.getJavaFileName(_actorClass_2);
- String file = _javaFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating ActorClass implementation \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String file = this._javaExtensions.getJavaFileName(_actorClass_2);
+ String _plus = ("generating ActorClass implementation \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
ActorClass _actorClass_3 = xpac.getActorClass();
- StringConcatenation _generate = this.generate(root, xpac, _actorClass_3);
+ CharSequence _generate = this.generate(root, xpac, _actorClass_3);
this.fileAccess.generateFile(file, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence generate(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
+ CharSequence _xblockexpression = null;
{
EList<StandardOperation> _operations = ac.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isConstructor = RoomHelpers.isConstructor(op);
- return ((Boolean)_isConstructor);
+ return Boolean.valueOf(_isConstructor);
}
};
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
- StandardOperation _head = IterableExtensions.<StandardOperation>head(_filter);
- final StandardOperation ctor = _head;
+ final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
EList<StandardOperation> _operations_1 = ac.getOperations();
final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isDestructor = op.isDestructor();
- return ((Boolean)_isDestructor);
+ return Boolean.valueOf(_isDestructor);
}
};
Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
- StandardOperation _head_1 = IterableExtensions.<StandardOperation>head(_filter_1);
- final StandardOperation dtor = _head_1;
+ final StandardOperation dtor = IterableExtensions.<StandardOperation>head(_filter_1);
StringConcatenation _builder = new StringConcatenation();
_builder.append("package ");
String _package = this._roomExtensions.getPackage(ac);
@@ -153,7 +143,7 @@ public class ActorClassGen extends GenericActorClassGenerator { }
}
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(ac, 1);
+ CharSequence _userCode = this._procedureHelpers.userCode(ac, 1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -171,8 +161,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append(" extends ");
{
ActorClass _base = ac.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
ActorClass _base_1 = ac.getBase();
String _name_3 = _base_1.getName();
_builder.append(_name_3, "");
@@ -184,7 +174,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("\t");
- StringConcatenation _userCode_1 = this._procedureHelpers.userCode(ac, 2);
+ CharSequence _userCode_1 = this._procedureHelpers.userCode(ac, 2);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -257,11 +247,11 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t");
EList<Attribute> _attributes = ac.getAttributes();
- StringConcatenation _attributes_1 = this._procedureHelpers.attributes(_attributes);
+ CharSequence _attributes_1 = this._procedureHelpers.attributes(_attributes);
_builder.append(_attributes_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
- StringConcatenation _operationsImplementation = this._procedureHelpers.operationsImplementation(ac);
+ CharSequence _operationsImplementation = this._procedureHelpers.operationsImplementation(ac);
_builder.append(_operationsImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -276,8 +266,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLineIfNotEmpty();
{
ActorClass _base_2 = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base_2, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base_2, null);
+ if (_equals) {
_builder.append("\t\t");
_builder.append("super(parent, name, port_addr[0][0], peer_addr[0][0]);");
_builder.newLine();
@@ -297,7 +287,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
_builder.append("\t\t");
EList<Attribute> _attributes_2 = ac.getAttributes();
- StringConcatenation _attributeInitialization = this._procedureHelpers.attributeInitialization(_attributes_2, false);
+ CharSequence _attributeInitialization = this._procedureHelpers.attributeInitialization(_attributes_2, false);
_builder.append(_attributeInitialization, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -322,8 +312,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append(", ");
{
int _multiplicity = ep_1.getMultiplicity();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(((Integer)_multiplicity), ((Integer)1));
- if (_operator_equals_1) {
+ boolean _equals_1 = (_multiplicity == 1);
+ if (_equals_1) {
_builder.append("0, ");
}
}
@@ -333,8 +323,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("]");
{
int _multiplicity_1 = ep_1.getMultiplicity();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(((Integer)_multiplicity_1), ((Integer)1));
- if (_operator_equals_2) {
+ boolean _equals_2 = (_multiplicity_1 == 1);
+ if (_equals_2) {
_builder.append("[0]");
}
}
@@ -344,8 +334,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("]");
{
int _multiplicity_2 = ep_1.getMultiplicity();
- boolean _operator_equals_3 = ObjectExtensions.operator_equals(((Integer)_multiplicity_2), ((Integer)1));
- if (_operator_equals_3) {
+ boolean _equals_3 = (_multiplicity_2 == 1);
+ if (_equals_3) {
_builder.append("[0]");
}
}
@@ -419,8 +409,8 @@ public class ActorClassGen extends GenericActorClassGenerator { }
}
{
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(ctor, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(ctor, null));
+ if (_notEquals_1) {
_builder.append("\t\t");
_builder.newLine();
_builder.append("\t\t");
@@ -448,7 +438,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("\t");
EList<Attribute> _attributes_3 = ac.getAttributes();
String _name_24 = ac.getName();
- StringConcatenation _attributeSettersGettersImplementation = this._procedureHelpers.attributeSettersGettersImplementation(_attributes_3, _name_24);
+ CharSequence _attributeSettersGettersImplementation = this._procedureHelpers.attributeSettersGettersImplementation(_attributes_3, _name_24);
_builder.append(_attributeSettersGettersImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -461,7 +451,7 @@ public class ActorClassGen extends GenericActorClassGenerator { String _portClassName_6 = this._roomExtensions.getPortClassName(ep_2);
String _name_25 = ep_2.getName();
String _name_26 = ac.getName();
- StringConcatenation _terImplementation = this._procedureHelpers.getterImplementation(_portClassName_6, _name_25, _name_26);
+ CharSequence _terImplementation = this._procedureHelpers.getterImplementation(_portClassName_6, _name_25, _name_26);
_builder.append(_terImplementation, " ");
_builder.newLineIfNotEmpty();
}
@@ -473,7 +463,7 @@ public class ActorClassGen extends GenericActorClassGenerator { String _portClassName_7 = this._roomExtensions.getPortClassName(sap_2);
String _name_27 = sap_2.getName();
String _name_28 = ac.getName();
- StringConcatenation _terImplementation_1 = this._procedureHelpers.getterImplementation(_portClassName_7, _name_27, _name_28);
+ CharSequence _terImplementation_1 = this._procedureHelpers.getterImplementation(_portClassName_7, _name_27, _name_28);
_builder.append(_terImplementation_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -486,7 +476,7 @@ public class ActorClassGen extends GenericActorClassGenerator { SPPRef _spp_6 = svc_2.getSpp();
String _name_29 = _spp_6.getName();
String _name_30 = ac.getName();
- StringConcatenation _terImplementation_2 = this._procedureHelpers.getterImplementation(_portClassName_8, _name_29, _name_30);
+ CharSequence _terImplementation_2 = this._procedureHelpers.getterImplementation(_portClassName_8, _name_29, _name_30);
_builder.append(_terImplementation_2, " ");
_builder.newLineIfNotEmpty();
}
@@ -517,8 +507,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine();
{
boolean _overridesStop = this._roomExtensions.overridesStop(ac);
- boolean _operator_not = BooleanExtensions.operator_not(_overridesStop);
- if (_operator_not) {
+ boolean _not = (!_overridesStop);
+ if (_not) {
_builder.append("\t");
_builder.append("public void stop(){");
_builder.newLine();
@@ -537,8 +527,8 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("public void destroy(){");
_builder.newLine();
{
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(dtor, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_2 = (!Objects.equal(dtor, null));
+ if (_notEquals_2) {
_builder.append("\t\t");
_builder.newLine();
_builder.append("\t\t");
@@ -562,13 +552,13 @@ public class ActorClassGen extends GenericActorClassGenerator { boolean _hasNonEmptyStateMachine = RoomHelpers.hasNonEmptyStateMachine(ac);
if (_hasNonEmptyStateMachine) {
_builder.append("\t");
- StringConcatenation _genStateMachine = this._stateMachineGen.genStateMachine(xpac);
+ CharSequence _genStateMachine = this._stateMachineGen.genStateMachine(xpac);
_builder.append(_genStateMachine, " ");
_builder.newLineIfNotEmpty();
} else {
boolean _hasStateMachine = xpac.hasStateMachine();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_hasStateMachine);
- if (_operator_not_1) {
+ boolean _not_1 = (!_hasStateMachine);
+ if (_not_1) {
_builder.append("\t");
_builder.append("//--------------------- no state machine");
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.smap b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.smap new file mode 100644 index 000000000..b6d47ec49 --- /dev/null +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.smap @@ -0,0 +1,131 @@ +SMAP +ActorClassGen.java +Xtend +*S Xtend +*F ++ 0 ActorClassGen.xtend +src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend +*L +41:55,3 +42:58,5 +43:63,2 +44:65,5 +45:70 +46:71,3 +41:74,2 +50:79,2 +51:81,9 +52:90,9 +50:99 +54:100 +55:101,20 +50:121 +65:122,3 +66:125,4 +50:129,2 +67:131 +50:132 +69:133,3 +70:136,7 +50:143,2 +71:145 +73:146,6 +50:152 +76:153,3 +50:156,2 +76:158,4 +50:162 +76:163,6 +50:169 +76:170 +50:171,2 +76:173,4 +78:177,8 +50:185 +81:186,4 +82:190,7 +50:197,2 +83:199,5 +50:204 +86:205,4 +87:209,7 +50:216,2 +88:218,5 +50:223 +91:224,4 +92:228,8 +50:236,2 +93:238,5 +96:243,6 +98:249,5 +99:254,9 +102:263,4 +50:267 +103:268,6 +50:274 +105:275,3 +50:278,2 +107:280,2 +108:282,7 +110:289,8 +50:297 +113:298,3 +114:301,12 +50:313 +114:314,4 +50:318,2 +114:320,4 +50:324 +114:325,4 +50:329,2 +114:331,4 +50:335 +114:336,4 +50:340,2 +114:342,2 +50:344,2 +115:346,5 +50:351 +118:352,3 +119:355,19 +50:374,2 +120:376,5 +50:381 +123:382,3 +124:385,24 +50:409,3 +126:412,13 +130:425,8 +50:433,2 +132:435,4 +134:439,8 +50:447 +136:448,3 +137:451,6 +50:457,3 +139:460,3 +140:463,6 +50:469,3 +142:472,3 +143:475,7 +50:482,2 +144:484,24 +50:508 +155:509,13 +50:522,2 +159:524,5 +50:529 +162:530,10 +165:540,5 +50:545,2 +166:547,4 +50:551 +169:552,3 +170:555,3 +50:558 +171:559,29 +50:588,3 +181:591,2 +54:593 +50:594,2 +*E diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java index 5f116f6b2..a187baa53 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.java.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
@@ -17,17 +18,14 @@ import org.eclipse.etrice.core.room.StandardOperation; import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.etrice.generator.generic.ProcedureHelpers;
import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class DataClassGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -42,9 +40,6 @@ public class DataClassGen { private ProcedureHelpers _procedureHelpers;
@Inject
- private TypeHelpers _typeHelpers;
-
- @Inject
private ILogger logger;
public void doGenerate(final Root root) {
@@ -53,45 +48,32 @@ public class DataClassGen { {
String _generationTargetPath = this._roomExtensions.getGenerationTargetPath(dc);
String _path = this._roomExtensions.getPath(dc);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
- String _javaFileName = this._javaExtensions.getJavaFileName(dc);
- String file = _javaFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating DataClass implementation \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String path = (_generationTargetPath + _path);
+ String file = this._javaExtensions.getJavaFileName(dc);
+ String _plus = ("generating DataClass implementation \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
- StringConcatenation _generate = this.generate(root, dc);
+ CharSequence _generate = this.generate(root, dc);
this.fileAccess.generateFile(file, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final DataClass dc) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence generate(final Root root, final DataClass dc) {
+ CharSequence _xblockexpression = null;
{
EList<StandardOperation> _operations = dc.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation op) {
boolean _isConstructor = RoomHelpers.isConstructor(op);
- return ((Boolean)_isConstructor);
+ return Boolean.valueOf(_isConstructor);
}
};
Iterable<StandardOperation> _filter = IterableExtensions.<StandardOperation>filter(_operations, _function);
- StandardOperation _head = IterableExtensions.<StandardOperation>head(_filter);
- final StandardOperation ctor = _head;
- EList<StandardOperation> _operations_1 = dc.getOperations();
- final Function1<StandardOperation,Boolean> _function_1 = new Function1<StandardOperation,Boolean>() {
- public Boolean apply(final StandardOperation op) {
- boolean _isDestructor = op.isDestructor();
- return ((Boolean)_isDestructor);
- }
- };
- Iterable<StandardOperation> _filter_1 = IterableExtensions.<StandardOperation>filter(_operations_1, _function_1);
- StandardOperation _head_1 = IterableExtensions.<StandardOperation>head(_filter_1);
- final StandardOperation dtor = _head_1;
+ final StandardOperation ctor = IterableExtensions.<StandardOperation>head(_filter);
StringConcatenation _builder = new StringConcatenation();
_builder.append("package ");
String _package = this._roomExtensions.getPackage(dc);
@@ -99,8 +81,7 @@ public class DataClassGen { _builder.append(";");
_builder.newLineIfNotEmpty();
_builder.newLine();
- EList<RoomModel> _referencedModels = root.getReferencedModels(dc);
- EList<RoomModel> models = _referencedModels;
+ EList<RoomModel> models = root.getReferencedModels(dc);
_builder.newLineIfNotEmpty();
{
for(final RoomModel model : models) {
@@ -112,7 +93,7 @@ public class DataClassGen { }
}
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(dc, 1);
+ CharSequence _userCode = this._procedureHelpers.userCode(dc, 1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -122,8 +103,8 @@ public class DataClassGen { _builder.append(_name_1, "");
{
DataClass _base = dc.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
_builder.append(" extends ");
DataClass _base_1 = dc.getBase();
String _name_2 = _base_1.getName();
@@ -135,14 +116,14 @@ public class DataClassGen { _builder.append("\t");
_builder.newLine();
_builder.append("\t");
- StringConcatenation _userCode_1 = this._procedureHelpers.userCode(dc, 2);
+ CharSequence _userCode_1 = this._procedureHelpers.userCode(dc, 2);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _attributes_1 = this._procedureHelpers.attributes(_attributes);
+ CharSequence _attributes_1 = this._procedureHelpers.attributes(_attributes);
_builder.append(_attributes_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -150,15 +131,15 @@ public class DataClassGen { _builder.append("\t");
EList<Attribute> _attributes_2 = dc.getAttributes();
String _name_3 = dc.getName();
- StringConcatenation _attributeSettersGettersImplementation = this._procedureHelpers.attributeSettersGettersImplementation(_attributes_2, _name_3);
+ CharSequence _attributeSettersGettersImplementation = this._procedureHelpers.attributeSettersGettersImplementation(_attributes_2, _name_3);
_builder.append(_attributeSettersGettersImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.newLine();
_builder.append("\t");
- EList<StandardOperation> _operations_2 = dc.getOperations();
+ EList<StandardOperation> _operations_1 = dc.getOperations();
String _name_4 = dc.getName();
- StringConcatenation _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations_2, _name_4);
+ CharSequence _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations_1, _name_4);
_builder.append(_operationsImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -179,12 +160,12 @@ public class DataClassGen { _builder.newLine();
_builder.append("\t\t");
EList<Attribute> _attributes_3 = dc.getAttributes();
- StringConcatenation _attributeInitialization = this._procedureHelpers.attributeInitialization(_attributes_3, true);
+ CharSequence _attributeInitialization = this._procedureHelpers.attributeInitialization(_attributes_3, true);
_builder.append(_attributeInitialization, " ");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(ctor, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(ctor, null));
+ if (_notEquals_1) {
_builder.append("\t\t");
_builder.newLine();
_builder.append("\t\t");
@@ -228,8 +209,8 @@ public class DataClassGen { _builder.newLineIfNotEmpty();
{
DataClass _base_2 = dc.getBase();
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(_base_2, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_2 = (!Objects.equal(_base_2, null));
+ if (_notEquals_2) {
_builder.append("\t\t");
_builder.append("super(");
DataClass _base_3 = dc.getBase();
@@ -299,38 +280,38 @@ public class DataClassGen { }
public String paramList(final DataClass _dc) {
- String result = "";
- DataClass dc = _dc;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(dc, null);
- Boolean _xwhileexpression = _operator_notEquals;
- while (_xwhileexpression) {
- {
- EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _paramList = this.paramList(_attributes);
- String _string = _paramList.toString();
- String _operator_plus = StringExtensions.operator_plus(_string, result);
- result = _operator_plus;
- DataClass _base = dc.getBase();
- dc = _base;
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(dc, null);
- if (_operator_notEquals_1) {
- String _operator_plus_1 = StringExtensions.operator_plus(", ", result);
- result = _operator_plus_1;
- }
+ String result = "";
+ DataClass dc = _dc;
+ boolean _notEquals = (!Objects.equal(dc, null));
+ boolean _while = _notEquals;
+ while (_while) {
+ {
+ EList<Attribute> _attributes = dc.getAttributes();
+ CharSequence _paramList = this.paramList(_attributes);
+ String _string = _paramList.toString();
+ String _plus = (_string + result);
+ result = _plus;
+ DataClass _base = dc.getBase();
+ dc = _base;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ if (_notEquals_1) {
+ String _plus_1 = (", " + result);
+ result = _plus_1;
}
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(dc, null);
- _xwhileexpression = _operator_notEquals_2;
}
- return result;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ _while = _notEquals_1;
+ }
+ return result;
}
- public StringConcatenation paramList(final List<Attribute> attributes) {
+ public CharSequence paramList(final List<Attribute> attributes) {
StringConcatenation _builder = new StringConcatenation();
{
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Attribute a : attributes) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(", ", "");
}
@@ -342,53 +323,53 @@ public class DataClassGen { }
public String argList(final DataClass _dc) {
- String result = "";
- DataClass dc = _dc;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(dc, null);
- Boolean _xwhileexpression = _operator_notEquals;
- while (_xwhileexpression) {
- {
- EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _argList = this._procedureHelpers.argList(_attributes);
- String _string = _argList.toString();
- String _operator_plus = StringExtensions.operator_plus(_string, result);
- result = _operator_plus;
- DataClass _base = dc.getBase();
- dc = _base;
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(dc, null);
- if (_operator_notEquals_1) {
- String _operator_plus_1 = StringExtensions.operator_plus(", ", result);
- result = _operator_plus_1;
- }
+ String result = "";
+ DataClass dc = _dc;
+ boolean _notEquals = (!Objects.equal(dc, null));
+ boolean _while = _notEquals;
+ while (_while) {
+ {
+ EList<Attribute> _attributes = dc.getAttributes();
+ CharSequence _argList = this._procedureHelpers.argList(_attributes);
+ String _string = _argList.toString();
+ String _plus = (_string + result);
+ result = _plus;
+ DataClass _base = dc.getBase();
+ dc = _base;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ if (_notEquals_1) {
+ String _plus_1 = (", " + result);
+ result = _plus_1;
}
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(dc, null);
- _xwhileexpression = _operator_notEquals_2;
}
- return result;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ _while = _notEquals_1;
+ }
+ return result;
}
public String deepCopy(final DataClass _dc) {
- String result = "";
- DataClass dc = _dc;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(dc, null);
- Boolean _xwhileexpression = _operator_notEquals;
- while (_xwhileexpression) {
- {
- EList<Attribute> _attributes = dc.getAttributes();
- StringConcatenation _deepCopy = this.deepCopy(_attributes);
- String _string = _deepCopy.toString();
- String _operator_plus = StringExtensions.operator_plus(_string, result);
- result = _operator_plus;
- DataClass _base = dc.getBase();
- dc = _base;
- }
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(dc, null);
- _xwhileexpression = _operator_notEquals_1;
+ String result = "";
+ DataClass dc = _dc;
+ boolean _notEquals = (!Objects.equal(dc, null));
+ boolean _while = _notEquals;
+ while (_while) {
+ {
+ EList<Attribute> _attributes = dc.getAttributes();
+ CharSequence _deepCopy = this.deepCopy(_attributes);
+ String _string = _deepCopy.toString();
+ String _plus = (_string + result);
+ result = _plus;
+ DataClass _base = dc.getBase();
+ dc = _base;
}
- return result;
+ boolean _notEquals_1 = (!Objects.equal(dc, null));
+ _while = _notEquals_1;
+ }
+ return result;
}
- public StringConcatenation deepCopy(final List<Attribute> attributes) {
+ public CharSequence deepCopy(final List<Attribute> attributes) {
StringConcatenation _builder = new StringConcatenation();
{
for(final Attribute a : attributes) {
@@ -403,8 +384,8 @@ public class DataClassGen { _builder.newLineIfNotEmpty();
{
int _size = a.getSize();
- boolean _operator_equals = ObjectExtensions.operator_equals(((Integer)_size), ((Integer)0));
- if (_operator_equals) {
+ boolean _equals = (_size == 0);
+ if (_equals) {
_builder.append("\t");
_builder.append("copy.");
String _name_1 = a.getName();
@@ -441,8 +422,8 @@ public class DataClassGen { } else {
{
int _size_1 = a.getSize();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(((Integer)_size_1), ((Integer)0));
- if (_operator_equals_1) {
+ boolean _equals_1 = (_size_1 == 0);
+ if (_equals_1) {
_builder.append("copy.");
String _name_6 = a.getName();
_builder.append(_name_6, "");
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java index 79231f74f..0fb47b010 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java @@ -8,26 +8,24 @@ import org.eclipse.etrice.core.room.RoomClass; import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.generator.generic.AbstractTransitionChainGenerator;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.Pair;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class JavaExtensions implements ILanguageExtension {
@Inject
private AbstractTransitionChainGenerator chainGenerator;
public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
- String _generateTypedData = this.chainGenerator.generateTypedData(_data);
- return _generateTypedData;
+ return this.chainGenerator.generateTypedData(_data);
}
public String getJavaFileName(final RoomClass rc) {
String _name = rc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name, ".java");
- return _operator_plus;
+ String _plus = (_name + ".java");
+ return _plus;
}
public String accessLevelPrivate() {
@@ -63,9 +61,8 @@ public class JavaExtensions implements ILanguageExtension { }
public String memberInUse(final String namespace, final String member) {
- String _operator_plus = StringExtensions.operator_plus(namespace, ".");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, member);
- return _operator_plus_1;
+ String _plus = (namespace + ".");
+ return (_plus + member);
}
public boolean usesInheritance() {
@@ -91,7 +88,7 @@ public class JavaExtensions implements ILanguageExtension { }
public String booleanConstant(final boolean b) {
- String _string = ((Boolean)b).toString();
+ String _string = Boolean.valueOf(b).toString();
return _string;
}
@@ -108,10 +105,10 @@ public class JavaExtensions implements ILanguageExtension { }
public String arrayDeclaration(final String type, final int size, final String name, final boolean isRef) {
- String _operator_plus = StringExtensions.operator_plus(type, " ");
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, name);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "[]");
- return _operator_plus_2;
+ String _plus = (type + " ");
+ String _plus_1 = (_plus + name);
+ String _plus_2 = (_plus_1 + "[]");
+ return _plus_2;
}
public String constructorName(final String cls) {
@@ -119,8 +116,8 @@ public class JavaExtensions implements ILanguageExtension { }
public String destructorName(final String cls) {
- String _operator_plus = StringExtensions.operator_plus(cls, "_dtor");
- return _operator_plus;
+ String _plus = (cls + "_dtor");
+ return _plus;
}
public String constructorReturnType() {
@@ -132,16 +129,16 @@ public class JavaExtensions implements ILanguageExtension { }
public String toCharArrayExpr(final String s) {
- String _operator_plus = StringExtensions.operator_plus("\"", s);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "\".toCharArray()");
- return _operator_plus_1;
+ String _plus = ("\"" + s);
+ String _plus_1 = (_plus + "\".toCharArray()");
+ return _plus_1;
}
public String superCall(final String baseClassName, final String method, final String args) {
- String _operator_plus = StringExtensions.operator_plus("super.", method);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "(");
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, args);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, ");");
- return _operator_plus_3;
+ String _plus = ("super." + method);
+ String _plus_1 = (_plus + "(");
+ String _plus_2 = (_plus_1 + args);
+ String _plus_3 = (_plus_2 + ");");
+ return _plus_3;
}
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java index e03ec7cd6..fba8b068e 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java @@ -14,10 +14,9 @@ import org.eclipse.etrice.generator.java.gen.SubSystemClassGen; import org.eclipse.etrice.generator.java.gen.SubSystemRunnerGen;
import org.eclipse.xtext.generator.IFileSystemAccess;
import org.eclipse.xtext.generator.IGenerator;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class MainGen implements IGenerator {
@Inject
private DataClassGen dataClassGen;
@@ -38,24 +37,24 @@ public class MainGen implements IGenerator { private PrepareFileSystem prepFS;
public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- this.prepFS.prepare(resource);
- EList<EObject> _contents = resource.getContents();
- for (final EObject e : _contents) {
- if ((e instanceof Root)) {
- this.doGenerate(((Root) e));
- }
+ this.prepFS.prepare(resource);
+ EList<EObject> _contents = resource.getContents();
+ for (final EObject e : _contents) {
+ if ((e instanceof Root)) {
+ this.doGenerate(((Root) e));
}
+ }
}
public void doGenerate(final Root e) {
- this.dataClassGen.doGenerate(e);
- this.protocolClassGen.doGenerate(e);
- this.actorClassGen.doGenerate(e);
- this.subsystemClassGen.doGenerate(e);
- boolean _isLibrary = e.isLibrary();
- boolean _operator_not = BooleanExtensions.operator_not(_isLibrary);
- if (_operator_not) {
- this.subsystemRunnerGen.doGenerate(e);
- }
+ this.dataClassGen.doGenerate(e);
+ this.protocolClassGen.doGenerate(e);
+ this.actorClassGen.doGenerate(e);
+ this.subsystemClassGen.doGenerate(e);
+ boolean _isLibrary = e.isLibrary();
+ boolean _not = (!_isLibrary);
+ if (_not) {
+ this.subsystemRunnerGen.doGenerate(e);
+ }
}
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java index 4afdc5d52..7b2090992 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.java.gen;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
@@ -25,14 +26,11 @@ import org.eclipse.etrice.generator.generic.RoomExtensions; import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.DataClassGen;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -61,23 +59,21 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { {
String _generationTargetPath = this._roomExtensions.getGenerationTargetPath(pc);
String _path = this._roomExtensions.getPath(pc);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
- String _javaFileName = this._javaExtensions.getJavaFileName(pc);
- String file = _javaFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating ProtocolClass implementation \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String path = (_generationTargetPath + _path);
+ String file = this._javaExtensions.getJavaFileName(pc);
+ String _plus = ("generating ProtocolClass implementation \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
- StringConcatenation _generate = this.generate(root, pc);
+ CharSequence _generate = this.generate(root, pc);
this.fileAccess.generateFile(file, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final ProtocolClass pc) {
+ public CharSequence generate(final Root root, final ProtocolClass pc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("package ");
String _package = this._roomExtensions.getPackage(pc);
@@ -97,12 +93,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("import org.eclipse.etrice.runtime.java.debugging.DebuggingService;");
_builder.newLine();
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(pc, 1);
+ CharSequence _userCode = this._procedureHelpers.userCode(pc, 1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
- EList<RoomModel> _referencedModels = root.getReferencedModels(pc);
- EList<RoomModel> models = _referencedModels;
+ EList<RoomModel> models = root.getReferencedModels(pc);
_builder.newLineIfNotEmpty();
{
for(final RoomModel model : models) {
@@ -128,7 +123,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("\t");
- StringConcatenation _userCode_1 = this._procedureHelpers.userCode(pc, 2);
+ CharSequence _userCode_1 = this._procedureHelpers.userCode(pc, 2);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -185,11 +180,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.newLine();
_builder.append("\t");
- StringConcatenation _portClass = this.portClass(pc, ((Boolean)false));
+ CharSequence _portClass = this.portClass(pc, Boolean.valueOf(false));
_builder.append(_portClass, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
- StringConcatenation _portClass_1 = this.portClass(pc, ((Boolean)true));
+ CharSequence _portClass_1 = this.portClass(pc, Boolean.valueOf(true));
_builder.append(_portClass_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("}");
@@ -197,15 +192,12 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _builder;
}
- public StringConcatenation portClass(final ProtocolClass pc, final Boolean conj) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence portClass(final ProtocolClass pc, final Boolean conj) {
+ CharSequence _xblockexpression = null;
{
- PortClass _portClass = this._roomExtensions.getPortClass(pc, conj);
- PortClass pclass = _portClass;
- String _portClassName = this._roomExtensions.getPortClassName(pc, conj);
- String portClassName = _portClassName;
- String _portClassName_1 = this._roomExtensions.getPortClassName(pc, conj, true);
- String replPortClassName = _portClassName_1;
+ PortClass pclass = this._roomExtensions.getPortClass(pc, (conj).booleanValue());
+ String portClassName = this._roomExtensions.getPortClassName(pc, (conj).booleanValue());
+ String replPortClassName = this._roomExtensions.getPortClassName(pc, (conj).booleanValue(), true);
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
_builder.append("// port class");
@@ -215,11 +207,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append(" extends PortBase {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(pclass, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(pclass, null));
+ if (_notEquals) {
_builder.append("\t");
DetailCode _userCode = pclass.getUserCode();
- StringConcatenation _userCode_1 = this._procedureHelpers.userCode(_userCode);
+ CharSequence _userCode_1 = this._procedureHelpers.userCode(_userCode);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -250,11 +242,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("super(actor, name, localId, idx, addr, peerAddress);");
_builder.newLine();
{
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(pclass, null);
- if (_operator_notEquals_1) {
+ boolean _notEquals_1 = (!Objects.equal(pclass, null));
+ if (_notEquals_1) {
_builder.append("\t\t");
EList<Attribute> _attributes = pclass.getAttributes();
- StringConcatenation _attributeInitialization = this._procedureHelpers.attributeInitialization(_attributes, true);
+ CharSequence _attributeInitialization = this._procedureHelpers.attributeInitialization(_attributes, true);
_builder.append(_attributeInitialization, " ");
_builder.newLineIfNotEmpty();
}
@@ -300,13 +292,13 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("}");
_builder.newLine();
{
- boolean _handlesReceive = this._roomExtensions.handlesReceive(pc, conj);
+ boolean _handlesReceive = this._roomExtensions.handlesReceive(pc, (conj).booleanValue());
if (_handlesReceive) {
_builder.append("\t\t\t\t");
_builder.append("switch (msg.getEvtId()) {");
_builder.newLine();
{
- List<MessageHandler> _receiveHandlers = this._roomExtensions.getReceiveHandlers(pc, conj);
+ List<MessageHandler> _receiveHandlers = this._roomExtensions.getReceiveHandlers(pc, (conj).booleanValue());
for(final MessageHandler hdlr : _receiveHandlers) {
_builder.append("\t\t\t\t");
_builder.append("\t");
@@ -360,7 +352,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("getActor().receiveEvent(this, msg.getEvtId(), null);");
_builder.newLine();
{
- boolean _handlesReceive_1 = this._roomExtensions.handlesReceive(pc, conj);
+ boolean _handlesReceive_1 = this._roomExtensions.handlesReceive(pc, (conj).booleanValue());
if (_handlesReceive_1) {
_builder.append("\t\t\t\t");
_builder.append("}");
@@ -375,11 +367,11 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.newLine();
{
- boolean _operator_notEquals_2 = ObjectExtensions.operator_notEquals(pclass, null);
- if (_operator_notEquals_2) {
+ boolean _notEquals_2 = (!Objects.equal(pclass, null));
+ if (_notEquals_2) {
_builder.append("\t");
EList<Attribute> _attributes_1 = pclass.getAttributes();
- StringConcatenation _attributes_2 = this._procedureHelpers.attributes(_attributes_1);
+ CharSequence _attributes_2 = this._procedureHelpers.attributes(_attributes_1);
_builder.append(_attributes_2, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -387,12 +379,12 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.newLine();
_builder.append("\t");
EList<Attribute> _attributes_3 = pclass.getAttributes();
- StringConcatenation _attributeSettersGettersImplementation = this._procedureHelpers.attributeSettersGettersImplementation(_attributes_3, null);
+ CharSequence _attributeSettersGettersImplementation = this._procedureHelpers.attributeSettersGettersImplementation(_attributes_3, null);
_builder.append(_attributeSettersGettersImplementation, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
EList<PortOperation> _operations = pclass.getOperations();
- StringConcatenation _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations, portClassName);
+ CharSequence _operationsImplementation = this._procedureHelpers.operationsImplementation(_operations, portClassName);
_builder.append(_operationsImplementation, " ");
_builder.newLineIfNotEmpty();
}
@@ -403,10 +395,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("// sent messages");
_builder.newLine();
{
- List<Message> _outgoing = this._roomExtensions.getOutgoing(pc, conj);
+ List<Message> _outgoing = this._roomExtensions.getOutgoing(pc, (conj).booleanValue());
for(final Message m : _outgoing) {
_builder.append("\t");
- StringConcatenation _sendMessage = this.sendMessage(m, conj);
+ CharSequence _sendMessage = this.sendMessage(m, (conj).booleanValue());
_builder.append(_sendMessage, " ");
_builder.newLineIfNotEmpty();
}
@@ -503,7 +495,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
_builder.newLine();
{
- if (conj) {
+ if ((conj).booleanValue()) {
_builder.append("\t");
_builder.append("// incoming messages");
_builder.newLine();
@@ -511,7 +503,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { List<Message> _allIncomingMessages = this._roomExtensions.getAllIncomingMessages(pc);
for(final Message m_1 : _allIncomingMessages) {
_builder.append("\t");
- StringConcatenation _messageSignature = this.messageSignature(m_1);
+ CharSequence _messageSignature = this.messageSignature(m_1);
_builder.append(_messageSignature, " ");
_builder.append("{");
_builder.newLineIfNotEmpty();
@@ -522,7 +514,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
_builder.append("\t\t");
_builder.append("ports.get(i).");
- StringConcatenation _messageCall = this.messageCall(m_1);
+ CharSequence _messageCall = this.messageCall(m_1);
_builder.append(_messageCall, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -543,7 +535,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { List<Message> _allOutgoingMessages = this._roomExtensions.getAllOutgoingMessages(pc);
for(final Message m_2 : _allOutgoingMessages) {
_builder.append("\t");
- StringConcatenation _messageSignature_1 = this.messageSignature(m_2);
+ CharSequence _messageSignature_1 = this.messageSignature(m_2);
_builder.append(_messageSignature_1, " ");
_builder.append("{");
_builder.newLineIfNotEmpty();
@@ -554,7 +546,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
_builder.append("\t\t");
_builder.append("ports.get(i).");
- StringConcatenation _messageCall_1 = this.messageCall(m_2);
+ CharSequence _messageCall_1 = this.messageCall(m_2);
_builder.append(_messageCall_1, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -577,7 +569,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- public StringConcatenation messageSignature(final Message m) {
+ public CharSequence messageSignature(final Message m) {
StringConcatenation _builder = new StringConcatenation();
{
boolean _isPriv = m.isPriv();
@@ -593,8 +585,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("(");
{
VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_data, null));
+ if (_notEquals) {
VarDecl _data_1 = m.getData();
RefableType _refType = _data_1.getRefType();
DataType _type = _refType.getType();
@@ -610,8 +602,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _builder;
}
- public StringConcatenation messageSignatureExplicit(final Message m) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence messageSignatureExplicit(final Message m) {
+ CharSequence _xblockexpression = null;
{
VarDecl _data = m.getData();
RefableType _refType = _data.getRefType();
@@ -630,15 +622,15 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _xblockexpression;
}
- public StringConcatenation messageCall(final Message m) {
+ public CharSequence messageCall(final Message m) {
StringConcatenation _builder = new StringConcatenation();
String _name = m.getName();
_builder.append(_name, "");
_builder.append("(");
{
VarDecl _data = m.getData();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_data, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_data, null));
+ if (_notEquals) {
_builder.append(" ");
VarDecl _data_1 = m.getData();
String _name_1 = _data_1.getName();
@@ -649,8 +641,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { return _builder;
}
- public StringConcatenation sendMessage(final Message m, final boolean conj) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence sendMessage(final Message m, final boolean conj) {
+ CharSequence _xblockexpression = null;
{
String _xifexpression = null;
if (conj) {
@@ -659,16 +651,15 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _xifexpression = "OUT";
}
String dir = _xifexpression;
- MessageHandler _sendHandler = this._roomExtensions.getSendHandler(m, conj);
- MessageHandler hdlr = _sendHandler;
+ MessageHandler hdlr = this._roomExtensions.getSendHandler(m, conj);
StringConcatenation _builder = new StringConcatenation();
- StringConcatenation _messageSignature = this.messageSignature(m);
+ CharSequence _messageSignature = this.messageSignature(m);
_builder.append(_messageSignature, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(hdlr, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(hdlr, null));
+ if (_notEquals) {
_builder.append("\t");
{
DetailCode _detailCode = hdlr.getDetailCode();
@@ -706,8 +697,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("\t");
{
VarDecl _data = m.getData();
- boolean _operator_equals = ObjectExtensions.operator_equals(_data, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_data, null);
+ if (_equals) {
_builder.append("getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), ");
_builder.append(dir, " ");
_builder.append("_");
@@ -728,21 +719,21 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { String _name_4 = _data_1.getName();
_builder.append(_name_4, " ");
{
- boolean _operator_and = false;
+ boolean _and = false;
VarDecl _data_2 = m.getData();
RefableType _refType = _data_2.getRefType();
boolean _isRef = _refType.isRef();
- boolean _operator_not = BooleanExtensions.operator_not(_isRef);
- if (!_operator_not) {
- _operator_and = false;
+ boolean _not = (!_isRef);
+ if (!_not) {
+ _and = false;
} else {
VarDecl _data_3 = m.getData();
RefableType _refType_1 = _data_3.getRefType();
DataType _type = _refType_1.getType();
- boolean _operator_not_1 = BooleanExtensions.operator_not((_type instanceof PrimitiveType));
- _operator_and = BooleanExtensions.operator_and(_operator_not, _operator_not_1);
+ boolean _not_1 = (!(_type instanceof PrimitiveType));
+ _and = (_not && _not_1);
}
- if (_operator_and) {
+ if (_and) {
_builder.append(".deepCopy()");
}
}
@@ -755,19 +746,19 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append("}");
_builder.newLine();
{
- boolean _operator_and_1 = false;
+ boolean _and_1 = false;
VarDecl _data_4 = m.getData();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_data_4, null);
- if (!_operator_notEquals_1) {
- _operator_and_1 = false;
+ boolean _notEquals_1 = (!Objects.equal(_data_4, null));
+ if (!_notEquals_1) {
+ _and_1 = false;
} else {
VarDecl _data_5 = m.getData();
RefableType _refType_2 = _data_5.getRefType();
DataType _type_1 = _refType_2.getType();
- _operator_and_1 = BooleanExtensions.operator_and(_operator_notEquals_1, (_type_1 instanceof DataClass));
+ _and_1 = (_notEquals_1 && (_type_1 instanceof DataClass));
}
- if (_operator_and_1) {
- StringConcatenation _messageSignatureExplicit = this.messageSignatureExplicit(m);
+ if (_and_1) {
+ CharSequence _messageSignatureExplicit = this.messageSignatureExplicit(m);
_builder.append(_messageSignatureExplicit, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.smap b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.smap new file mode 100644 index 000000000..d4ade3156 --- /dev/null +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.smap @@ -0,0 +1,160 @@ +SMAP +ProtocolClassGen.java +Xtend +*S Xtend +*F ++ 0 ProtocolClassGen.xtend +src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend +*L +43:57,3 +44:60,3 +45:63 +46:64,5 +47:69 +48:70,2 +43:72,2 +52:77,2 +53:79,17 +62:96,4 +64:100,2 +52:102 +65:103,6 +52:109,2 +66:111,2 +68:113,8 +70:121,5 +72:126,6 +52:132 +74:133,6 +52:139,2 +74:141 +52:142 +74:143,6 +52:149,2 +74:151,32 +86:183,4 +87:187,5 +52:192 +92:196,2 +93:198 +94:199 +95:200 +92:201 +96:202,4 +99:206,3 +92:209 +100:210,3 +101:213,4 +92:217,2 +102:219,5 +104:224,14 +108:238,6 +92:244 +110:245,3 +111:248,4 +92:252,2 +112:254,40 +92:294 +128:295,5 +92:300 +130:301,5 +131:306,9 +92:315 +133:316,6 +134:322,2 +92:324,2 +135:326,8 +92:334,2 +138:336,4 +92:340,2 +140:342,12 +92:354 +145:355,5 +92:360,2 +147:362,7 +92:369 +151:370,3 +152:373,8 +154:381,5 +155:386,4 +92:390,2 +156:392,5 +92:397 +159:398,3 +160:401,3 +92:404,2 +161:406,6 +165:412,5 +166:417,9 +169:426,11 +172:437,11 +174:448,38 +187:486,11 +92:497 +191:498,4 +92:502 +193:503,3 +194:506,11 +196:517,11 +92:528,3 +200:531,3 +92:534 +202:535,3 +203:538,11 +205:549,11 +92:560,4 +209:564,3 +96:567 +92:568,2 +227:573,2 +228:575,3 +227:578 +228:579 +227:580,2 +228:582,4 +227:586 +228:587,12 +227:599,2 +228:601,2 +231:606,2 +232:608,4 +231:612 +233:613,8 +231:621,2 +236:626 +237:627,3 +236:630 +237:631,7 +236:638,2 +237:640,2 +240:645,2 +241:647,7 +242:654 +240:655 +244:656,4 +240:660 +245:661,3 +240:664 +246:665,6 +240:671,3 +248:674,2 +249:676,8 +251:684,14 +240:698 +254:699,12 +240:711 +255:712,9 +240:721 +255:722,16 +240:738,2 +255:740,2 +240:742,4 +257:746,2 +240:748 +259:749,12 +260:761,5 +261:766,18 +240:784,2 +243:786 +240:787,2 +*E diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java index 08aad54d1..bb397d606 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java @@ -8,29 +8,28 @@ import org.eclipse.etrice.core.room.ActorClass; import org.eclipse.etrice.core.room.State;
import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator;
import org.eclipse.etrice.generator.generic.RoomExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
+import org.eclipse.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class StateMachineGen extends GenericStateMachineGenerator {
@Inject
private RoomExtensions _roomExtensions;
- public StringConcatenation genExtra(final ExpandedActorClass xpac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence genExtra(final ExpandedActorClass xpac) {
+ CharSequence _xblockexpression = null;
{
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
+ final ActorClass ac = xpac.getActorClass();
StringConcatenation _builder = new StringConcatenation();
_builder.append("// state names");
_builder.newLine();
_builder.append("protected static final String stateStrings[] = {\"<no state>\",\"<top>\",");
{
List<State> _allBaseStatesLeavesLast = this._roomExtensions.getAllBaseStatesLeavesLast(ac);
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final State state : _allBaseStatesLeavesLast) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", "");
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java index 38b9228e5..7703de03c 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java @@ -27,14 +27,11 @@ import org.eclipse.etrice.generator.generic.ProcedureHelpers; import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class SubSystemClassGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -65,25 +62,23 @@ public class SubSystemClassGen { String _generationTargetPath = this._roomExtensions.getGenerationTargetPath(_subSystemClass);
SubSystemClass _subSystemClass_1 = ssi.getSubSystemClass();
String _path = this._roomExtensions.getPath(_subSystemClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- String path = _operator_plus;
+ String path = (_generationTargetPath + _path);
SubSystemClass _subSystemClass_2 = ssi.getSubSystemClass();
- String _javaFileName = this._javaExtensions.getJavaFileName(_subSystemClass_2);
- String file = _javaFileName;
- String _operator_plus_1 = StringExtensions.operator_plus("generating SubSystemClass implementation: \'", file);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "\' in \'");
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, path);
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, "\'");
- this.logger.logInfo(_operator_plus_4);
+ String file = this._javaExtensions.getJavaFileName(_subSystemClass_2);
+ String _plus = ("generating SubSystemClass implementation: \'" + file);
+ String _plus_1 = (_plus + "\' in \'");
+ String _plus_2 = (_plus_1 + path);
+ String _plus_3 = (_plus_2 + "\'");
+ this.logger.logInfo(_plus_3);
this.fileAccess.setOutputPath(path);
SubSystemClass _subSystemClass_3 = ssi.getSubSystemClass();
- StringConcatenation _generate = this.generate(root, ssi, _subSystemClass_3);
+ CharSequence _generate = this.generate(root, ssi, _subSystemClass_3);
this.fileAccess.generateFile(file, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final SubSystemInstance comp, final SubSystemClass cc) {
+ public CharSequence generate(final Root root, final SubSystemInstance comp, final SubSystemClass cc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("package ");
String _package = this._roomExtensions.getPackage(cc);
@@ -108,8 +103,7 @@ public class SubSystemClassGen { _builder.append("import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;");
_builder.newLine();
_builder.newLine();
- EList<RoomModel> _referencedModels = root.getReferencedModels(cc);
- EList<RoomModel> models = _referencedModels;
+ EList<RoomModel> models = root.getReferencedModels(cc);
_builder.newLineIfNotEmpty();
{
for(final RoomModel model : models) {
@@ -122,7 +116,7 @@ public class SubSystemClassGen { _builder.newLineIfNotEmpty();
_builder.newLine();
_builder.newLine();
- StringConcatenation _userCode = this._procedureHelpers.userCode(cc, 1);
+ CharSequence _userCode = this._procedureHelpers.userCode(cc, 1);
_builder.append(_userCode, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -133,7 +127,7 @@ public class SubSystemClassGen { _builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("\t");
- StringConcatenation _userCode_1 = this._procedureHelpers.userCode(cc, 2);
+ CharSequence _userCode_1 = this._procedureHelpers.userCode(cc, 2);
_builder.append(_userCode_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -181,8 +175,8 @@ public class SubSystemClassGen { _builder.append("RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, ");
EList<LogicalThread> _threads_1 = cc.getThreads();
int _indexOf = _threads_1.indexOf(thread);
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_indexOf), ((Integer)1));
- _builder.append(_operator_plus, " ");
+ int _plus = (_indexOf + 1);
+ _builder.append(_plus, " ");
_builder.append(", 0),\"MessageService_");
String _name_3 = thread.getName();
_builder.append(_name_3, " ");
@@ -270,8 +264,7 @@ public class SubSystemClassGen { for(final InterfaceItemInstance peer : _peers) {
_builder.append("\t\t");
EList<InterfaceItemInstance> _peers_1 = pi.getPeers();
- int _indexOf_2 = _peers_1.indexOf(peer);
- int i = _indexOf_2;
+ int i = _peers_1.indexOf(peer);
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("Address addr_item_");
@@ -285,8 +278,8 @@ public class SubSystemClassGen { _builder.append(_threadId_1, " ");
_builder.append(",");
int _objId_1 = pi.getObjId();
- int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)_objId_1), ((Integer)i));
- _builder.append(_operator_plus_1, " ");
+ int _plus_1 = (_objId_1 + i);
+ _builder.append(_plus_1, " ");
_builder.append(");");
_builder.newLineIfNotEmpty();
}
@@ -328,8 +321,8 @@ public class SubSystemClassGen { _builder.append("\t\t");
_builder.append("instances[");
EList<ActorInstance> _allContainedInstances_5 = comp.getAllContainedInstances();
- int _indexOf_3 = _allContainedInstances_5.indexOf(ai_2);
- _builder.append(_indexOf_3, " ");
+ int _indexOf_2 = _allContainedInstances_5.indexOf(ai_2);
+ _builder.append(_indexOf_2, " ");
_builder.append("] = new ");
ActorClass _actorClass = ai_2.getActorClass();
String _name_4 = _actorClass.getName();
@@ -349,8 +342,8 @@ public class SubSystemClassGen { _builder.append("instances[");
EList<ActorInstance> _allContainedInstances_6 = comp.getAllContainedInstances();
EObject _eContainer_1 = ai_2.eContainer();
- int _indexOf_4 = _allContainedInstances_6.indexOf(_eContainer_1);
- _builder.append(_indexOf_4, " ");
+ int _indexOf_3 = _allContainedInstances_6.indexOf(_eContainer_1);
+ _builder.append(_indexOf_3, " ");
_builder.append("],");
_builder.newLineIfNotEmpty();
}
@@ -376,18 +369,18 @@ public class SubSystemClassGen { {
EList<InterfaceItemInstance> _orderedIfItemInstances_1 = ai_2.getOrderedIfItemInstances();
boolean _isEmpty = _orderedIfItemInstances_1.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append(",");
}
}
_builder.newLineIfNotEmpty();
{
EList<InterfaceItemInstance> _orderedIfItemInstances_2 = ai_2.getOrderedIfItemInstances();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final InterfaceItemInstance pi_1 : _orderedIfItemInstances_2) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -409,10 +402,10 @@ public class SubSystemClassGen { _builder.newLine();
{
EList<InterfaceItemInstance> _peers_3 = pi_1.getPeers();
- boolean hasAnyElements_1 = false;
+ boolean _hasElements_1 = false;
for(final InterfaceItemInstance peer_1 : _peers_3) {
- if (!hasAnyElements_1) {
- hasAnyElements_1 = true;
+ if (!_hasElements_1) {
+ _hasElements_1 = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -425,8 +418,8 @@ public class SubSystemClassGen { _builder.append(_pathName_4, " ");
_builder.append("_");
EList<InterfaceItemInstance> _peers_4 = pi_1.getPeers();
- int _indexOf_5 = _peers_4.indexOf(peer_1);
- _builder.append(_indexOf_5, " ");
+ int _indexOf_4 = _peers_4.indexOf(peer_1);
+ _builder.append(_indexOf_4, " ");
_builder.newLineIfNotEmpty();
}
}
@@ -469,38 +462,38 @@ public class SubSystemClassGen { _builder.append("\t");
_builder.append("new Address[][] {{addr_item_SystemPort_");
EList<ActorInstance> _allContainedInstances_7 = comp.getAllContainedInstances();
- int _indexOf_6 = _allContainedInstances_7.indexOf(ai_2);
- _builder.append(_indexOf_6, " ");
+ int _indexOf_5 = _allContainedInstances_7.indexOf(ai_2);
+ _builder.append(_indexOf_5, " ");
_builder.append("}");
{
EList<InterfaceItemInstance> _orderedIfItemInstances_3 = ai_2.getOrderedIfItemInstances();
boolean _isEmpty_2 = _orderedIfItemInstances_3.isEmpty();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_2);
- if (_operator_not_1) {
+ boolean _not_1 = (!_isEmpty_2);
+ if (_not_1) {
_builder.append(",");
}
}
_builder.newLineIfNotEmpty();
{
EList<InterfaceItemInstance> _orderedIfItemInstances_4 = ai_2.getOrderedIfItemInstances();
- boolean hasAnyElements_2 = false;
+ boolean _hasElements_2 = false;
for(final InterfaceItemInstance pi_2 : _orderedIfItemInstances_4) {
- if (!hasAnyElements_2) {
- hasAnyElements_2 = true;
+ if (!_hasElements_2) {
+ _hasElements_2 = true;
} else {
_builder.appendImmediate(",", " ");
}
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _isReplicated_2 = pi_2.isReplicated();
if (!_isReplicated_2) {
- _operator_and = false;
+ _and = false;
} else {
EList<InterfaceItemInstance> _peers_5 = pi_2.getPeers();
boolean _isEmpty_3 = _peers_5.isEmpty();
- _operator_and = BooleanExtensions.operator_and(_isReplicated_2, _isEmpty_3);
+ _and = (_isReplicated_2 && _isEmpty_3);
}
- if (_operator_and) {
+ if (_and) {
_builder.append("\t\t");
_builder.append("\t\t");
_builder.append("null");
@@ -522,10 +515,10 @@ public class SubSystemClassGen { } else {
{
EList<InterfaceItemInstance> _peers_7 = pi_2.getPeers();
- boolean hasAnyElements_3 = false;
+ boolean _hasElements_3 = false;
for(final InterfaceItemInstance pp : _peers_7) {
- if (!hasAnyElements_3) {
- hasAnyElements_3 = true;
+ if (!_hasElements_3) {
+ _hasElements_3 = true;
} else {
_builder.appendImmediate(",", " ");
}
@@ -541,8 +534,8 @@ public class SubSystemClassGen { _builder.append(_pathName_6, " ");
_builder.append("_");
EList<InterfaceItemInstance> _peers_8 = pp.getPeers();
- int _indexOf_7 = _peers_8.indexOf(pi_2);
- _builder.append(_indexOf_7, " ");
+ int _indexOf_6 = _peers_8.indexOf(pi_2);
+ _builder.append(_indexOf_6, " ");
_builder.newLineIfNotEmpty();
} else {
_builder.append("\t\t");
@@ -585,25 +578,23 @@ public class SubSystemClassGen { EList<ActorInstance> _allContainedInstances_8 = comp.getAllContainedInstances();
for(final ActorInstance ai_3 : _allContainedInstances_8) {
_builder.append("\t\t");
- List<AttrInstanceConfig> _configAttributes = this._configExtension.getConfigAttributes(ai_3);
- List<AttrInstanceConfig> attrConfigs = _configAttributes;
+ List<AttrInstanceConfig> attrConfigs = this._configExtension.getConfigAttributes(ai_3);
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
- List<PortInstanceConfig> _configPorts = this._configExtension.getConfigPorts(ai_3);
- List<PortInstanceConfig> portConfigs = _configPorts;
+ List<PortInstanceConfig> portConfigs = this._configExtension.getConfigPorts(ai_3);
_builder.newLineIfNotEmpty();
{
- boolean _operator_or = false;
+ boolean _or = false;
boolean _isEmpty_5 = attrConfigs.isEmpty();
- boolean _operator_not_2 = BooleanExtensions.operator_not(_isEmpty_5);
- if (_operator_not_2) {
- _operator_or = true;
+ boolean _not_2 = (!_isEmpty_5);
+ if (_not_2) {
+ _or = true;
} else {
boolean _isEmpty_6 = portConfigs.isEmpty();
- boolean _operator_not_3 = BooleanExtensions.operator_not(_isEmpty_6);
- _operator_or = BooleanExtensions.operator_or(_operator_not_2, _operator_not_3);
+ boolean _not_3 = (!_isEmpty_6);
+ _or = (_not_2 || _not_3);
}
- if (_operator_or) {
+ if (_or) {
_builder.append("\t\t");
_builder.append("{");
_builder.newLine();
@@ -624,27 +615,25 @@ public class SubSystemClassGen { _builder.append(_name_7, " ");
_builder.append(") instances[");
EList<ActorInstance> _allContainedInstances_9 = comp.getAllContainedInstances();
- int _indexOf_8 = _allContainedInstances_9.indexOf(ai_3);
- _builder.append(_indexOf_8, " ");
+ int _indexOf_7 = _allContainedInstances_9.indexOf(ai_3);
+ _builder.append(_indexOf_7, " ");
_builder.append("];");
_builder.newLineIfNotEmpty();
{
for(final AttrInstanceConfig attrConfig : attrConfigs) {
_builder.append("\t\t");
_builder.append("\t");
- Attribute _attribute = attrConfig.getAttribute();
- Attribute a = _attribute;
+ Attribute a = attrConfig.getAttribute();
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("\t");
LiteralArray _value_1 = attrConfig.getValue();
- String _stringValue = this._configExtension.stringValue(_value_1, a);
- String value = _stringValue;
+ String value = this._configExtension.stringValue(_value_1, a);
_builder.newLineIfNotEmpty();
{
boolean _isArray = this._configExtension.isArray(a);
- boolean _operator_not_4 = BooleanExtensions.operator_not(_isArray);
- if (_operator_not_4) {
+ boolean _not_4 = (!_isArray);
+ if (_not_4) {
_builder.append("\t\t");
_builder.append("\t");
_builder.append(aiName, " ");
@@ -652,7 +641,7 @@ public class SubSystemClassGen { String _name_8 = a.getName();
ActorClass _actorClass_3 = ai_3.getActorClass();
String _name_9 = _actorClass_3.getName();
- StringConcatenation _invokeSetter = this._procedureHelpers.invokeSetter(_name_8, _name_9, value);
+ CharSequence _invokeSetter = this._procedureHelpers.invokeSetter(_name_8, _name_9, value);
_builder.append(_invokeSetter, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -669,10 +658,10 @@ public class SubSystemClassGen { RefableType _refType = a.getRefType();
DataType _type = _refType.getType();
String _typeName = this._typeHelpers.typeName(_type);
- String _operator_plus_2 = StringExtensions.operator_plus("new ", _typeName);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "[]");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, value);
- StringConcatenation _invokeSetter_1 = this._procedureHelpers.invokeSetter(_name_10, _name_11, _operator_plus_4);
+ String _plus_2 = ("new " + _typeName);
+ String _plus_3 = (_plus_2 + "[]");
+ String _plus_4 = (_plus_3 + value);
+ CharSequence _invokeSetter_1 = this._procedureHelpers.invokeSetter(_name_10, _name_11, _plus_4);
_builder.append(_invokeSetter_1, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -694,7 +683,7 @@ public class SubSystemClassGen { String _name_12 = a.getName();
ActorClass _actorClass_5 = ai_3.getActorClass();
String _name_13 = _actorClass_5.getName();
- StringConcatenation _invokeGetter = this._procedureHelpers.invokeGetter(_name_12, _name_13);
+ CharSequence _invokeGetter = this._procedureHelpers.invokeGetter(_name_12, _name_13);
_builder.append(_invokeGetter, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -731,44 +720,39 @@ public class SubSystemClassGen { for(final PortInstanceConfig portConfig : portConfigs) {
_builder.append("\t\t");
_builder.append("\t");
- String portName = "port";
- InterfaceItem _item = portConfig.getItem();
- InterfaceItem item = _item;
+ InterfaceItem item = portConfig.getItem();
_builder.newLineIfNotEmpty();
{
EList<AttrInstanceConfig> _attributes = portConfig.getAttributes();
for(final AttrInstanceConfig attrConfig_1 : _attributes) {
_builder.append("\t\t");
_builder.append("\t");
- Attribute _attribute_1 = attrConfig_1.getAttribute();
- Attribute a_1 = _attribute_1;
+ Attribute a_1 = attrConfig_1.getAttribute();
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("\t");
LiteralArray _value_2 = attrConfig_1.getValue();
- String _stringValue_1 = this._configExtension.stringValue(_value_2, a_1);
- String value_1 = _stringValue_1;
+ String value_1 = this._configExtension.stringValue(_value_2, a_1);
_builder.newLineIfNotEmpty();
_builder.append("\t\t");
_builder.append("\t");
- String _operator_plus_5 = StringExtensions.operator_plus(aiName, ".");
+ String _plus_5 = (aiName + ".");
String _name_14 = item.getName();
String _portClassName = this._roomExtensions.getPortClassName(item);
- StringConcatenation _invokeGetter_1 = this._procedureHelpers.invokeGetter(_name_14, _portClassName);
- String _operator_plus_6 = StringExtensions.operator_plus(_operator_plus_5, _invokeGetter_1);
- String refToItem = _operator_plus_6;
+ CharSequence _invokeGetter_1 = this._procedureHelpers.invokeGetter(_name_14, _portClassName);
+ String refToItem = (_plus_5 + _invokeGetter_1);
_builder.newLineIfNotEmpty();
{
boolean _isArray_1 = this._configExtension.isArray(a_1);
- boolean _operator_not_5 = BooleanExtensions.operator_not(_isArray_1);
- if (_operator_not_5) {
+ boolean _not_5 = (!_isArray_1);
+ if (_not_5) {
_builder.append("\t\t");
_builder.append("\t");
_builder.append(refToItem, " ");
_builder.append(".");
String _name_15 = a_1.getName();
String _portClassName_1 = this._roomExtensions.getPortClassName(item);
- StringConcatenation _invokeSetter_2 = this._procedureHelpers.invokeSetter(_name_15, _portClassName_1, value_1);
+ CharSequence _invokeSetter_2 = this._procedureHelpers.invokeSetter(_name_15, _portClassName_1, value_1);
_builder.append(_invokeSetter_2, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -785,10 +769,10 @@ public class SubSystemClassGen { RefableType _refType_2 = a_1.getRefType();
DataType _type_2 = _refType_2.getType();
String _typeName_2 = this._typeHelpers.typeName(_type_2);
- String _operator_plus_7 = StringExtensions.operator_plus("new ", _typeName_2);
- String _operator_plus_8 = StringExtensions.operator_plus(_operator_plus_7, "[]");
- String _operator_plus_9 = StringExtensions.operator_plus(_operator_plus_8, value_1);
- StringConcatenation _invokeSetter_3 = this._procedureHelpers.invokeSetter(_name_16, _name_17, _operator_plus_9);
+ String _plus_6 = ("new " + _typeName_2);
+ String _plus_7 = (_plus_6 + "[]");
+ String _plus_8 = (_plus_7 + value_1);
+ CharSequence _invokeSetter_3 = this._procedureHelpers.invokeSetter(_name_16, _name_17, _plus_8);
_builder.append(_invokeSetter_3, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -810,7 +794,7 @@ public class SubSystemClassGen { String _name_18 = a_1.getName();
ActorClass _actorClass_7 = ai_3.getActorClass();
String _name_19 = _actorClass_7.getName();
- StringConcatenation _invokeGetter_2 = this._procedureHelpers.invokeGetter(_name_18, _name_19);
+ CharSequence _invokeGetter_2 = this._procedureHelpers.invokeGetter(_name_18, _name_19);
_builder.append(_invokeGetter_2, " ");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -870,18 +854,18 @@ public class SubSystemClassGen { _builder.newLine();
{
EList<ActorInstance> _allContainedInstances_10 = comp.getAllContainedInstances();
- boolean hasAnyElements_4 = false;
+ boolean _hasElements_4 = false;
for(final ActorInstance ai_4 : _allContainedInstances_10) {
- if (!hasAnyElements_4) {
- hasAnyElements_4 = true;
+ if (!_hasElements_4) {
+ _hasElements_4 = true;
} else {
_builder.appendImmediate(",", " ");
}
_builder.append("\t\t\t\t\t");
_builder.append("addr_item_SystemPort_");
EList<ActorInstance> _allContainedInstances_11 = comp.getAllContainedInstances();
- int _indexOf_9 = _allContainedInstances_11.indexOf(ai_4);
- _builder.append(_indexOf_9, " ");
+ int _indexOf_8 = _allContainedInstances_11.indexOf(ai_4);
+ _builder.append(_indexOf_8, " ");
_builder.newLineIfNotEmpty();
}
}
@@ -896,10 +880,10 @@ public class SubSystemClassGen { _builder.newLine();
{
EList<ActorInstance> _allContainedInstances_12 = comp.getAllContainedInstances();
- boolean hasAnyElements_5 = false;
+ boolean _hasElements_5 = false;
for(final ActorInstance ai_5 : _allContainedInstances_12) {
- if (!hasAnyElements_5) {
- hasAnyElements_5 = true;
+ if (!_hasElements_5) {
+ _hasElements_5 = true;
} else {
_builder.appendImmediate(",", " ");
}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java index e1916f03d..99ffe08aa 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java @@ -7,12 +7,11 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root; import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance;
import org.eclipse.etrice.core.room.SubSystemClass;
import org.eclipse.etrice.generator.generic.RoomExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class SubSystemRunnerGen {
@Inject
private JavaIoFileSystemAccess fileAccess;
@@ -28,18 +27,18 @@ public class SubSystemRunnerGen { String _generationTargetPath = this.roomExt.getGenerationTargetPath(_subSystemClass);
SubSystemClass _subSystemClass_1 = sc.getSubSystemClass();
String _path = this.roomExt.getPath(_subSystemClass_1);
- String _operator_plus = StringExtensions.operator_plus(_generationTargetPath, _path);
- this.fileAccess.setOutputPath(_operator_plus);
+ String _plus = (_generationTargetPath + _path);
+ this.fileAccess.setOutputPath(_plus);
String _name = sc.getName();
- String _operator_plus_1 = StringExtensions.operator_plus(_name, "Runner.java");
+ String _plus_1 = (_name + "Runner.java");
SubSystemClass _subSystemClass_2 = sc.getSubSystemClass();
- StringConcatenation _generate = this.generate(root, sc, _subSystemClass_2);
- this.fileAccess.generateFile(_operator_plus_1, _generate);
+ CharSequence _generate = this.generate(root, sc, _subSystemClass_2);
+ this.fileAccess.generateFile(_plus_1, _generate);
}
}
}
- public StringConcatenation generate(final Root root, final SubSystemInstance ssc, final SubSystemClass cc) {
+ public CharSequence generate(final Root root, final SubSystemInstance ssc, final SubSystemClass cc) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/**");
_builder.newLine();
@@ -75,8 +74,8 @@ public class SubSystemRunnerGen { _builder.newLine();
_builder.append("class ");
String _name_2 = ssc.getName();
- String _operator_plus = StringExtensions.operator_plus(_name_2, "Runner");
- _builder.append(_operator_plus, "");
+ String _plus = (_name_2 + "Runner");
+ _builder.append(_plus, "");
_builder.append(" extends SubSystemRunnerBase {");
_builder.newLineIfNotEmpty();
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator/.gitignore b/plugins/org.eclipse.etrice.generator/.gitignore index 092357e47..d1b2f933f 100644 --- a/plugins/org.eclipse.etrice.generator/.gitignore +++ b/plugins/org.eclipse.etrice.generator/.gitignore @@ -1 +1,2 @@ bin
+*._trace
diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF index e71a6478c..7b0bd006b 100644 --- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0", org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.xtext.generator;bundle-version="2.1.1",
org.eclipse.xtext;bundle-version="2.1.1",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
+ org.eclipse.xtend.lib;bundle-version="2.3.0",
org.eclipse.etrice.core.config;bundle-version="0.2.0"
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.etrice.generator.generic
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend index 4449d76df..921999223 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend @@ -255,7 +255,6 @@ class GenericStateMachineGenerator { var async = xpac.actorClass.commType==ActorCommunicationType::ASYNCHRONOUS
var eventDriven = xpac.actorClass.commType==ActorCommunicationType::EVENT_DRIVEN
var dataDriven = xpac.actorClass.commType==ActorCommunicationType::DATA_DRIVEN
- var handleEvents = async || eventDriven
'''
switch («langExt.memberAccess»state) {
«FOR state : xpac.stateMachine.getLeafStateList()»
@@ -404,4 +403,4 @@ class GenericStateMachineGenerator { '''
}
-}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend index ab59f7054..ae3ff2919 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend @@ -226,11 +226,11 @@ class RoomExtensions { p.name + (if (conj) "Conj" else "") + (if (repl) "Repl" else "") +"Port"
}
- def String getPortClassName(ExternalPort p){
+ def dispatch String getPortClassName(ExternalPort p){
return p.ifport.getPortClassName()
}
- def String getPortClassName(ServiceImplementation svc) {
+ def dispatch String getPortClassName(ServiceImplementation svc) {
return svc.spp.protocol.getPortClassName(false, true)
}
@@ -576,4 +576,4 @@ class RoomExtensions { return result;
}
-}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java index ee1fc5835..e930c7ba2 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ConfigExtension.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.generic;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.ArrayList;
@@ -30,73 +31,56 @@ import org.eclipse.etrice.core.room.ProtocolClass; import org.eclipse.etrice.core.room.RefableType;
import org.eclipse.etrice.generator.base.ConfigHelper;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class ConfigExtension {
@Inject
private ILanguageExtension languageExt;
public String getInitValue(final Attribute a) {
- String _configDefaultValue = this.getConfigDefaultValue(a);
- String value = _configDefaultValue;
- boolean _operator_equals = ObjectExtensions.operator_equals(value, null);
- if (_operator_equals) {
- String _defaultValueLiteral = a.getDefaultValueLiteral();
- value = _defaultValueLiteral;
- }
- return value;
+ String value = this.getConfigDefaultValue(a);
+ boolean _equals = Objects.equal(value, null);
+ if (_equals) {
+ String _defaultValueLiteral = a.getDefaultValueLiteral();
+ value = _defaultValueLiteral;
+ }
+ return value;
}
public String getConfigDefaultValue(final Attribute attr) {
- String _xifexpression = null;
EObject _eContainer = attr.eContainer();
if ((_eContainer instanceof ActorClass)) {
- {
- EObject _eContainer_1 = attr.eContainer();
- ActorClass ac = ((ActorClass) _eContainer_1);
- ActorClassConfig _classConfig = this.getClassConfig(ac);
- EList<AttrClassConfig> _attributes = _classConfig==null?(EList<AttrClassConfig>)null:_classConfig.getAttributes();
- String _configValue = _attributes==null?(String)null:this.getConfigValue(_attributes, attr);
- return _configValue;
- }
+ EObject _eContainer_1 = attr.eContainer();
+ ActorClass ac = ((ActorClass) _eContainer_1);
+ ActorClassConfig _classConfig = this.getClassConfig(ac);
+ EList<AttrClassConfig> _attributes = _classConfig==null?(EList<AttrClassConfig>)null:_classConfig.getAttributes();
+ return _attributes==null?(String)null:this.getConfigValue(_attributes, attr);
} else {
- String _xifexpression_1 = null;
EObject _eContainer_2 = attr.eContainer();
if ((_eContainer_2 instanceof PortClass)) {
- {
- EObject _eContainer_3 = attr.eContainer();
- PortClass pc = ((PortClass) _eContainer_3);
- EObject _eContainer_4 = pc.eContainer();
- ProtocolClass protocol = ((ProtocolClass) _eContainer_4);
- ProtocolClassConfig _protocolConfig = this.getProtocolConfig(((ProtocolClass) protocol));
- ProtocolClassConfig prcConfig = _protocolConfig;
- PortClass _regular = protocol.getRegular();
- boolean _equals = pc.equals(_regular);
- if (_equals) {
- PortClassConfig _regular_1 = prcConfig==null?(PortClassConfig)null:prcConfig.getRegular();
- EList<AttrClassConfig> _attributes_1 = _regular_1==null?(EList<AttrClassConfig>)null:_regular_1.getAttributes();
- String _configValue_1 = _attributes_1==null?(String)null:this.getConfigValue(_attributes_1, attr);
- return _configValue_1;
- } else {
- PortClassConfig _conjugated = prcConfig==null?(PortClassConfig)null:prcConfig.getConjugated();
- EList<AttrClassConfig> _attributes_2 = _conjugated==null?(EList<AttrClassConfig>)null:_conjugated.getAttributes();
- String _configValue_2 = _attributes_2==null?(String)null:this.getConfigValue(_attributes_2, attr);
- return _configValue_2;
- }
+ EObject _eContainer_3 = attr.eContainer();
+ PortClass pc = ((PortClass) _eContainer_3);
+ EObject _eContainer_4 = pc.eContainer();
+ ProtocolClass protocol = ((ProtocolClass) _eContainer_4);
+ ProtocolClassConfig prcConfig = this.getProtocolConfig(((ProtocolClass) protocol));
+ PortClass _regular = protocol.getRegular();
+ boolean _equals = pc.equals(_regular);
+ if (_equals) {
+ PortClassConfig _regular_1 = prcConfig==null?(PortClassConfig)null:prcConfig.getRegular();
+ EList<AttrClassConfig> _attributes_1 = _regular_1==null?(EList<AttrClassConfig>)null:_regular_1.getAttributes();
+ return _attributes_1==null?(String)null:this.getConfigValue(_attributes_1, attr);
+ } else {
+ PortClassConfig _conjugated = prcConfig==null?(PortClassConfig)null:prcConfig.getConjugated();
+ EList<AttrClassConfig> _attributes_2 = _conjugated==null?(EList<AttrClassConfig>)null:_conjugated.getAttributes();
+ return _attributes_2==null?(String)null:this.getConfigValue(_attributes_2, attr);
}
}
- _xifexpression = _xifexpression_1;
}
- return _xifexpression;
+ return null;
}
public String getConfigValue(final List<AttrClassConfig> attrConfigs, final Attribute attr) {
@@ -104,7 +88,7 @@ public class ConfigExtension { public Boolean apply(final AttrClassConfig attrConfig) {
Attribute _attribute = attrConfig.getAttribute();
boolean _equals = _attribute.equals(attr);
- return ((Boolean)_equals);
+ return Boolean.valueOf(_equals);
}
};
AttrClassConfig _findFirst = IterableExtensions.<AttrClassConfig>findFirst(attrConfigs, _function);
@@ -124,96 +108,92 @@ public class ConfigExtension { }
public String stringValue(final LiteralArray literalArray, final Attribute attr) {
- String string = "";
- boolean _operator_and = false;
- boolean _isArray = this.isArray(attr);
- if (!_isArray) {
- _operator_and = false;
- } else {
- EList<Literal> _literals = literalArray.getLiterals();
- int _size = _literals.size();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)1));
- _operator_and = BooleanExtensions.operator_and(_isArray, _operator_greaterThan);
- }
- if (_operator_and) {
- {
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("{ ");
- {
- EList<Literal> _literals_1 = literalArray.getLiterals();
- for(final Literal literal : _literals_1) {
- String _stringValue = this.stringValue(literal);
- _builder.append(_stringValue, "");
- _builder.append(", ");
- }
- }
- String _operator_plus = StringExtensions.operator_plus(string, _builder);
- string = _operator_plus;
- int _length = string.length();
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)_length), ((Integer)2));
- String _substring = string.substring(0, _operator_minus);
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append(" ");
- _builder_1.append("}");
- String _operator_plus_1 = StringExtensions.operator_plus(_substring, _builder_1);
- string = _operator_plus_1;
+ String string = "";
+ boolean _and = false;
+ boolean _isArray = this.isArray(attr);
+ if (!_isArray) {
+ _and = false;
+ } else {
+ EList<Literal> _literals = literalArray.getLiterals();
+ int _size = _literals.size();
+ boolean _greaterThan = (_size > 1);
+ _and = (_isArray && _greaterThan);
+ }
+ if (_and) {
+ StringConcatenation _builder = new StringConcatenation();
+ _builder.append("{ ");
+ {
+ EList<Literal> _literals_1 = literalArray.getLiterals();
+ for(final Literal literal : _literals_1) {
+ String _stringValue = this.stringValue(literal);
+ _builder.append(_stringValue, "");
+ _builder.append(", ");
}
- } else {
- EList<Literal> _literals_2 = literalArray.getLiterals();
- Literal _get = _literals_2.get(0);
- String _stringValue_1 = this.stringValue(_get);
- string = _stringValue_1;
}
- return string;
+ String _plus = (string + _builder.toString());
+ string = _plus;
+ int _length = string.length();
+ int _minus = (_length - 2);
+ String _substring = string.substring(0, _minus);
+ StringConcatenation _builder_1 = new StringConcatenation();
+ _builder_1.append(" ");
+ _builder_1.append("}");
+ String _plus_1 = (_substring + _builder_1.toString());
+ string = _plus_1;
+ } else {
+ EList<Literal> _literals_2 = literalArray.getLiterals();
+ Literal _get = _literals_2.get(0);
+ String _stringValue_1 = this.stringValue(_get);
+ string = _stringValue_1;
+ }
+ return string;
}
private String stringValue(final Literal literal) {
String _switchResult = null;
- final Literal literal_1 = literal;
- boolean matched = false;
- if (!matched) {
- if (literal_1 instanceof BooleanLiteral) {
- final BooleanLiteral literal_2 = (BooleanLiteral) literal_1;
- matched=true;
- boolean _isIsTrue = literal_2.isIsTrue();
- String _string = ((Boolean)_isIsTrue).toString();
+ boolean _matched = false;
+ if (!_matched) {
+ if (literal instanceof BooleanLiteral) {
+ final BooleanLiteral _booleanLiteral = (BooleanLiteral)literal;
+ _matched=true;
+ boolean _isIsTrue = _booleanLiteral.isIsTrue();
+ String _string = Boolean.valueOf(_isIsTrue).toString();
_switchResult = _string;
}
}
- if (!matched) {
- if (literal_1 instanceof IntLiteral) {
- final IntLiteral literal_3 = (IntLiteral) literal_1;
- matched=true;
- int _value = literal_3.getValue();
- String _string_1 = ((Integer)_value).toString();
- _switchResult = _string_1;
+ if (!_matched) {
+ if (literal instanceof IntLiteral) {
+ final IntLiteral _intLiteral = (IntLiteral)literal;
+ _matched=true;
+ int _value = _intLiteral.getValue();
+ String _string = Integer.valueOf(_value).toString();
+ _switchResult = _string;
}
}
- if (!matched) {
- if (literal_1 instanceof RealLiteral) {
- final RealLiteral literal_4 = (RealLiteral) literal_1;
- matched=true;
- double _value_1 = literal_4.getValue();
- String _string_2 = ((Double)_value_1).toString();
- _switchResult = _string_2;
+ if (!_matched) {
+ if (literal instanceof RealLiteral) {
+ final RealLiteral _realLiteral = (RealLiteral)literal;
+ _matched=true;
+ double _value = _realLiteral.getValue();
+ String _string = Double.valueOf(_value).toString();
+ _switchResult = _string;
}
}
- if (!matched) {
- if (literal_1 instanceof StringLiteral) {
- final StringLiteral literal_5 = (StringLiteral) literal_1;
- matched=true;
+ if (!_matched) {
+ if (literal instanceof StringLiteral) {
+ final StringLiteral _stringLiteral = (StringLiteral)literal;
+ _matched=true;
String _xblockexpression = null;
{
- String _value_2 = literal_5.getValue();
- String _string_3 = _value_2.toString();
- String value = _string_3;
+ String _value = _stringLiteral.getValue();
+ String value = _value.toString();
String _xifexpression = null;
int _length = value.length();
- boolean _operator_equals = ObjectExtensions.operator_equals(((Integer)_length), ((Integer)1));
- if (_operator_equals) {
- String _operator_plus = StringExtensions.operator_plus("\'", value);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "\'");
- _xifexpression = _operator_plus_1;
+ boolean _equals = (_length == 1);
+ if (_equals) {
+ String _plus = ("\'" + value);
+ String _plus_1 = (_plus + "\'");
+ _xifexpression = _plus_1;
} else {
String _charArrayExpr = this.languageExt.toCharArrayExpr(value);
_xifexpression = _charArrayExpr;
@@ -233,62 +213,58 @@ public class ConfigExtension { RefableType _refType = attr.getRefType();
DataType _type = _refType.getType();
if ((_type instanceof PrimitiveType)) {
- {
- RefableType _refType_1 = attr.getRefType();
- DataType _type_1 = _refType_1.getType();
- PrimitiveType primitive = ((PrimitiveType) _type_1);
- LiteralType _type_2 = primitive.getType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_type_2, LiteralType.CHAR);
- isChar = _operator_equals;
- }
+ RefableType _refType_1 = attr.getRefType();
+ DataType _type_1 = _refType_1.getType();
+ PrimitiveType primitive = ((PrimitiveType) _type_1);
+ LiteralType _type_2 = primitive.getType();
+ boolean _equals = Objects.equal(_type_2, LiteralType.CHAR);
+ isChar = _equals;
}
- boolean _operator_and = false;
- boolean _operator_not = BooleanExtensions.operator_not(isChar);
- if (!_operator_not) {
- _operator_and = false;
+ boolean _and = false;
+ boolean _not = (!isChar);
+ if (!_not) {
+ _and = false;
} else {
int _size = attr.getSize();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)0));
- _operator_and = BooleanExtensions.operator_and(_operator_not, _operator_greaterThan);
+ boolean _greaterThan = (_size > 0);
+ _and = (_not && _greaterThan);
}
- _xblockexpression = (_operator_and);
+ _xblockexpression = (_and);
}
return _xblockexpression;
}
public List<AttrInstanceConfig> getConfigAttributes(final ActorInstance ai) {
- ArrayList<AttrInstanceConfig> _arrayList = new ArrayList<AttrInstanceConfig>();
- ArrayList<AttrInstanceConfig> attrConfigs = _arrayList;
- String _path = ai.getPath();
- ActorInstanceConfig _get = ConfigHelper.instanceMap.get(_path);
- ActorInstanceConfig config = _get;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(config, null);
- if (_operator_notEquals) {
- EList<AttrInstanceConfig> _attributes = config.getAttributes();
- for (final AttrInstanceConfig attrConfig : _attributes) {
- LiteralArray _value = attrConfig.getValue();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_value, null);
- if (_operator_notEquals_1) {
- attrConfigs.add(attrConfig);
- }
+ ArrayList<AttrInstanceConfig> _arrayList = new ArrayList<AttrInstanceConfig>();
+ ArrayList<AttrInstanceConfig> attrConfigs = _arrayList;
+ String _path = ai.getPath();
+ ActorInstanceConfig config = ConfigHelper.instanceMap.get(_path);
+ boolean _notEquals = (!Objects.equal(config, null));
+ if (_notEquals) {
+ EList<AttrInstanceConfig> _attributes = config.getAttributes();
+ for (final AttrInstanceConfig attrConfig : _attributes) {
+ LiteralArray _value = attrConfig.getValue();
+ boolean _notEquals_1 = (!Objects.equal(_value, null));
+ if (_notEquals_1) {
+ attrConfigs.add(attrConfig);
}
}
- return attrConfigs;
+ }
+ return attrConfigs;
}
public List<PortInstanceConfig> getConfigPorts(final ActorInstance ai) {
- ArrayList<PortInstanceConfig> _arrayList = new ArrayList<PortInstanceConfig>();
- ArrayList<PortInstanceConfig> portConfigs = _arrayList;
- String _path = ai.getPath();
- ActorInstanceConfig _get = ConfigHelper.instanceMap.get(_path);
- ActorInstanceConfig config = _get;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(config, null);
- if (_operator_notEquals) {
- EList<PortInstanceConfig> _ports = config.getPorts();
- for (final PortInstanceConfig portConfig : _ports) {
- portConfigs.add(portConfig);
- }
+ ArrayList<PortInstanceConfig> _arrayList = new ArrayList<PortInstanceConfig>();
+ ArrayList<PortInstanceConfig> portConfigs = _arrayList;
+ String _path = ai.getPath();
+ ActorInstanceConfig config = ConfigHelper.instanceMap.get(_path);
+ boolean _notEquals = (!Objects.equal(config, null));
+ if (_notEquals) {
+ EList<PortInstanceConfig> _ports = config.getPorts();
+ for (final PortInstanceConfig portConfig : _ports) {
+ portConfigs.add(portConfig);
}
- return portConfigs;
+ }
+ return portConfigs;
}
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java index 85d09c0a9..fb9ff2024 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java @@ -14,8 +14,6 @@ import org.eclipse.etrice.generator.generic.ILanguageExtension; import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class GenericActorClassGenerator {
@@ -26,68 +24,67 @@ public class GenericActorClassGenerator { private RoomExtensions roomExt;
public String genInterfaceItemConstants(final ExpandedActorClass xpac, final ActorClass ac) {
- List<Port> _xifexpression = null;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- List<Port> _endPorts = this.roomExt.getEndPorts(ac);
- _xifexpression = _endPorts;
- } else {
- List<Port> _allEndPorts = this.roomExt.getAllEndPorts(ac);
- _xifexpression = _allEndPorts;
- }
- List<Port> endPorts = _xifexpression;
- List<SAPRef> _xifexpression_1 = null;
- boolean _usesInheritance_1 = this.langExt.usesInheritance();
- if (_usesInheritance_1) {
- EList<SAPRef> _strSAPs = ac.getStrSAPs();
- _xifexpression_1 = _strSAPs;
- } else {
- List<SAPRef> _allSAPs = this.roomExt.getAllSAPs(ac);
- _xifexpression_1 = _allSAPs;
- }
- List<SAPRef> strSAPs = _xifexpression_1;
- List<ServiceImplementation> _xifexpression_2 = null;
- boolean _usesInheritance_2 = this.langExt.usesInheritance();
- if (_usesInheritance_2) {
- EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
- _xifexpression_2 = _serviceImplementations;
- } else {
- List<ServiceImplementation> _allServiceImplementations = this.roomExt.getAllServiceImplementations(ac);
- _xifexpression_2 = _allServiceImplementations;
- }
- List<ServiceImplementation> svcImpls = _xifexpression_2;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- for (final Port ep : endPorts) {
- String _name = ep.getName();
- String _operator_plus = StringExtensions.operator_plus("IFITEM_", _name);
- int _interfaceItemLocalId = xpac.getInterfaceItemLocalId(ep);
- int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)1), ((Integer)_interfaceItemLocalId));
- String _string = ((Integer)_operator_plus_1).toString();
- Pair<String,String> _pair = Tuples.<String, String>pair(_operator_plus, _string);
- list.add(_pair);
- }
- for (final SAPRef sap : strSAPs) {
- String _name_1 = sap.getName();
- String _operator_plus_2 = StringExtensions.operator_plus("IFITEM_", _name_1);
- int _interfaceItemLocalId_1 = xpac.getInterfaceItemLocalId(sap);
- int _operator_plus_3 = IntegerExtensions.operator_plus(((Integer)1), ((Integer)_interfaceItemLocalId_1));
- String _string_1 = ((Integer)_operator_plus_3).toString();
- Pair<String,String> _pair_1 = Tuples.<String, String>pair(_operator_plus_2, _string_1);
- list.add(_pair_1);
- }
- for (final ServiceImplementation svc : svcImpls) {
- SPPRef _spp = svc.getSpp();
- String _name_2 = _spp.getName();
- String _operator_plus_4 = StringExtensions.operator_plus("IFITEM_", _name_2);
- SPPRef _spp_1 = svc.getSpp();
- int _interfaceItemLocalId_2 = xpac.getInterfaceItemLocalId(_spp_1);
- int _operator_plus_5 = IntegerExtensions.operator_plus(((Integer)1), ((Integer)_interfaceItemLocalId_2));
- String _string_2 = ((Integer)_operator_plus_5).toString();
- Pair<String,String> _pair_2 = Tuples.<String, String>pair(_operator_plus_4, _string_2);
- list.add(_pair_2);
- }
- String _genEnumeration = this.langExt.genEnumeration("interface_items", list);
- return _genEnumeration;
+ List<Port> _xifexpression = null;
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ List<Port> _endPorts = this.roomExt.getEndPorts(ac);
+ _xifexpression = _endPorts;
+ } else {
+ List<Port> _allEndPorts = this.roomExt.getAllEndPorts(ac);
+ _xifexpression = _allEndPorts;
+ }
+ List<Port> endPorts = _xifexpression;
+ List<SAPRef> _xifexpression_1 = null;
+ boolean _usesInheritance_1 = this.langExt.usesInheritance();
+ if (_usesInheritance_1) {
+ EList<SAPRef> _strSAPs = ac.getStrSAPs();
+ _xifexpression_1 = _strSAPs;
+ } else {
+ List<SAPRef> _allSAPs = this.roomExt.getAllSAPs(ac);
+ _xifexpression_1 = _allSAPs;
+ }
+ List<SAPRef> strSAPs = _xifexpression_1;
+ List<ServiceImplementation> _xifexpression_2 = null;
+ boolean _usesInheritance_2 = this.langExt.usesInheritance();
+ if (_usesInheritance_2) {
+ EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
+ _xifexpression_2 = _serviceImplementations;
+ } else {
+ List<ServiceImplementation> _allServiceImplementations = this.roomExt.getAllServiceImplementations(ac);
+ _xifexpression_2 = _allServiceImplementations;
+ }
+ List<ServiceImplementation> svcImpls = _xifexpression_2;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ for (final Port ep : endPorts) {
+ String _name = ep.getName();
+ String _plus = ("IFITEM_" + _name);
+ int _interfaceItemLocalId = xpac.getInterfaceItemLocalId(ep);
+ int _plus_1 = (1 + _interfaceItemLocalId);
+ String _string = Integer.valueOf(_plus_1).toString();
+ Pair<String,String> _pair = Tuples.<String, String>pair(_plus, _string);
+ list.add(_pair);
+ }
+ for (final SAPRef sap : strSAPs) {
+ String _name_1 = sap.getName();
+ String _plus_2 = ("IFITEM_" + _name_1);
+ int _interfaceItemLocalId_1 = xpac.getInterfaceItemLocalId(sap);
+ int _plus_3 = (1 + _interfaceItemLocalId_1);
+ String _string_1 = Integer.valueOf(_plus_3).toString();
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_plus_2, _string_1);
+ list.add(_pair_1);
+ }
+ for (final ServiceImplementation svc : svcImpls) {
+ SPPRef _spp = svc.getSpp();
+ String _name_2 = _spp.getName();
+ String _plus_4 = ("IFITEM_" + _name_2);
+ SPPRef _spp_1 = svc.getSpp();
+ int _interfaceItemLocalId_2 = xpac.getInterfaceItemLocalId(_spp_1);
+ int _plus_5 = (1 + _interfaceItemLocalId_2);
+ String _string_2 = Integer.valueOf(_plus_5).toString();
+ Pair<String,String> _pair_2 = Tuples.<String, String>pair(_plus_4, _string_2);
+ list.add(_pair_2);
+ }
+ return this.langExt.genEnumeration("interface_items", list);
}
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java index a5f0de1db..66a2003d5 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java @@ -15,8 +15,6 @@ import org.eclipse.etrice.generator.generic.ILanguageExtension; import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class GenericProtocolClassGenerator {
@@ -27,106 +25,95 @@ public class GenericProtocolClassGenerator { private RoomExtensions roomExt;
public String genMessageIDs(final ProtocolClass pc) {
- int offset = 0;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- String _name = pc.getName();
- String _memberInDeclaration = this.langExt.memberInDeclaration(_name, "MSG_MIN");
- String _string = ((Integer)offset).toString();
- Pair<String,String> _pair = Tuples.<String, String>pair(_memberInDeclaration, _string);
- list.add(_pair);
- List<Message> _allOutgoingMessages = this.roomExt.getAllOutgoingMessages(pc);
- for (final Message msg : _allOutgoingMessages) {
- {
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus;
- String _name_1 = pc.getName();
- String _name_2 = msg.getName();
- String _operator_plus_1 = StringExtensions.operator_plus("OUT_", _name_2);
- String _memberInDeclaration_1 = this.langExt.memberInDeclaration(_name_1, _operator_plus_1);
- String _string_1 = ((Integer)offset).toString();
- Pair<String,String> _pair_1 = Tuples.<String, String>pair(_memberInDeclaration_1, _string_1);
- list.add(_pair_1);
- }
+ int offset = 0;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ String _name = pc.getName();
+ String _memberInDeclaration = this.langExt.memberInDeclaration(_name, "MSG_MIN");
+ String _string = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair = Tuples.<String, String>pair(_memberInDeclaration, _string);
+ list.add(_pair);
+ List<Message> _allOutgoingMessages = this.roomExt.getAllOutgoingMessages(pc);
+ for (final Message msg : _allOutgoingMessages) {
+ {
+ int _plus = (offset + 1);
+ offset = _plus;
+ String _name_1 = pc.getName();
+ String _name_2 = msg.getName();
+ String _plus_1 = ("OUT_" + _name_2);
+ String _memberInDeclaration_1 = this.langExt.memberInDeclaration(_name_1, _plus_1);
+ String _string_1 = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_memberInDeclaration_1, _string_1);
+ list.add(_pair_1);
}
- List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
- for (final Message msg_1 : _allIncomingMessages) {
- {
- int _operator_plus_2 = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus_2;
- String _name_3 = pc.getName();
- String _name_4 = msg_1.getName();
- String _operator_plus_3 = StringExtensions.operator_plus("IN_", _name_4);
- String _memberInDeclaration_2 = this.langExt.memberInDeclaration(_name_3, _operator_plus_3);
- String _string_2 = ((Integer)offset).toString();
- Pair<String,String> _pair_2 = Tuples.<String, String>pair(_memberInDeclaration_2, _string_2);
- list.add(_pair_2);
- }
+ }
+ List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);
+ for (final Message msg_1 : _allIncomingMessages) {
+ {
+ int _plus = (offset + 1);
+ offset = _plus;
+ String _name_1 = pc.getName();
+ String _name_2 = msg_1.getName();
+ String _plus_1 = ("IN_" + _name_2);
+ String _memberInDeclaration_1 = this.langExt.memberInDeclaration(_name_1, _plus_1);
+ String _string_1 = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_memberInDeclaration_1, _string_1);
+ list.add(_pair_1);
}
- int _operator_plus_4 = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus_4;
- String _name_5 = pc.getName();
- String _memberInDeclaration_3 = this.langExt.memberInDeclaration(_name_5, "MSG_MAX");
- String _string_3 = ((Integer)offset).toString();
- Pair<String,String> _pair_3 = Tuples.<String, String>pair(_memberInDeclaration_3, _string_3);
- list.add(_pair_3);
- String _name_6 = pc.getName();
- String _memberInDeclaration_4 = this.langExt.memberInDeclaration(_name_6, "msg_ids");
- String _genEnumeration = this.langExt.genEnumeration(_memberInDeclaration_4, list);
- return _genEnumeration;
+ }
+ int _plus = (offset + 1);
+ offset = _plus;
+ String _name_1 = pc.getName();
+ String _memberInDeclaration_1 = this.langExt.memberInDeclaration(_name_1, "MSG_MAX");
+ String _string_1 = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_memberInDeclaration_1, _string_1);
+ list.add(_pair_1);
+ String _name_2 = pc.getName();
+ String _memberInDeclaration_2 = this.langExt.memberInDeclaration(_name_2, "msg_ids");
+ return this.langExt.genEnumeration(_memberInDeclaration_2, list);
}
public String getMessageID(final MessageFromIf mif) {
Message _message = mif.getMessage();
InterfaceItem _from = mif.getFrom();
- String _messageID = this.getMessageID(_message, _from);
- return _messageID;
+ return this.getMessageID(_message, _from);
}
public String getMessageID(final Message msg, final InterfaceItem item) {
- if ((item instanceof Port)) {
- {
- Port p = ((Port) item);
- String _xifexpression = null;
- boolean _isConjugated = p.isConjugated();
- if (_isConjugated) {
- _xifexpression = "OUT_";
- } else {
- _xifexpression = "IN_";
- }
- String direction = _xifexpression;
- GeneralProtocolClass _protocol = p.getProtocol();
- String _name = _protocol.getName();
- String _name_1 = msg.getName();
- String _operator_plus = StringExtensions.operator_plus(direction, _name_1);
- String _memberInUse = this.langExt.memberInUse(_name, _operator_plus);
- return _memberInUse;
- }
+ if ((item instanceof Port)) {
+ Port p = ((Port) item);
+ String _xifexpression = null;
+ boolean _isConjugated = p.isConjugated();
+ if (_isConjugated) {
+ _xifexpression = "OUT_";
+ } else {
+ _xifexpression = "IN_";
+ }
+ String direction = _xifexpression;
+ GeneralProtocolClass _protocol = p.getProtocol();
+ String _name = _protocol.getName();
+ String _name_1 = msg.getName();
+ String _plus = (direction + _name_1);
+ return this.langExt.memberInUse(_name, _plus);
+ } else {
+ if ((item instanceof SAPRef)) {
+ SAPRef sap = ((SAPRef) item);
+ ProtocolClass _protocol_1 = sap.getProtocol();
+ String _name_2 = _protocol_1.getName();
+ String _name_3 = msg.getName();
+ String _plus_1 = ("OUT_" + _name_3);
+ return this.langExt.memberInUse(_name_2, _plus_1);
} else {
- if ((item instanceof SAPRef)) {
- {
- SAPRef sap = ((SAPRef) item);
- ProtocolClass _protocol_1 = sap.getProtocol();
- String _name_2 = _protocol_1.getName();
- String _name_3 = msg.getName();
- String _operator_plus_1 = StringExtensions.operator_plus("OUT_", _name_3);
- String _memberInUse_1 = this.langExt.memberInUse(_name_2, _operator_plus_1);
- return _memberInUse_1;
- }
- } else {
- if ((item instanceof SPPRef)) {
- {
- SPPRef spp = ((SPPRef) item);
- ProtocolClass _protocol_2 = spp.getProtocol();
- String _name_4 = _protocol_2.getName();
- String _name_5 = msg.getName();
- String _operator_plus_2 = StringExtensions.operator_plus("IN_", _name_5);
- String _memberInUse_2 = this.langExt.memberInUse(_name_4, _operator_plus_2);
- return _memberInUse_2;
- }
- }
+ if ((item instanceof SPPRef)) {
+ SPPRef spp = ((SPPRef) item);
+ ProtocolClass _protocol_2 = spp.getProtocol();
+ String _name_4 = _protocol_2.getName();
+ String _name_5 = msg.getName();
+ String _plus_2 = ("IN_" + _name_5);
+ return this.langExt.memberInUse(_name_4, _plus_2);
}
}
- return "unknown interface item";
+ }
+ return "unknown interface item";
}
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java index ef8f5de37..37a70ec95 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java @@ -1,7 +1,9 @@ package org.eclipse.etrice.generator.generic;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
@@ -29,15 +31,11 @@ import org.eclipse.etrice.generator.generic.AbstractTransitionChainGenerator; import org.eclipse.etrice.generator.generic.GenericProtocolClassGenerator;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.RoomExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
@SuppressWarnings("all")
public class GenericStateMachineGenerator {
@@ -54,152 +52,139 @@ public class GenericStateMachineGenerator { protected AbstractTransitionChainGenerator languageGen;
private String genStateIdConstants(final ExpandedActorClass xpac) {
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
- int _xifexpression = (int) 0;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- int _numberOfInheritedBaseStates = this._roomExtensions.getNumberOfInheritedBaseStates(ac);
- _xifexpression = _numberOfInheritedBaseStates;
- } else {
- _xifexpression = 0;
- }
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)2), ((Integer)_xifexpression));
- int offset = _operator_plus;
- List<State> _xifexpression_1 = null;
- boolean _usesInheritance_1 = this.langExt.usesInheritance();
- if (_usesInheritance_1) {
- StateGraph _stateMachine = ac.getStateMachine();
- List<State> _baseStateList = this._roomExtensions.getBaseStateList(_stateMachine);
- _xifexpression_1 = _baseStateList;
- } else {
- StateGraph _stateMachine_1 = xpac.getStateMachine();
- List<State> _baseStateList_1 = this._roomExtensions.getBaseStateList(_stateMachine_1);
- _xifexpression_1 = _baseStateList_1;
- }
- List<State> baseStates = _xifexpression_1;
- ArrayList<State> _leafStatesLast = this._roomExtensions.getLeafStatesLast(baseStates);
- baseStates = _leafStatesLast;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- boolean _usesInheritance_2 = this.langExt.usesInheritance();
- boolean _operator_not = BooleanExtensions.operator_not(_usesInheritance_2);
- if (_operator_not) {
- {
- Pair<String,String> _pair = Tuples.<String, String>pair("NO_STATE", "0");
- list.add(_pair);
- Pair<String,String> _pair_1 = Tuples.<String, String>pair("STATE_TOP", "1");
- list.add(_pair_1);
- }
- }
- for (final State state : baseStates) {
- {
- String _stateId = this._roomExtensions.getStateId(state);
- String _string = ((Integer)offset).toString();
- Pair<String,String> _pair_2 = Tuples.<String, String>pair(_stateId, _string);
- list.add(_pair_2);
- int _operator_plus_1 = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus_1;
- }
+ final ActorClass ac = xpac.getActorClass();
+ int _xifexpression = (int) 0;
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ int _numberOfInheritedBaseStates = this._roomExtensions.getNumberOfInheritedBaseStates(ac);
+ _xifexpression = _numberOfInheritedBaseStates;
+ } else {
+ _xifexpression = 0;
+ }
+ int offset = (2 + _xifexpression);
+ List<State> _xifexpression_1 = null;
+ boolean _usesInheritance_1 = this.langExt.usesInheritance();
+ if (_usesInheritance_1) {
+ StateGraph _stateMachine = ac.getStateMachine();
+ List<State> _baseStateList = this._roomExtensions.getBaseStateList(_stateMachine);
+ _xifexpression_1 = _baseStateList;
+ } else {
+ StateGraph _stateMachine_1 = xpac.getStateMachine();
+ List<State> _baseStateList_1 = this._roomExtensions.getBaseStateList(_stateMachine_1);
+ _xifexpression_1 = _baseStateList_1;
+ }
+ List<State> baseStates = _xifexpression_1;
+ ArrayList<State> _leafStatesLast = this._roomExtensions.getLeafStatesLast(baseStates);
+ baseStates = _leafStatesLast;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ boolean _usesInheritance_2 = this.langExt.usesInheritance();
+ boolean _not = (!_usesInheritance_2);
+ if (_not) {
+ Pair<String,String> _pair = Tuples.<String, String>pair("NO_STATE", "0");
+ list.add(_pair);
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair("STATE_TOP", "1");
+ list.add(_pair_1);
+ }
+ for (final State state : baseStates) {
+ {
+ String _stateId = this._roomExtensions.getStateId(state);
+ String _string = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair_2 = Tuples.<String, String>pair(_stateId, _string);
+ list.add(_pair_2);
+ int _plus = (offset + 1);
+ offset = _plus;
}
- String _genEnumeration = this.langExt.genEnumeration("state_ids", list);
- return _genEnumeration;
+ }
+ return this.langExt.genEnumeration("state_ids", list);
}
private String genTransitionChainConstants(final ExpandedActorClass xpac) {
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
- EList<TransitionChain> _xifexpression = null;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- EList<TransitionChain> _ownTransitionChains = xpac.getOwnTransitionChains();
- _xifexpression = _ownTransitionChains;
- } else {
- EList<TransitionChain> _transitionChains = xpac.getTransitionChains();
- _xifexpression = _transitionChains;
- }
- EList<TransitionChain> chains = _xifexpression;
- int _xifexpression_1 = (int) 0;
- boolean _usesInheritance_1 = this.langExt.usesInheritance();
- if (_usesInheritance_1) {
- EList<TransitionChain> _transitionChains_1 = xpac.getTransitionChains();
- int _size = _transitionChains_1.size();
- int _size_1 = chains.size();
- int _operator_minus = IntegerExtensions.operator_minus(((Integer)_size), ((Integer)_size_1));
- _xifexpression_1 = _operator_minus;
- } else {
- _xifexpression_1 = 0;
- }
- int offset = _xifexpression_1;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- ArrayList<Pair<String,String>> list = _arrayList;
- for (final TransitionChain chain : chains) {
- {
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)offset), ((Integer)1));
- offset = _operator_plus;
- String _chainId = this._roomExtensions.getChainId(chain);
- String _string = ((Integer)offset).toString();
- Pair<String,String> _pair = Tuples.<String, String>pair(_chainId, _string);
- list.add(_pair);
- }
+ final ActorClass ac = xpac.getActorClass();
+ EList<TransitionChain> _xifexpression = null;
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ EList<TransitionChain> _ownTransitionChains = xpac.getOwnTransitionChains();
+ _xifexpression = _ownTransitionChains;
+ } else {
+ EList<TransitionChain> _transitionChains = xpac.getTransitionChains();
+ _xifexpression = _transitionChains;
+ }
+ EList<TransitionChain> chains = _xifexpression;
+ int _xifexpression_1 = (int) 0;
+ boolean _usesInheritance_1 = this.langExt.usesInheritance();
+ if (_usesInheritance_1) {
+ EList<TransitionChain> _transitionChains_1 = xpac.getTransitionChains();
+ int _size = _transitionChains_1.size();
+ int _size_1 = chains.size();
+ int _minus = (_size - _size_1);
+ _xifexpression_1 = _minus;
+ } else {
+ _xifexpression_1 = 0;
+ }
+ int offset = _xifexpression_1;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ ArrayList<Pair<String,String>> list = _arrayList;
+ for (final TransitionChain chain : chains) {
+ {
+ int _plus = (offset + 1);
+ offset = _plus;
+ String _chainId = this._roomExtensions.getChainId(chain);
+ String _string = Integer.valueOf(offset).toString();
+ Pair<String,String> _pair = Tuples.<String, String>pair(_chainId, _string);
+ list.add(_pair);
}
- String _genEnumeration = this.langExt.genEnumeration("chain_ids", list);
- return _genEnumeration;
+ }
+ return this.langExt.genEnumeration("chain_ids", list);
}
private String genTriggerConstants(final ExpandedActorClass xpac) {
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
- EList<MessageFromIf> _xifexpression = null;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- EList<MessageFromIf> _ownTriggers = xpac.getOwnTriggers();
- _xifexpression = _ownTriggers;
- } else {
- EList<MessageFromIf> _triggers = xpac.getTriggers();
- _xifexpression = _triggers;
- }
- final EList<MessageFromIf> triggers = _xifexpression;
- ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
- final ArrayList<Pair<String,String>> list = _arrayList;
- Pair<String,String> _pair = Tuples.<String, String>pair("POLLING", "0");
- list.add(_pair);
- for (final MessageFromIf mif : triggers) {
- String _triggerCodeName = xpac.getTriggerCodeName(mif);
- InterfaceItem _from = mif.getFrom();
- String _name = _from.getName();
- String _operator_plus = StringExtensions.operator_plus("IFITEM_", _name);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, " + EVT_SHIFT*");
- String _messageID = this.pcGen.getMessageID(mif);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, _messageID);
- Pair<String,String> _pair_1 = Tuples.<String, String>pair(_triggerCodeName, _operator_plus_2);
- list.add(_pair_1);
- }
- String _genEnumeration = this.langExt.genEnumeration("triggers", list);
- return _genEnumeration;
+ final ActorClass ac = xpac.getActorClass();
+ EList<MessageFromIf> _xifexpression = null;
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ EList<MessageFromIf> _ownTriggers = xpac.getOwnTriggers();
+ _xifexpression = _ownTriggers;
+ } else {
+ EList<MessageFromIf> _triggers = xpac.getTriggers();
+ _xifexpression = _triggers;
+ }
+ final EList<MessageFromIf> triggers = _xifexpression;
+ ArrayList<Pair<String,String>> _arrayList = new ArrayList<Pair<String,String>>();
+ final ArrayList<Pair<String,String>> list = _arrayList;
+ Pair<String,String> _pair = Tuples.<String, String>pair("POLLING", "0");
+ list.add(_pair);
+ for (final MessageFromIf mif : triggers) {
+ String _triggerCodeName = xpac.getTriggerCodeName(mif);
+ InterfaceItem _from = mif.getFrom();
+ String _name = _from.getName();
+ String _plus = ("IFITEM_" + _name);
+ String _plus_1 = (_plus + " + EVT_SHIFT*");
+ String _messageID = this.pcGen.getMessageID(mif);
+ String _plus_2 = (_plus_1 + _messageID);
+ Pair<String,String> _pair_1 = Tuples.<String, String>pair(_triggerCodeName, _plus_2);
+ list.add(_pair_1);
+ }
+ return this.langExt.genEnumeration("triggers", list);
}
- public StringConcatenation genStateMachine(final ExpandedActorClass xpac) {
- StringConcatenation _xblockexpression = null;
+ public CharSequence genStateMachine(final ExpandedActorClass xpac) {
+ CharSequence _xblockexpression = null;
{
- ActorClass _actorClass = xpac.getActorClass();
- final ActorClass ac = _actorClass;
+ final ActorClass ac = xpac.getActorClass();
ActorCommunicationType _commType = ac.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.ASYNCHRONOUS);
- final boolean async = _operator_equals;
+ final boolean async = Objects.equal(_commType, ActorCommunicationType.ASYNCHRONOUS);
ActorCommunicationType _commType_1 = ac.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
- final boolean eventDriven = _operator_equals_1;
+ final boolean eventDriven = Objects.equal(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
ActorCommunicationType _commType_2 = ac.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, ActorCommunicationType.DATA_DRIVEN);
- final boolean dataDriven = _operator_equals_2;
- boolean _operator_or = false;
+ final boolean dataDriven = Objects.equal(_commType_2, ActorCommunicationType.DATA_DRIVEN);
+ boolean _or = false;
if (async) {
- _operator_or = true;
+ _or = true;
} else {
- _operator_or = BooleanExtensions.operator_or(async, eventDriven);
+ _or = (async || eventDriven);
}
- final boolean handleEvents = _operator_or;
+ final boolean handleEvents = _or;
StringConcatenation _builder = new StringConcatenation();
_builder.newLine();
_builder.append("/* state IDs */");
@@ -220,7 +205,7 @@ public class GenericStateMachineGenerator { _builder.append(_genTriggerConstants, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
- StringConcatenation _genExtra = this.genExtra(xpac);
+ CharSequence _genExtra = this.genExtra(xpac);
_builder.append(_genExtra, "");
_builder.newLineIfNotEmpty();
_builder.newLine();
@@ -231,17 +216,17 @@ public class GenericStateMachineGenerator { List<State> _stateList = this._roomExtensions.getStateList(_stateMachine);
for(final State state : _stateList) {
{
- boolean _operator_or_1 = false;
+ boolean _or_1 = false;
boolean _usesInheritance = this.langExt.usesInheritance();
- boolean _operator_not = BooleanExtensions.operator_not(_usesInheritance);
- if (_operator_not) {
- _operator_or_1 = true;
+ boolean _not = (!_usesInheritance);
+ if (_not) {
+ _or_1 = true;
} else {
boolean _isOwnObject = xpac.isOwnObject(state);
- _operator_or_1 = BooleanExtensions.operator_or(_operator_not, _isOwnObject);
+ _or_1 = (_not || _isOwnObject);
}
- if (_operator_or_1) {
- StringConcatenation _genActionCodeMethods = this.genActionCodeMethods(xpac, state);
+ if (_or_1) {
+ CharSequence _genActionCodeMethods = this.genActionCodeMethods(xpac, state);
_builder.append(_genActionCodeMethods, "");
_builder.newLineIfNotEmpty();
}
@@ -256,35 +241,34 @@ public class GenericStateMachineGenerator { List<Transition> _transitionList = this._roomExtensions.getTransitionList(_stateMachine_1);
for(final Transition tr : _transitionList) {
{
- boolean _operator_and = false;
- boolean _operator_or_2 = false;
+ boolean _and = false;
+ boolean _or_2 = false;
boolean _usesInheritance_1 = this.langExt.usesInheritance();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_usesInheritance_1);
- if (_operator_not_1) {
- _operator_or_2 = true;
+ boolean _not_1 = (!_usesInheritance_1);
+ if (_not_1) {
+ _or_2 = true;
} else {
boolean _isOwnObject_1 = xpac.isOwnObject(tr);
- _operator_or_2 = BooleanExtensions.operator_or(_operator_not_1, _isOwnObject_1);
+ _or_2 = (_not_1 || _isOwnObject_1);
}
- if (!_operator_or_2) {
- _operator_and = false;
+ if (!_or_2) {
+ _and = false;
} else {
boolean _hasActionCode = this._roomExtensions.hasActionCode(tr);
- _operator_and = BooleanExtensions.operator_and(_operator_or_2, _hasActionCode);
+ _and = (_or_2 && _hasActionCode);
}
- if (_operator_and) {
+ if (_and) {
TransitionChain _chain = xpac.getChain(tr);
- Transition _transition = _chain.getTransition();
- Transition start = _transition;
+ Transition start = _chain.getTransition();
_builder.newLineIfNotEmpty();
- boolean _operator_and_1 = false;
+ boolean _and_1 = false;
if (!(start instanceof NonInitialTransition)) {
- _operator_and_1 = false;
+ _and_1 = false;
} else {
- boolean _operator_not_2 = BooleanExtensions.operator_not((start instanceof GuardedTransition));
- _operator_and_1 = BooleanExtensions.operator_and((start instanceof NonInitialTransition), _operator_not_2);
+ boolean _not_2 = (!(start instanceof GuardedTransition));
+ _and_1 = ((start instanceof NonInitialTransition) && _not_2);
}
- boolean hasArgs = _operator_and_1;
+ boolean hasArgs = _and_1;
_builder.newLineIfNotEmpty();
String _accessLevelProtected = this.langExt.accessLevelProtected();
_builder.append(_accessLevelProtected, "");
@@ -451,8 +435,7 @@ public class GenericStateMachineGenerator { _builder.append("switch (chain) {");
_builder.newLine();
_builder.append("\t\t");
- EList<TransitionChain> _transitionChains = xpac.getTransitionChains();
- EList<TransitionChain> allchains = _transitionChains;
+ EList<TransitionChain> allchains = xpac.getTransitionChains();
_builder.newLineIfNotEmpty();
{
for(final TransitionChain tc : allchains) {
@@ -584,8 +567,7 @@ public class GenericStateMachineGenerator { _builder.append("\t");
_builder.append("\t");
StateGraph _subgraph_1 = state_2.getSubgraph();
- Transition _initTransition = this._roomExtensions.getInitTransition(_subgraph_1);
- Transition sub_initt = _initTransition;
+ Transition sub_initt = this._roomExtensions.getInitTransition(_subgraph_1);
_builder.newLineIfNotEmpty();
_builder.append("\t\t\t");
_builder.append("\t");
@@ -704,8 +686,7 @@ public class GenericStateMachineGenerator { _builder.newLineIfNotEmpty();
_builder.append("\t");
StateGraph _stateMachine_4 = xpac.getStateMachine();
- Transition _initTransition_1 = this._roomExtensions.getInitTransition(_stateMachine_4);
- Transition initt = _initTransition_1;
+ Transition initt = this._roomExtensions.getInitTransition(_stateMachine_4);
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("int chain = ");
@@ -839,7 +820,7 @@ public class GenericStateMachineGenerator { _builder.newLine();
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genStateSwitch = this.genStateSwitch(xpac);
+ CharSequence _genStateSwitch = this.genStateSwitch(xpac);
_builder.append(_genStateSwitch, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -847,7 +828,7 @@ public class GenericStateMachineGenerator { _builder.newLine();
} else {
_builder.append("\t");
- StringConcatenation _genStateSwitch_1 = this.genStateSwitch(xpac);
+ CharSequence _genStateSwitch_1 = this.genStateSwitch(xpac);
_builder.append(_genStateSwitch_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -905,28 +886,18 @@ public class GenericStateMachineGenerator { return _xblockexpression;
}
- private StringConcatenation genStateSwitch(final ExpandedActorClass xpac) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genStateSwitch(final ExpandedActorClass xpac) {
+ CharSequence _xblockexpression = null;
{
ActorClass _actorClass = xpac.getActorClass();
ActorCommunicationType _commType = _actorClass.getCommType();
- boolean _operator_equals = ObjectExtensions.operator_equals(_commType, ActorCommunicationType.ASYNCHRONOUS);
- boolean async = _operator_equals;
+ boolean async = Objects.equal(_commType, ActorCommunicationType.ASYNCHRONOUS);
ActorClass _actorClass_1 = xpac.getActorClass();
ActorCommunicationType _commType_1 = _actorClass_1.getCommType();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
- boolean eventDriven = _operator_equals_1;
+ boolean eventDriven = Objects.equal(_commType_1, ActorCommunicationType.EVENT_DRIVEN);
ActorClass _actorClass_2 = xpac.getActorClass();
ActorCommunicationType _commType_2 = _actorClass_2.getCommType();
- boolean _operator_equals_2 = ObjectExtensions.operator_equals(_commType_2, ActorCommunicationType.DATA_DRIVEN);
- boolean dataDriven = _operator_equals_2;
- boolean _operator_or = false;
- if (async) {
- _operator_or = true;
- } else {
- _operator_or = BooleanExtensions.operator_or(async, eventDriven);
- }
- boolean handleEvents = _operator_or;
+ boolean dataDriven = Objects.equal(_commType_2, ActorCommunicationType.DATA_DRIVEN);
StringConcatenation _builder = new StringConcatenation();
_builder.append("switch (");
String _memberAccess = this.langExt.memberAccess();
@@ -947,13 +918,12 @@ public class GenericStateMachineGenerator { if (async) {
_builder.append("\t");
_builder.append("\t");
- EList<ActiveTrigger> _activeTriggers = xpac.getActiveTriggers(state);
- EList<ActiveTrigger> atlist = _activeTriggers;
+ EList<ActiveTrigger> atlist = xpac.getActiveTriggers(state);
_builder.newLineIfNotEmpty();
{
boolean _isEmpty = atlist.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not) {
+ boolean _not = (!_isEmpty);
+ if (_not) {
_builder.append("\t");
_builder.append("\t");
_builder.append("switch(trigger) {");
@@ -965,7 +935,7 @@ public class GenericStateMachineGenerator { _builder.append("\t");
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genDataDrivenTriggers = this.genDataDrivenTriggers(xpac, state);
+ CharSequence _genDataDrivenTriggers = this.genDataDrivenTriggers(xpac, state);
_builder.append(_genDataDrivenTriggers, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -976,7 +946,7 @@ public class GenericStateMachineGenerator { _builder.append("\t");
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genEventDrivenTriggers = this.genEventDrivenTriggers(xpac, state, atlist);
+ CharSequence _genEventDrivenTriggers = this.genEventDrivenTriggers(xpac, state, atlist);
_builder.append(_genEventDrivenTriggers, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -986,7 +956,7 @@ public class GenericStateMachineGenerator { } else {
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genDataDrivenTriggers_1 = this.genDataDrivenTriggers(xpac, state);
+ CharSequence _genDataDrivenTriggers_1 = this.genDataDrivenTriggers(xpac, state);
_builder.append(_genDataDrivenTriggers_1, " ");
_builder.newLineIfNotEmpty();
}
@@ -995,20 +965,19 @@ public class GenericStateMachineGenerator { if (dataDriven) {
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genDataDrivenTriggers_2 = this.genDataDrivenTriggers(xpac, state);
+ CharSequence _genDataDrivenTriggers_2 = this.genDataDrivenTriggers(xpac, state);
_builder.append(_genDataDrivenTriggers_2, " ");
_builder.newLineIfNotEmpty();
} else {
if (eventDriven) {
_builder.append("\t");
_builder.append("\t");
- EList<ActiveTrigger> _activeTriggers_1 = xpac.getActiveTriggers(state);
- EList<ActiveTrigger> atlist_1 = _activeTriggers_1;
+ EList<ActiveTrigger> atlist_1 = xpac.getActiveTriggers(state);
_builder.newLineIfNotEmpty();
{
boolean _isEmpty_1 = atlist_1.isEmpty();
- boolean _operator_not_1 = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not_1) {
+ boolean _not_1 = (!_isEmpty_1);
+ if (_not_1) {
_builder.append("\t");
_builder.append("\t");
_builder.append("switch(trigger) {");
@@ -1016,7 +985,7 @@ public class GenericStateMachineGenerator { _builder.append("\t");
_builder.append("\t");
_builder.append("\t");
- StringConcatenation _genEventDrivenTriggers_1 = this.genEventDrivenTriggers(xpac, state, atlist_1);
+ CharSequence _genEventDrivenTriggers_1 = this.genEventDrivenTriggers(xpac, state, atlist_1);
_builder.append(_genEventDrivenTriggers_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1042,19 +1011,18 @@ public class GenericStateMachineGenerator { return _xblockexpression;
}
- private StringConcatenation genDataDrivenTriggers(final ExpandedActorClass xpac, final State state) {
+ private CharSequence genDataDrivenTriggers(final ExpandedActorClass xpac, final State state) {
StringConcatenation _builder = new StringConcatenation();
- StringConcatenation _genDoCodes = this.genDoCodes(state);
+ CharSequence _genDoCodes = this.genDoCodes(state);
_builder.append(_genDoCodes, "");
_builder.newLineIfNotEmpty();
List<Transition> _outgoingTransitionsHierarchical = this._roomExtensions.getOutgoingTransitionsHierarchical(xpac, state);
final Function1<Transition,Boolean> _function = new Function1<Transition,Boolean>() {
public Boolean apply(final Transition t) {
- return ((Boolean)(t instanceof GuardedTransition));
+ return Boolean.valueOf((t instanceof GuardedTransition));
}
};
- Iterable<Transition> _filter = IterableExtensions.<Transition>filter(_outgoingTransitionsHierarchical, _function);
- Iterable<Transition> transitions = _filter;
+ Iterable<Transition> transitions = IterableExtensions.<Transition>filter(_outgoingTransitionsHierarchical, _function);
_builder.newLineIfNotEmpty();
{
for(final Transition tr : transitions) {
@@ -1068,8 +1036,7 @@ public class GenericStateMachineGenerator { _builder.append("{");
_builder.newLine();
_builder.append("\t");
- TransitionChain _chain = xpac.getChain(tr);
- TransitionChain chain = _chain;
+ TransitionChain chain = xpac.getChain(tr);
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("chain = ");
@@ -1103,8 +1070,8 @@ public class GenericStateMachineGenerator { _builder.newLine();
{
Transition _last = IterableExtensions.<Transition>last(transitions);
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(tr, _last);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(tr, _last));
+ if (_notEquals) {
_builder.append("else ");
_builder.newLine();
}
@@ -1114,7 +1081,7 @@ public class GenericStateMachineGenerator { return _builder;
}
- private StringConcatenation genEventDrivenTriggers(final ExpandedActorClass xpac, final State state, final List<ActiveTrigger> atlist) {
+ private CharSequence genEventDrivenTriggers(final ExpandedActorClass xpac, final State state, final List<ActiveTrigger> atlist) {
StringConcatenation _builder = new StringConcatenation();
{
for(final ActiveTrigger at : atlist) {
@@ -1125,8 +1092,7 @@ public class GenericStateMachineGenerator { _builder.append(":");
_builder.newLineIfNotEmpty();
_builder.append("\t");
- boolean _hasGuard = this._roomExtensions.hasGuard(xpac, at);
- boolean needData = _hasGuard;
+ boolean needData = this._roomExtensions.hasGuard(xpac, at);
_builder.newLineIfNotEmpty();
_builder.append("\t");
{
@@ -1140,21 +1106,20 @@ public class GenericStateMachineGenerator { _builder.newLineIfNotEmpty();
{
EList<TriggeredTransition> _transitions = at.getTransitions();
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final TriggeredTransition tt : _transitions) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(" else ", " ");
}
_builder.append("\t");
- TransitionChain _chain = xpac.getChain(tt);
- TransitionChain chain = _chain;
+ TransitionChain chain = xpac.getChain(tt);
_builder.newLineIfNotEmpty();
_builder.append("\t");
Transition _transition = chain.getTransition();
String _trigger_1 = at.getTrigger();
- StringConcatenation _guard = this.guard(_transition, _trigger_1, xpac);
+ CharSequence _guard = this.guard(_transition, _trigger_1, xpac);
_builder.append(_guard, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -1217,23 +1182,22 @@ public class GenericStateMachineGenerator { return _builder;
}
- public StringConcatenation genExtra(final ExpandedActorClass xpac) {
+ public CharSequence genExtra(final ExpandedActorClass xpac) {
StringConcatenation _builder = new StringConcatenation();
return _builder;
}
- private StringConcatenation _guard(final TriggeredTransition tt, final String trigger, final ExpandedActorClass ac) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence _guard(final TriggeredTransition tt, final String trigger, final ExpandedActorClass ac) {
+ CharSequence _xblockexpression = null;
{
EList<Trigger> _triggers = tt.getTriggers();
final Function1<Trigger,Boolean> _function = new Function1<Trigger,Boolean>() {
public Boolean apply(final Trigger e) {
boolean _isMatching = ac.isMatching(e, trigger);
- return ((Boolean)_isMatching);
+ return Boolean.valueOf(_isMatching);
}
};
- Trigger _findFirst = IterableExtensions.<Trigger>findFirst(_triggers, _function);
- Trigger tr = _findFirst;
+ Trigger tr = IterableExtensions.<Trigger>findFirst(_triggers, _function);
StringConcatenation _builder = new StringConcatenation();
{
boolean _hasGuard = this._roomExtensions.hasGuard(tr);
@@ -1253,14 +1217,14 @@ public class GenericStateMachineGenerator { return _xblockexpression;
}
- private StringConcatenation _guard(final Transition t, final String trigger, final ExpandedActorClass ac) {
+ private CharSequence _guard(final Transition t, final String trigger, final ExpandedActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/* error */");
_builder.newLine();
return _builder;
}
- private StringConcatenation genDoCodes(final State state) {
+ private CharSequence genDoCodes(final State state) {
StringConcatenation _builder = new StringConcatenation();
{
boolean _hasDoCode = this._roomExtensions.hasDoCode(state);
@@ -1277,7 +1241,7 @@ public class GenericStateMachineGenerator { if ((_eContainer_1 instanceof State)) {
EObject _eContainer_2 = state.eContainer();
EObject _eContainer_3 = _eContainer_2.eContainer();
- StringConcatenation _genDoCodes = this.genDoCodes(((State) _eContainer_3));
+ CharSequence _genDoCodes = this.genDoCodes(((State) _eContainer_3));
_builder.append(_genDoCodes, "");
_builder.newLineIfNotEmpty();
}
@@ -1285,95 +1249,78 @@ public class GenericStateMachineGenerator { return _builder;
}
- private StringConcatenation genActionCodeMethods(final ExpandedActorClass xpac, final State state) {
- StringConcatenation _xblockexpression = null;
+ private CharSequence genActionCodeMethods(final ExpandedActorClass xpac, final State state) {
+ CharSequence _xblockexpression = null;
{
ActorClass _actorClass = xpac.getActorClass();
String _name = _actorClass.getName();
- String _selfPointer = this.langExt.selfPointer(_name, false);
- final String selfPtr = _selfPointer;
- String _entryCodeOperationName = CodegenHelpers.getEntryCodeOperationName(state);
- final String entryOp = _entryCodeOperationName;
- String _exitCodeOperationName = CodegenHelpers.getExitCodeOperationName(state);
- final String exitOp = _exitCodeOperationName;
- String _doCodeOperationName = CodegenHelpers.getDoCodeOperationName(state);
- final String doOp = _doCodeOperationName;
+ final String selfPtr = this.langExt.selfPointer(_name, false);
+ final String entryOp = CodegenHelpers.getEntryCodeOperationName(state);
+ final String exitOp = CodegenHelpers.getExitCodeOperationName(state);
+ final String doOp = CodegenHelpers.getDoCodeOperationName(state);
AbstractGenerator _instance = AbstractGenerator.getInstance();
DetailCode _entryCode = state.getEntryCode();
- String _translatedCode = _instance.getTranslatedCode(_entryCode);
- String entry = _translatedCode;
+ String entry = _instance.getTranslatedCode(_entryCode);
AbstractGenerator _instance_1 = AbstractGenerator.getInstance();
DetailCode _exitCode = state.getExitCode();
- String _translatedCode_1 = _instance_1.getTranslatedCode(_exitCode);
- String exit = _translatedCode_1;
+ String exit = _instance_1.getTranslatedCode(_exitCode);
AbstractGenerator _instance_2 = AbstractGenerator.getInstance();
DetailCode _doCode = state.getDoCode();
- String _translatedCode_2 = _instance_2.getTranslatedCode(_doCode);
- String docode = _translatedCode_2;
+ String docode = _instance_2.getTranslatedCode(_doCode);
if ((state instanceof ExpandedRefinedState)) {
- {
- final ExpandedRefinedState rs = ((ExpandedRefinedState) state);
- AbstractGenerator _instance_3 = AbstractGenerator.getInstance();
- DetailCode _inheritedEntry = rs.getInheritedEntry();
- String _translatedCode_3 = _instance_3.getTranslatedCode(_inheritedEntry);
- final String inhEntry = _translatedCode_3;
- AbstractGenerator _instance_4 = AbstractGenerator.getInstance();
- DetailCode _inheritedExit = rs.getInheritedExit();
- String _translatedCode_4 = _instance_4.getTranslatedCode(_inheritedExit);
- final String inhExit = _translatedCode_4;
- AbstractGenerator _instance_5 = AbstractGenerator.getInstance();
- DetailCode _inheritedDo = rs.getInheritedDo();
- String _translatedCode_5 = _instance_5.getTranslatedCode(_inheritedDo);
- final String inhDo = _translatedCode_5;
- boolean _usesInheritance = this.langExt.usesInheritance();
- if (_usesInheritance) {
- {
- ActorClass _actorClass_1 = xpac.getActorClass();
- ActorClass _base = _actorClass_1.getBase();
- String _name_1 = _base.getName();
- final String baseName = _name_1;
- DetailCode _inheritedEntry_1 = rs.getInheritedEntry();
- boolean _empty = this._roomExtensions.empty(_inheritedEntry_1);
- boolean _operator_not = BooleanExtensions.operator_not(_empty);
- if (_operator_not) {
- String _superCall = this.langExt.superCall(baseName, entryOp, "");
- String _operator_plus = StringExtensions.operator_plus(_superCall, entry);
- entry = _operator_plus;
- }
- DetailCode _inheritedExit_1 = rs.getInheritedExit();
- boolean _empty_1 = this._roomExtensions.empty(_inheritedExit_1);
- boolean _operator_not_1 = BooleanExtensions.operator_not(_empty_1);
- if (_operator_not_1) {
- String _superCall_1 = this.langExt.superCall(baseName, exitOp, "");
- String _operator_plus_1 = StringExtensions.operator_plus(exit, _superCall_1);
- exit = _operator_plus_1;
- }
- DetailCode _inheritedDo_1 = rs.getInheritedDo();
- boolean _empty_2 = this._roomExtensions.empty(_inheritedDo_1);
- boolean _operator_not_2 = BooleanExtensions.operator_not(_empty_2);
- if (_operator_not_2) {
- String _superCall_2 = this.langExt.superCall(baseName, doOp, "");
- String _operator_plus_2 = StringExtensions.operator_plus(_superCall_2, docode);
- docode = _operator_plus_2;
- }
- }
- } else {
- {
- String _operator_plus_3 = StringExtensions.operator_plus(inhEntry, entry);
- entry = _operator_plus_3;
- String _operator_plus_4 = StringExtensions.operator_plus(exit, inhExit);
- exit = _operator_plus_4;
- String _operator_plus_5 = StringExtensions.operator_plus(inhDo, docode);
- docode = _operator_plus_5;
- }
+ final ExpandedRefinedState rs = ((ExpandedRefinedState) state);
+ AbstractGenerator _instance_3 = AbstractGenerator.getInstance();
+ DetailCode _inheritedEntry = rs.getInheritedEntry();
+ final String inhEntry = _instance_3.getTranslatedCode(_inheritedEntry);
+ AbstractGenerator _instance_4 = AbstractGenerator.getInstance();
+ DetailCode _inheritedExit = rs.getInheritedExit();
+ final String inhExit = _instance_4.getTranslatedCode(_inheritedExit);
+ AbstractGenerator _instance_5 = AbstractGenerator.getInstance();
+ DetailCode _inheritedDo = rs.getInheritedDo();
+ final String inhDo = _instance_5.getTranslatedCode(_inheritedDo);
+ boolean _usesInheritance = this.langExt.usesInheritance();
+ if (_usesInheritance) {
+ ActorClass _actorClass_1 = xpac.getActorClass();
+ ActorClass _base = _actorClass_1.getBase();
+ final String baseName = _base.getName();
+ DetailCode _inheritedEntry_1 = rs.getInheritedEntry();
+ boolean _empty = this._roomExtensions.empty(_inheritedEntry_1);
+ boolean _not = (!_empty);
+ if (_not) {
+ String _superCall = this.langExt.superCall(baseName, entryOp, "");
+ String _plus = (_superCall + entry);
+ entry = _plus;
+ }
+ DetailCode _inheritedExit_1 = rs.getInheritedExit();
+ boolean _empty_1 = this._roomExtensions.empty(_inheritedExit_1);
+ boolean _not_1 = (!_empty_1);
+ if (_not_1) {
+ String _superCall_1 = this.langExt.superCall(baseName, exitOp, "");
+ String _plus_1 = (exit + _superCall_1);
+ exit = _plus_1;
+ }
+ DetailCode _inheritedDo_1 = rs.getInheritedDo();
+ boolean _empty_2 = this._roomExtensions.empty(_inheritedDo_1);
+ boolean _not_2 = (!_empty_2);
+ if (_not_2) {
+ String _superCall_2 = this.langExt.superCall(baseName, doOp, "");
+ String _plus_2 = (_superCall_2 + docode);
+ docode = _plus_2;
}
+ } else {
+ String _plus_3 = (inhEntry + entry);
+ entry = _plus_3;
+ String _plus_4 = (exit + inhExit);
+ exit = _plus_4;
+ String _plus_5 = (inhDo + docode);
+ docode = _plus_5;
}
}
StringConcatenation _builder = new StringConcatenation();
{
boolean _isEmpty = entry.isEmpty();
- boolean _operator_not_3 = BooleanExtensions.operator_not(_isEmpty);
- if (_operator_not_3) {
+ boolean _not_3 = (!_isEmpty);
+ if (_not_3) {
String _accessLevelProtected = this.langExt.accessLevelProtected();
_builder.append(_accessLevelProtected, "");
_builder.append("void ");
@@ -1391,8 +1338,8 @@ public class GenericStateMachineGenerator { }
{
boolean _isEmpty_1 = exit.isEmpty();
- boolean _operator_not_4 = BooleanExtensions.operator_not(_isEmpty_1);
- if (_operator_not_4) {
+ boolean _not_4 = (!_isEmpty_1);
+ if (_not_4) {
String _accessLevelProtected_1 = this.langExt.accessLevelProtected();
_builder.append(_accessLevelProtected_1, "");
_builder.append("void ");
@@ -1410,8 +1357,8 @@ public class GenericStateMachineGenerator { }
{
boolean _isEmpty_2 = docode.isEmpty();
- boolean _operator_not_5 = BooleanExtensions.operator_not(_isEmpty_2);
- if (_operator_not_5) {
+ boolean _not_5 = (!_isEmpty_2);
+ if (_not_5) {
String _accessLevelProtected_2 = this.langExt.accessLevelProtected();
_builder.append(_accessLevelProtected_2, "");
_builder.append(" void ");
@@ -1432,11 +1379,14 @@ public class GenericStateMachineGenerator { return _xblockexpression;
}
- private StringConcatenation guard(final Transition tt, final String trigger, final ExpandedActorClass ac) {
+ private CharSequence guard(final Transition tt, final String trigger, final ExpandedActorClass ac) {
if (tt instanceof TriggeredTransition) {
return _guard((TriggeredTransition)tt, trigger, ac);
- } else {
+ } else if (tt != null) {
return _guard(tt, trigger, ac);
+ } else {
+ throw new IllegalArgumentException("Unhandled parameter types: " +
+ Arrays.<Object>asList(tt, trigger, ac).toString());
}
}
}
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java index 752d71f47..828ac29cc 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java @@ -12,12 +12,11 @@ import org.eclipse.etrice.core.genmodel.base.ILogger; import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.generator.generic.RoomExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class PrepareFileSystem {
@Inject
private RoomExtensions roomExt;
@@ -29,49 +28,46 @@ public class PrepareFileSystem { private ILogger logger;
public void prepare(final Resource resource) {
- HashSet<String> _hashSet = new HashSet<String>();
- Set<String> pathes = _hashSet;
- EList<EObject> _contents = resource.getContents();
- for (final EObject e : _contents) {
- if ((e instanceof Root)) {
- EList<RoomModel> _usedRoomModels = ((Root) e).getUsedRoomModels();
- for (final RoomModel mdl : _usedRoomModels) {
- String _generationTargetPath = this.roomExt.getGenerationTargetPath(mdl);
- pathes.add(_generationTargetPath);
- }
+ HashSet<String> _hashSet = new HashSet<String>();
+ Set<String> pathes = _hashSet;
+ EList<EObject> _contents = resource.getContents();
+ for (final EObject e : _contents) {
+ if ((e instanceof Root)) {
+ EList<RoomModel> _usedRoomModels = ((Root) e).getUsedRoomModels();
+ for (final RoomModel mdl : _usedRoomModels) {
+ String _generationTargetPath = this.roomExt.getGenerationTargetPath(mdl);
+ pathes.add(_generationTargetPath);
}
}
- for (final String path : pathes) {
- {
- String _operator_plus = StringExtensions.operator_plus("clearing ", path);
- this.logger.logInfo(_operator_plus);
- File _file = new File(path);
- File f = _file;
- this.eraseContents(f);
- this.fileAccess.setOutputPath(path);
- StringConcatenation _readmeText = this.readmeText();
- this.fileAccess.generateFile("readme.txt", _readmeText);
- }
+ }
+ for (final String path : pathes) {
+ {
+ String _plus = ("clearing " + path);
+ this.logger.logInfo(_plus);
+ File _file = new File(path);
+ File f = _file;
+ this.eraseContents(f);
+ this.fileAccess.setOutputPath(path);
+ CharSequence _readmeText = this.readmeText();
+ this.fileAccess.generateFile("readme.txt", _readmeText);
}
+ }
}
public void eraseContents(final File f) {
boolean _isDirectory = f.isDirectory();
if (_isDirectory) {
- {
- File[] _listFiles = f.listFiles();
- File[] children = _listFiles;
- for (final File child : children) {
- {
- this.eraseContents(child);
- child.delete();
- }
+ File[] children = f.listFiles();
+ for (final File child : children) {
+ {
+ this.eraseContents(child);
+ child.delete();
}
}
}
}
- public StringConcatenation readmeText() {
+ public CharSequence readmeText() {
StringConcatenation _builder = new StringConcatenation();
_builder.append("This directory is an eTrice code generation target.");
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java index a66e1f488..34fe9e546 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java @@ -1,5 +1,6 @@ package org.eclipse.etrice.generator.generic;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.List;
@@ -22,16 +23,12 @@ import org.eclipse.etrice.generator.base.AbstractGenerator; import org.eclipse.etrice.generator.generic.ConfigExtension;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.TypeHelpers;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
+import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Conversions;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.eclipse.xtext.xbase.lib.StringExtensions;
-import org.eclipse.xtext.xtend2.lib.StringConcatenation;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class ProcedureHelpers {
@Inject
private ILanguageExtension languageExt;
@@ -45,118 +42,115 @@ public class ProcedureHelpers { @Inject
private ILogger logger;
- public StringConcatenation userCode(final DataClass dc, final int id) {
- StringConcatenation _switchResult = null;
- final int id_1 = id;
- boolean matched = false;
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,1)) {
- matched=true;
+ public CharSequence userCode(final DataClass dc, final int id) {
+ CharSequence _switchResult = null;
+ boolean _matched = false;
+ if (!_matched) {
+ if (Objects.equal(id,1)) {
+ _matched=true;
String _deepUserCode1 = RoomHelpers.getDeepUserCode1(dc);
- StringConcatenation _userCode = this.userCode(_deepUserCode1);
+ CharSequence _userCode = this.userCode(_deepUserCode1);
_switchResult = _userCode;
}
}
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,2)) {
- matched=true;
+ if (!_matched) {
+ if (Objects.equal(id,2)) {
+ _matched=true;
String _deepUserCode2 = RoomHelpers.getDeepUserCode2(dc);
- StringConcatenation _userCode_1 = this.userCode(_deepUserCode2);
+ CharSequence _userCode_1 = this.userCode(_deepUserCode2);
_switchResult = _userCode_1;
}
}
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,3)) {
- matched=true;
+ if (!_matched) {
+ if (Objects.equal(id,3)) {
+ _matched=true;
String _deepUserCode3 = RoomHelpers.getDeepUserCode3(dc);
- StringConcatenation _userCode_2 = this.userCode(_deepUserCode3);
+ CharSequence _userCode_2 = this.userCode(_deepUserCode3);
_switchResult = _userCode_2;
}
}
return _switchResult;
}
- public StringConcatenation userCode(final ProtocolClass pc, final int id) {
- StringConcatenation _switchResult = null;
- final int id_1 = id;
- boolean matched = false;
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,1)) {
- matched=true;
+ public CharSequence userCode(final ProtocolClass pc, final int id) {
+ CharSequence _switchResult = null;
+ boolean _matched = false;
+ if (!_matched) {
+ if (Objects.equal(id,1)) {
+ _matched=true;
String _deepUserCode1 = RoomHelpers.getDeepUserCode1(pc);
- StringConcatenation _userCode = this.userCode(_deepUserCode1);
+ CharSequence _userCode = this.userCode(_deepUserCode1);
_switchResult = _userCode;
}
}
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,2)) {
- matched=true;
+ if (!_matched) {
+ if (Objects.equal(id,2)) {
+ _matched=true;
String _deepUserCode2 = RoomHelpers.getDeepUserCode2(pc);
- StringConcatenation _userCode_1 = this.userCode(_deepUserCode2);
+ CharSequence _userCode_1 = this.userCode(_deepUserCode2);
_switchResult = _userCode_1;
}
}
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,3)) {
- matched=true;
+ if (!_matched) {
+ if (Objects.equal(id,3)) {
+ _matched=true;
String _deepUserCode3 = RoomHelpers.getDeepUserCode3(pc);
- StringConcatenation _userCode_2 = this.userCode(_deepUserCode3);
+ CharSequence _userCode_2 = this.userCode(_deepUserCode3);
_switchResult = _userCode_2;
}
}
return _switchResult;
}
- public StringConcatenation userCode(final ActorContainerClass ac, final int id) {
- StringConcatenation _switchResult = null;
- final int id_1 = id;
- boolean matched = false;
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,1)) {
- matched=true;
+ public CharSequence userCode(final ActorContainerClass ac, final int id) {
+ CharSequence _switchResult = null;
+ boolean _matched = false;
+ if (!_matched) {
+ if (Objects.equal(id,1)) {
+ _matched=true;
String _deepUserCode1 = RoomHelpers.getDeepUserCode1(ac);
- StringConcatenation _userCode = this.userCode(_deepUserCode1);
+ CharSequence _userCode = this.userCode(_deepUserCode1);
_switchResult = _userCode;
}
}
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,2)) {
- matched=true;
+ if (!_matched) {
+ if (Objects.equal(id,2)) {
+ _matched=true;
String _deepUserCode2 = RoomHelpers.getDeepUserCode2(ac);
- StringConcatenation _userCode_1 = this.userCode(_deepUserCode2);
+ CharSequence _userCode_1 = this.userCode(_deepUserCode2);
_switchResult = _userCode_1;
}
}
- if (!matched) {
- if (ObjectExtensions.operator_equals(id_1,3)) {
- matched=true;
+ if (!_matched) {
+ if (Objects.equal(id,3)) {
+ _matched=true;
String _deepUserCode3 = RoomHelpers.getDeepUserCode3(ac);
- StringConcatenation _userCode_2 = this.userCode(_deepUserCode3);
+ CharSequence _userCode_2 = this.userCode(_deepUserCode3);
_switchResult = _userCode_2;
}
}
return _switchResult;
}
- public StringConcatenation userCode(final DetailCode dc) {
+ public CharSequence userCode(final DetailCode dc) {
String _detailCode = RoomHelpers.getDetailCode(dc);
- StringConcatenation _userCode = this.userCode(_detailCode);
+ CharSequence _userCode = this.userCode(_detailCode);
return _userCode;
}
- private StringConcatenation userCode(final String code) {
+ private CharSequence userCode(final String code) {
StringConcatenation _builder = new StringConcatenation();
{
- boolean _operator_and = false;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(code, null);
- if (!_operator_notEquals) {
- _operator_and = false;
+ boolean _and = false;
+ boolean _notEquals = (!Objects.equal(code, null));
+ if (!_notEquals) {
+ _and = false;
} else {
boolean _isEmpty = code.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- _operator_and = BooleanExtensions.operator_and(_operator_notEquals, _operator_not);
+ boolean _not = (!_isEmpty);
+ _and = (_notEquals && _not);
}
- if (_operator_and) {
+ if (_and) {
_builder.append("/*--------------------- begin user code ---------------------*/");
_builder.newLine();
_builder.append(code, "");
@@ -171,7 +165,7 @@ public class ProcedureHelpers { /**
* TODO: add ref type
*/
- public StringConcatenation attributes(final List<Attribute> attribs) {
+ public CharSequence attributes(final List<Attribute> attribs) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/*--------------------- attributes ---------------------*/");
_builder.newLine();
@@ -179,8 +173,8 @@ public class ProcedureHelpers { for(final Attribute attribute : attribs) {
{
int _size = attribute.getSize();
- boolean _operator_equals = ObjectExtensions.operator_equals(((Integer)_size), ((Integer)0));
- if (_operator_equals) {
+ boolean _equals = (_size == 0);
+ if (_equals) {
RefableType _refType = attribute.getRefType();
DataType _type = _refType.getType();
String _typeName = this._typeHelpers.typeName(_type);
@@ -218,82 +212,78 @@ public class ProcedureHelpers { }
public String arrayInitializer(final Attribute att) {
- String _xifexpression = null;
- String _defaultValueLiteral = att.getDefaultValueLiteral();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_defaultValueLiteral, null);
- if (_operator_notEquals) {
- String _defaultValueLiteral_1 = att.getDefaultValueLiteral();
- _xifexpression = _defaultValueLiteral_1;
- } else {
- RefableType _refType = att.getRefType();
- DataType _type = _refType.getType();
- String _defaultValue = this._typeHelpers.defaultValue(_type);
- _xifexpression = _defaultValue;
- }
- String dflt = _xifexpression;
- boolean _startsWith = dflt.startsWith("{");
- if (_startsWith) {
- {
- String[] _split = dflt.split(",");
- int _size = ((List<String>)Conversions.doWrapArray(_split)).size();
- int _size_1 = att.getSize();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(((Integer)_size), ((Integer)_size_1));
- if (_operator_notEquals_1) {
- String _name = att.getName();
- String _operator_plus = StringExtensions.operator_plus("WARNING: array size determined by initializer differs from attribute size (", _name);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "[");
- int _size_2 = att.getSize();
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, ((Integer)_size_2));
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "] <-> ");
- String _operator_plus_4 = StringExtensions.operator_plus(_operator_plus_3, dflt);
- String _operator_plus_5 = StringExtensions.operator_plus(_operator_plus_4, ")");
- this.logger.logInfo(_operator_plus_5);
- }
- return dflt;
- }
+ String _xifexpression = null;
+ String _defaultValueLiteral = att.getDefaultValueLiteral();
+ boolean _notEquals = (!Objects.equal(_defaultValueLiteral, null));
+ if (_notEquals) {
+ String _defaultValueLiteral_1 = att.getDefaultValueLiteral();
+ _xifexpression = _defaultValueLiteral_1;
+ } else {
+ RefableType _refType = att.getRefType();
+ DataType _type = _refType.getType();
+ String _defaultValue = this._typeHelpers.defaultValue(_type);
+ _xifexpression = _defaultValue;
+ }
+ String dflt = _xifexpression;
+ boolean _startsWith = dflt.startsWith("{");
+ if (_startsWith) {
+ String[] _split = dflt.split(",");
+ int _size = ((List<String>)Conversions.doWrapArray(_split)).size();
+ int _size_1 = att.getSize();
+ boolean _notEquals_1 = (_size != _size_1);
+ if (_notEquals_1) {
+ String _name = att.getName();
+ String _plus = ("WARNING: array size determined by initializer differs from attribute size (" + _name);
+ String _plus_1 = (_plus + "[");
+ int _size_2 = att.getSize();
+ String _plus_2 = (_plus_1 + Integer.valueOf(_size_2));
+ String _plus_3 = (_plus_2 + "] <-> ");
+ String _plus_4 = (_plus_3 + dflt);
+ String _plus_5 = (_plus_4 + ")");
+ this.logger.logInfo(_plus_5);
}
- String result = "{";
- int i = 0;
- int _size_3 = att.getSize();
- boolean _operator_lessThan = ComparableExtensions.<Integer>operator_lessThan(((Integer)i), ((Integer)_size_3));
- Boolean _xwhileexpression = _operator_lessThan;
- while (_xwhileexpression) {
- {
- String _operator_plus_6 = StringExtensions.operator_plus(result, dflt);
- result = _operator_plus_6;
- int _operator_plus_7 = IntegerExtensions.operator_plus(((Integer)i), ((Integer)1));
- i = _operator_plus_7;
- int _size_4 = att.getSize();
- boolean _operator_lessThan_1 = ComparableExtensions.<Integer>operator_lessThan(((Integer)i), ((Integer)_size_4));
- if (_operator_lessThan_1) {
- String _operator_plus_8 = StringExtensions.operator_plus(result, ", ");
- result = _operator_plus_8;
- }
+ return dflt;
+ }
+ String result = "{";
+ int i = 0;
+ int _size_3 = att.getSize();
+ boolean _lessThan = (i < _size_3);
+ boolean _while = _lessThan;
+ while (_while) {
+ {
+ String _plus_6 = (result + dflt);
+ result = _plus_6;
+ int _plus_7 = (i + 1);
+ i = _plus_7;
+ int _size_4 = att.getSize();
+ boolean _lessThan_1 = (i < _size_4);
+ if (_lessThan_1) {
+ String _plus_8 = (result + ", ");
+ result = _plus_8;
}
- int _size_5 = att.getSize();
- boolean _operator_lessThan_2 = ComparableExtensions.<Integer>operator_lessThan(((Integer)i), ((Integer)_size_5));
- _xwhileexpression = _operator_lessThan_2;
}
- String _operator_plus_9 = StringExtensions.operator_plus(result, "}");
- return _operator_plus_9;
+ int _size_4 = att.getSize();
+ boolean _lessThan_1 = (i < _size_4);
+ _while = _lessThan_1;
+ }
+ return (result + "}");
}
- public StringConcatenation attributeInitialization(final List<Attribute> attribs, final boolean useClassDefaultsOnly) {
+ public CharSequence attributeInitialization(final List<Attribute> attribs, final boolean useClassDefaultsOnly) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("// initialize attributes");
_builder.newLine();
{
for(final Attribute a : attribs) {
- String _initValue = this._configExtension.getInitValue(a);
- String value = _initValue;
+ String value = this._configExtension.getInitValue(a);
_builder.newLineIfNotEmpty();
{
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(value, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(value, null));
+ if (_notEquals) {
{
boolean _isArray = this._configExtension.isArray(a);
- boolean _operator_not = BooleanExtensions.operator_not(_isArray);
- if (_operator_not) {
+ boolean _not = (!_isArray);
+ if (_not) {
String _name = a.getName();
_builder.append(_name, "");
_builder.append(" = ");
@@ -345,28 +335,28 @@ public class ProcedureHelpers { }
}
} else {
- boolean _operator_or = false;
- boolean _operator_or_1 = false;
+ boolean _or = false;
+ boolean _or_1 = false;
RefableType _refType_2 = a.getRefType();
DataType _type_2 = _refType_2.getType();
if ((_type_2 instanceof ComplexType)) {
- _operator_or_1 = true;
+ _or_1 = true;
} else {
int _size_2 = a.getSize();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size_2), ((Integer)1));
- _operator_or_1 = BooleanExtensions.operator_or((_type_2 instanceof ComplexType), _operator_greaterThan);
+ boolean _greaterThan = (_size_2 > 1);
+ _or_1 = ((_type_2 instanceof ComplexType) || _greaterThan);
}
- if (_operator_or_1) {
- _operator_or = true;
+ if (_or_1) {
+ _or = true;
} else {
- boolean _operator_not_1 = BooleanExtensions.operator_not(useClassDefaultsOnly);
- _operator_or = BooleanExtensions.operator_or(_operator_or_1, _operator_not_1);
+ boolean _not_1 = (!useClassDefaultsOnly);
+ _or = (_or_1 || _not_1);
}
- if (_operator_or) {
+ if (_or) {
{
int _size_3 = a.getSize();
- boolean _operator_equals = ObjectExtensions.operator_equals(((Integer)_size_3), ((Integer)0));
- if (_operator_equals) {
+ boolean _equals = (_size_3 == 0);
+ if (_equals) {
{
RefableType _refType_3 = a.getRefType();
boolean _isRef = _refType_3.isRef();
@@ -404,8 +394,8 @@ public class ProcedureHelpers { _builder.append("];");
_builder.newLineIfNotEmpty();
{
- boolean _operator_not_2 = BooleanExtensions.operator_not(useClassDefaultsOnly);
- if (_operator_not_2) {
+ boolean _not_2 = (!useClassDefaultsOnly);
+ if (_not_2) {
_builder.append("for (int i=0;i<");
int _size_5 = a.getSize();
_builder.append(_size_5, "");
@@ -444,17 +434,17 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation attributeSettersGettersDeclaration(final List<Attribute> attribs, final String classname) {
+ public CharSequence attributeSettersGettersDeclaration(final List<Attribute> attribs, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("//--------------------- attribute setters and getters");
_builder.newLine();
{
for(final Attribute attribute : attribs) {
- StringConcatenation _setterHeader = this.setterHeader(attribute, classname);
+ CharSequence _setterHeader = this.setterHeader(attribute, classname);
_builder.append(_setterHeader, "");
_builder.append(";");
_builder.newLineIfNotEmpty();
- StringConcatenation _terHeader = this.getterHeader(attribute, classname);
+ CharSequence _terHeader = this.getterHeader(attribute, classname);
_builder.append(_terHeader, "");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -463,13 +453,13 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation attributeSettersGettersImplementation(final List<Attribute> attribs, final String classname) {
+ public CharSequence attributeSettersGettersImplementation(final List<Attribute> attribs, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("//--------------------- attribute setters and getters");
_builder.newLine();
{
for(final Attribute attribute : attribs) {
- StringConcatenation _setterHeader = this.setterHeader(attribute, classname);
+ CharSequence _setterHeader = this.setterHeader(attribute, classname);
_builder.append(_setterHeader, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -485,7 +475,7 @@ public class ProcedureHelpers { _builder.newLineIfNotEmpty();
_builder.append("}");
_builder.newLine();
- StringConcatenation _terHeader = this.getterHeader(attribute, classname);
+ CharSequence _terHeader = this.getterHeader(attribute, classname);
_builder.append(_terHeader, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -504,7 +494,7 @@ public class ProcedureHelpers { return _builder;
}
- private StringConcatenation setterHeader(final Attribute attribute, final String classname) {
+ private CharSequence setterHeader(final Attribute attribute, final String classname) {
StringConcatenation _builder = new StringConcatenation();
String _accessLevelPublic = this.languageExt.accessLevelPublic();
_builder.append(_accessLevelPublic, "");
@@ -521,8 +511,8 @@ public class ProcedureHelpers { _builder.append(_typeName, "");
{
int _size = attribute.getSize();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(((Integer)_size), ((Integer)0));
- if (_operator_notEquals) {
+ boolean _notEquals = (_size != 0);
+ if (_notEquals) {
_builder.append("[]");
}
}
@@ -533,7 +523,7 @@ public class ProcedureHelpers { return _builder;
}
- private StringConcatenation getterHeader(final Attribute attribute, final String classname) {
+ private CharSequence getterHeader(final Attribute attribute, final String classname) {
StringConcatenation _builder = new StringConcatenation();
String _accessLevelPublic = this.languageExt.accessLevelPublic();
_builder.append(_accessLevelPublic, "");
@@ -543,8 +533,8 @@ public class ProcedureHelpers { _builder.append(_typeName, "");
{
int _size = attribute.getSize();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(((Integer)_size), ((Integer)0));
- if (_operator_notEquals) {
+ boolean _notEquals = (_size != 0);
+ if (_notEquals) {
_builder.append("[]");
}
}
@@ -559,13 +549,13 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation argList(final List<Attribute> attributes) {
+ public CharSequence argList(final List<Attribute> attributes) {
StringConcatenation _builder = new StringConcatenation();
{
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final Attribute a : attributes) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(", ", "");
}
@@ -575,8 +565,8 @@ public class ProcedureHelpers { _builder.append(_typeName, "");
{
int _size = a.getSize();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)1));
- if (_operator_greaterThan) {
+ boolean _greaterThan = (_size > 1);
+ if (_greaterThan) {
_builder.append("[]");
}
}
@@ -588,7 +578,7 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation getterImplementation(final String typeName, final String name, final String classname) {
+ public CharSequence getterImplementation(final String typeName, final String name, final String classname) {
StringConcatenation _builder = new StringConcatenation();
String _accessLevelPublic = this.languageExt.accessLevelPublic();
_builder.append(_accessLevelPublic, "");
@@ -612,7 +602,7 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation invokeGetter(final String name, final String classname) {
+ public CharSequence invokeGetter(final String name, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("get");
String _firstUpper = StringExtensions.toFirstUpper(name);
@@ -624,7 +614,7 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation invokeSetter(final String name, final String classname, final String value) {
+ public CharSequence invokeSetter(final String name, final String classname, final String value) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("set");
String _firstUpper = StringExtensions.toFirstUpper(name);
@@ -637,24 +627,24 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation operationsDeclaration(final List<? extends Operation> operations, final String classname) {
+ public CharSequence operationsDeclaration(final List<? extends Operation> operations, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/*--------------------- operations ---------------------*/");
_builder.newLine();
{
for(final Operation operation : operations) {
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _usesInheritance = this.languageExt.usesInheritance();
if (!_usesInheritance) {
- _operator_and = false;
+ _and = false;
} else {
boolean _isConstructor = RoomHelpers.isConstructor(operation);
- _operator_and = BooleanExtensions.operator_and(_usesInheritance, _isConstructor);
+ _and = (_usesInheritance && _isConstructor);
}
- boolean _operator_not = BooleanExtensions.operator_not(_operator_and);
- if (_operator_not) {
- StringConcatenation _operationSignature = this.operationSignature(operation, classname, true);
+ boolean _not = (!_and);
+ if (_not) {
+ CharSequence _operationSignature = this.operationSignature(operation, classname, true);
_builder.append(_operationSignature, "");
_builder.append(";");
_builder.newLineIfNotEmpty();
@@ -665,24 +655,24 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation operationsImplementation(final List<? extends Operation> operations, final String classname) {
+ public CharSequence operationsImplementation(final List<? extends Operation> operations, final String classname) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/*--------------------- operations ---------------------*/");
_builder.newLine();
{
for(final Operation operation : operations) {
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _usesInheritance = this.languageExt.usesInheritance();
if (!_usesInheritance) {
- _operator_and = false;
+ _and = false;
} else {
boolean _isConstructor = RoomHelpers.isConstructor(operation);
- _operator_and = BooleanExtensions.operator_and(_usesInheritance, _isConstructor);
+ _and = (_usesInheritance && _isConstructor);
}
- boolean _operator_not = BooleanExtensions.operator_not(_operator_and);
- if (_operator_not) {
- StringConcatenation _operationSignature = this.operationSignature(operation, classname, false);
+ boolean _not = (!_and);
+ if (_not) {
+ CharSequence _operationSignature = this.operationSignature(operation, classname, false);
_builder.append(_operationSignature, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -701,7 +691,7 @@ public class ProcedureHelpers { return _builder;
}
- public StringConcatenation operationsImplementation(final ActorClass ac) {
+ public CharSequence operationsImplementation(final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("/*--------------------- operations ---------------------*/");
_builder.newLine();
@@ -709,18 +699,18 @@ public class ProcedureHelpers { EList<StandardOperation> _operations = ac.getOperations();
for(final StandardOperation operation : _operations) {
{
- boolean _operator_and = false;
+ boolean _and = false;
boolean _usesInheritance = this.languageExt.usesInheritance();
if (!_usesInheritance) {
- _operator_and = false;
+ _and = false;
} else {
boolean _isConstructor = RoomHelpers.isConstructor(operation);
- _operator_and = BooleanExtensions.operator_and(_usesInheritance, _isConstructor);
+ _and = (_usesInheritance && _isConstructor);
}
- boolean _operator_not = BooleanExtensions.operator_not(_operator_and);
- if (_operator_not) {
+ boolean _not = (!_and);
+ if (_not) {
String _name = ac.getName();
- StringConcatenation _operationSignature = this.operationSignature(operation, _name, false);
+ CharSequence _operationSignature = this.operationSignature(operation, _name, false);
_builder.append(_operationSignature, "");
_builder.append(" {");
_builder.newLineIfNotEmpty();
@@ -739,30 +729,30 @@ public class ProcedureHelpers { return _builder;
}
- private StringConcatenation operationSignature(final Operation operation, final String classname, final boolean isDeclaration) {
- StringConcatenation _xifexpression = null;
+ private CharSequence operationSignature(final Operation operation, final String classname, final boolean isDeclaration) {
+ CharSequence _xifexpression = null;
boolean _isConstructor = RoomHelpers.isConstructor(operation);
if (_isConstructor) {
String _constructorName = this.languageExt.constructorName(classname);
String _constructorReturnType = this.languageExt.constructorReturnType();
- StringConcatenation _classOperationSignature = this.classOperationSignature(classname, _constructorName, "", _constructorReturnType, isDeclaration);
+ CharSequence _classOperationSignature = this.classOperationSignature(classname, _constructorName, "", _constructorReturnType, isDeclaration);
_xifexpression = _classOperationSignature;
} else {
- StringConcatenation _xifexpression_1 = null;
+ CharSequence _xifexpression_1 = null;
boolean _isDestructor = RoomHelpers.isDestructor(operation);
if (_isDestructor) {
String _destructorName = this.languageExt.destructorName(classname);
String _destructorReturnType = this.languageExt.destructorReturnType();
- StringConcatenation _classOperationSignature_1 = this.classOperationSignature(classname, _destructorName, "", _destructorReturnType, isDeclaration);
+ CharSequence _classOperationSignature_1 = this.classOperationSignature(classname, _destructorName, "", _destructorReturnType, isDeclaration);
_xifexpression_1 = _classOperationSignature_1;
} else {
String _name = operation.getName();
EList<VarDecl> _arguments = operation.getArguments();
- StringConcatenation _BuildArgumentList = this.BuildArgumentList(_arguments);
+ CharSequence _BuildArgumentList = this.BuildArgumentList(_arguments);
String _string = _BuildArgumentList.toString();
RefableType _returntype = operation.getReturntype();
String _dataTypeToString = this.dataTypeToString(_returntype);
- StringConcatenation _classOperationSignature_2 = this.classOperationSignature(classname, _name, _string, _dataTypeToString, isDeclaration);
+ CharSequence _classOperationSignature_2 = this.classOperationSignature(classname, _name, _string, _dataTypeToString, isDeclaration);
_xifexpression_1 = _classOperationSignature_2;
}
_xifexpression = _xifexpression_1;
@@ -772,8 +762,8 @@ public class ProcedureHelpers { private String dataTypeToString(final RefableType type) {
String _xifexpression = null;
- boolean _operator_equals = ObjectExtensions.operator_equals(type, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(type, null);
+ if (_equals) {
_xifexpression = "void";
} else {
String _xifexpression_1 = null;
@@ -782,8 +772,8 @@ public class ProcedureHelpers { DataType _type = type.getType();
String _typeName = this._typeHelpers.typeName(_type);
String _pointerLiteral = this.languageExt.pointerLiteral();
- String _operator_plus = StringExtensions.operator_plus(_typeName, _pointerLiteral);
- _xifexpression_1 = _operator_plus;
+ String _plus = (_typeName + _pointerLiteral);
+ _xifexpression_1 = _plus;
} else {
DataType _type_1 = type.getType();
String _typeName_1 = this._typeHelpers.typeName(_type_1);
@@ -797,13 +787,13 @@ public class ProcedureHelpers { /**
* builds comma separated argument list as string from EList<VarDecl> arguments
*/
- private StringConcatenation BuildArgumentList(final EList<VarDecl> arguments) {
+ private CharSequence BuildArgumentList(final EList<VarDecl> arguments) {
StringConcatenation _builder = new StringConcatenation();
{
- boolean hasAnyElements = false;
+ boolean _hasElements = false;
for(final VarDecl argument : arguments) {
- if (!hasAnyElements) {
- hasAnyElements = true;
+ if (!_hasElements) {
+ _hasElements = true;
} else {
_builder.appendImmediate(", ", "");
}
@@ -827,7 +817,7 @@ public class ProcedureHelpers { return _builder;
}
- private StringConcatenation classOperationSignature(final String classname, final String operationname, final String argumentList, final String returnType, final boolean isDeclaration) {
+ private CharSequence classOperationSignature(final String classname, final String operationname, final String argumentList, final String returnType, final boolean isDeclaration) {
StringConcatenation _builder = new StringConcatenation();
String _accessLevelPublic = this.languageExt.accessLevelPublic();
_builder.append(_accessLevelPublic, "");
@@ -837,8 +827,8 @@ public class ProcedureHelpers { _builder.append(_memberInDeclaration, "");
_builder.append("(");
boolean _isEmpty = argumentList.isEmpty();
- boolean _operator_not = BooleanExtensions.operator_not(_isEmpty);
- String _selfPointer = this.languageExt.selfPointer(classname, _operator_not);
+ boolean _not = (!_isEmpty);
+ String _selfPointer = this.languageExt.selfPointer(classname, _not);
_builder.append(_selfPointer, "");
_builder.append(argumentList, "");
_builder.append(")");
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java index 313691ef4..4c863e418 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java @@ -1,5 +1,7 @@ package org.eclipse.etrice.generator.generic;
+import com.google.common.base.Objects;
+import com.google.common.collect.Iterables;
import com.google.inject.Singleton;
import java.io.File;
import java.util.ArrayList;
@@ -25,7 +27,6 @@ import org.eclipse.etrice.core.room.ExternalPort; import org.eclipse.etrice.core.room.GeneralProtocolClass;
import org.eclipse.etrice.core.room.Guard;
import org.eclipse.etrice.core.room.InitialTransition;
-import org.eclipse.etrice.core.room.InterfaceItem;
import org.eclipse.etrice.core.room.Message;
import org.eclipse.etrice.core.room.MessageHandler;
import org.eclipse.etrice.core.room.Port;
@@ -49,43 +50,37 @@ import org.eclipse.etrice.core.room.TriggeredTransition; import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.etrice.generator.base.CodegenHelpers;
-import org.eclipse.xtext.xbase.lib.BooleanExtensions;
-import org.eclipse.xtext.xbase.lib.CollectionExtensions;
-import org.eclipse.xtext.xbase.lib.ComparableExtensions;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerExtensions;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class RoomExtensions {
public <T extends Object> List<T> union(final List<T> l1, final List<T> l2) {
- ArrayList<T> _arrayList = new ArrayList<T>();
- ArrayList<T> ret = _arrayList;
- ret.addAll(l1);
- ret.addAll(l2);
- return ret;
+ ArrayList<T> _arrayList = new ArrayList<T>();
+ ArrayList<T> ret = _arrayList;
+ ret.addAll(l1);
+ ret.addAll(l2);
+ return ret;
}
public <T extends Object> Iterable<T> union(final Iterable<T> l1, final Iterable<T> l2) {
- ArrayList<T> _arrayList = new ArrayList<T>();
- ArrayList<T> ret = _arrayList;
- CollectionExtensions.<T>addAll(ret, l1);
- CollectionExtensions.<T>addAll(ret, l2);
- return ret;
+ ArrayList<T> _arrayList = new ArrayList<T>();
+ ArrayList<T> ret = _arrayList;
+ Iterables.<T>addAll(ret, l1);
+ Iterables.<T>addAll(ret, l2);
+ return ret;
}
public List<Port> punion(final List<Port> in1, final List<ExternalPort> in2) {
- ArrayList<Port> _arrayList = new ArrayList<Port>();
- ArrayList<Port> ret = _arrayList;
- for (final ExternalPort ele : in2) {
- Port _ifport = ele.getIfport();
- ret.add(_ifport);
- }
- ret.addAll(in1);
- return ret;
+ ArrayList<Port> _arrayList = new ArrayList<Port>();
+ ArrayList<Port> ret = _arrayList;
+ for (final ExternalPort ele : in2) {
+ Port _ifport = ele.getIfport();
+ ret.add(_ifport);
+ }
+ ret.addAll(in1);
+ return ret;
}
public String getGenerationPathSegment() {
@@ -97,28 +92,24 @@ public class RoomExtensions { }
public String getModelPath(final EObject e) {
- Resource _eResource = e.eResource();
- Resource res = _eResource;
- boolean _operator_equals = ObjectExtensions.operator_equals(res, null);
- if (_operator_equals) {
- return "";
- } else {
- URI _uRI = res.getURI();
- String _fileString = _uRI.toFileString();
- return _fileString;
- }
+ Resource res = e.eResource();
+ boolean _equals = Objects.equal(res, null);
+ if (_equals) {
+ return "";
+ } else {
+ URI _uRI = res.getURI();
+ return _uRI.toFileString();
+ }
}
public String getPackage(final RoomClass rc) {
EObject _eContainer = rc.eContainer();
- String _name = ((RoomModel) _eContainer).getName();
- return _name;
+ return ((RoomModel) _eContainer).getName();
}
public String getPathFromPackage(final String packageName) {
String _replaceAll = packageName.replaceAll("\\.", "/");
- String _operator_plus = StringExtensions.operator_plus(_replaceAll, "/");
- return _operator_plus;
+ return (_replaceAll + "/");
}
public String getPath(final RoomClass rc) {
@@ -128,68 +119,61 @@ public class RoomExtensions { }
public String getProjectPath(final EObject e) {
- Resource _eResource = e.eResource();
- Resource res = _eResource;
- boolean _operator_equals = ObjectExtensions.operator_equals(res, null);
- if (_operator_equals) {
+ Resource res = e.eResource();
+ boolean _equals = Objects.equal(res, null);
+ if (_equals) {
+ return "";
+ } else {
+ File _file = new File("");
+ File tmpf = _file;
+ URI _uRI = res.getURI();
+ String _fileString = _uRI.toFileString();
+ File _file_1 = new File(_fileString);
+ tmpf = _file_1;
+ boolean _isFile = tmpf.isFile();
+ boolean _not = (!_isFile);
+ if (_not) {
return "";
- } else {
+ }
+ boolean isProject = false;
+ boolean _dowhile = false;
+ do {
{
- File _file = new File("");
- File tmpf = _file;
- URI _uRI = res.getURI();
- String _fileString = _uRI.toFileString();
- File _file_1 = new File(_fileString);
- tmpf = _file_1;
- boolean _isFile = tmpf.isFile();
- boolean _operator_not = BooleanExtensions.operator_not(_isFile);
- if (_operator_not) {
- return "";
- }
- boolean isProject = false;
- Boolean _xdowhileexpression;
- do {
- {
- File _parentFile = tmpf.getParentFile();
- tmpf = _parentFile;
- String[] _list = tmpf.list();
- String[] contents = _list;
- for (final String f : contents) {
- boolean _equals = f.equals(".project");
- if (_equals) {
- isProject = true;
- }
- }
- }
- boolean _operator_and = false;
- boolean _operator_not_1 = BooleanExtensions.operator_not(isProject);
- if (!_operator_not_1) {
- _operator_and = false;
- } else {
- File _parentFile_1 = tmpf.getParentFile();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_parentFile_1, null);
- _operator_and = BooleanExtensions.operator_and(_operator_not_1, _operator_notEquals);
+ File _parentFile = tmpf.getParentFile();
+ tmpf = _parentFile;
+ String[] contents = tmpf.list();
+ for (final String f : contents) {
+ boolean _equals_1 = f.equals(".project");
+ if (_equals_1) {
+ isProject = true;
}
- _xdowhileexpression = _operator_and;
- } while(_xdowhileexpression);
- String _absolutePath = tmpf.getAbsolutePath();
- return _absolutePath;
+ }
}
- }
+ boolean _and = false;
+ boolean _not_1 = (!isProject);
+ if (!_not_1) {
+ _and = false;
+ } else {
+ File _parentFile = tmpf.getParentFile();
+ boolean _notEquals = (!Objects.equal(_parentFile, null));
+ _and = (_not_1 && _notEquals);
+ }
+ _dowhile = _and;
+ } while(_dowhile);
+ return tmpf.getAbsolutePath();
+ }
}
public String getGenerationTargetPath(final EObject e) {
String _projectPath = this.getProjectPath(e);
String _generationPathSegment = this.getGenerationPathSegment();
- String _operator_plus = StringExtensions.operator_plus(_projectPath, _generationPathSegment);
- return _operator_plus;
+ return (_projectPath + _generationPathSegment);
}
public String getDocGenerationTargetPath(final EObject e) {
String _projectPath = this.getProjectPath(e);
String _docGenerationPathSegment = this.getDocGenerationPathSegment();
- String _operator_plus = StringExtensions.operator_plus(_projectPath, _docGenerationPathSegment);
- return _operator_plus;
+ return (_projectPath + _docGenerationPathSegment);
}
public List<Port> getEndPorts(final ActorClass ac) {
@@ -202,15 +186,14 @@ public class RoomExtensions { public List<Port> getAllEndPorts(final ActorClass ac) {
List<Port> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- List<Port> _endPorts = this.getEndPorts(ac);
- return _endPorts;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return this.getEndPorts(ac);
} else {
ActorClass _base_1 = ac.getBase();
List<Port> _allEndPorts = this.getAllEndPorts(_base_1);
- List<Port> _endPorts_1 = this.getEndPorts(ac);
- List<Port> _union = this.<Port>union(_allEndPorts, _endPorts_1);
+ List<Port> _endPorts = this.getEndPorts(ac);
+ List<Port> _union = this.<Port>union(_allEndPorts, _endPorts);
_xifexpression = _union;
}
return _xifexpression;
@@ -219,15 +202,14 @@ public class RoomExtensions { public List<SAPRef> getAllSAPs(final ActorClass ac) {
List<SAPRef> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- EList<SAPRef> _strSAPs = ac.getStrSAPs();
- return _strSAPs;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return ac.getStrSAPs();
} else {
ActorClass _base_1 = ac.getBase();
List<SAPRef> _allSAPs = this.getAllSAPs(_base_1);
- EList<SAPRef> _strSAPs_1 = ac.getStrSAPs();
- List<SAPRef> _union = this.<SAPRef>union(_allSAPs, _strSAPs_1);
+ EList<SAPRef> _strSAPs = ac.getStrSAPs();
+ List<SAPRef> _union = this.<SAPRef>union(_allSAPs, _strSAPs);
_xifexpression = _union;
}
return _xifexpression;
@@ -236,15 +218,14 @@ public class RoomExtensions { public List<ServiceImplementation> getAllServiceImplementations(final ActorClass ac) {
List<ServiceImplementation> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
- return _serviceImplementations;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return ac.getServiceImplementations();
} else {
ActorClass _base_1 = ac.getBase();
List<ServiceImplementation> _allServiceImplementations = this.getAllServiceImplementations(_base_1);
- EList<ServiceImplementation> _serviceImplementations_1 = ac.getServiceImplementations();
- List<ServiceImplementation> _union = this.<ServiceImplementation>union(_allServiceImplementations, _serviceImplementations_1);
+ EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
+ List<ServiceImplementation> _union = this.<ServiceImplementation>union(_allServiceImplementations, _serviceImplementations);
_xifexpression = _union;
}
return _xifexpression;
@@ -258,15 +239,14 @@ public class RoomExtensions { public List<Attribute> getAllAttributes(final DataClass dc) {
List<Attribute> _xifexpression = null;
DataClass _base = dc.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- EList<Attribute> _attributes = dc.getAttributes();
- return _attributes;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return dc.getAttributes();
} else {
DataClass _base_1 = dc.getBase();
List<Attribute> _allAttributes = this.getAllAttributes(_base_1);
- EList<Attribute> _attributes_1 = dc.getAttributes();
- List<Attribute> _union = this.<Attribute>union(_allAttributes, _attributes_1);
+ EList<Attribute> _attributes = dc.getAttributes();
+ List<Attribute> _union = this.<Attribute>union(_allAttributes, _attributes);
_xifexpression = _union;
}
return _xifexpression;
@@ -275,15 +255,14 @@ public class RoomExtensions { public List<Attribute> getAllAttributes(final ActorClass ac) {
List<Attribute> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
- EList<Attribute> _attributes = ac.getAttributes();
- return _attributes;
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
+ return ac.getAttributes();
} else {
ActorClass _base_1 = ac.getBase();
List<Attribute> _allAttributes = this.getAllAttributes(_base_1);
- EList<Attribute> _attributes_1 = ac.getAttributes();
- List<Attribute> _union = this.<Attribute>union(_allAttributes, _attributes_1);
+ EList<Attribute> _attributes = ac.getAttributes();
+ List<Attribute> _union = this.<Attribute>union(_allAttributes, _attributes);
_xifexpression = _union;
}
return _xifexpression;
@@ -306,14 +285,12 @@ public class RoomExtensions { protected String _getPortClassName(final SAPRef sap) {
ProtocolClass _protocol = sap.getProtocol();
- String _portClassName = this.getPortClassName(_protocol, true);
- return _portClassName;
+ return this.getPortClassName(_protocol, true);
}
protected String _getPortClassName(final SPPRef spp) {
ProtocolClass _protocol = spp.getProtocol();
- String _portClassName = this.getPortClassName(_protocol, false, true);
- return _portClassName;
+ return this.getPortClassName(_protocol, false, true);
}
public String getPortClassName(final ProtocolClass p, final boolean conj) {
@@ -329,56 +306,51 @@ public class RoomExtensions { } else {
_xifexpression = "";
}
- String _operator_plus = StringExtensions.operator_plus(_name, _xifexpression);
+ String _plus = (_name + _xifexpression);
String _xifexpression_1 = null;
if (repl) {
_xifexpression_1 = "Repl";
} else {
_xifexpression_1 = "";
}
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, _xifexpression_1);
- String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, "Port");
- return _operator_plus_2;
+ String _plus_1 = (_plus + _xifexpression_1);
+ String _plus_2 = (_plus_1 + "Port");
+ return _plus_2;
}
- public String getPortClassName(final ExternalPort p) {
+ protected String _getPortClassName(final ExternalPort p) {
Port _ifport = p.getIfport();
- String _portClassName = this.getPortClassName(_ifport);
- return _portClassName;
+ return this.getPortClassName(_ifport);
}
- public String getPortClassName(final ServiceImplementation svc) {
+ protected String _getPortClassName(final ServiceImplementation svc) {
SPPRef _spp = svc.getSpp();
ProtocolClass _protocol = _spp.getProtocol();
- String _portClassName = this.getPortClassName(_protocol, false, true);
- return _portClassName;
+ return this.getPortClassName(_protocol, false, true);
}
public List<Message> getAllIncomingMessages(final ProtocolClass pc) {
ProtocolClass _base = pc.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
ProtocolClass _base_1 = pc.getBase();
List<Message> _allIncomingMessages = this.getAllIncomingMessages(_base_1);
EList<Message> _incomingMessages = pc.getIncomingMessages();
- List<Message> _union = this.<Message>union(_allIncomingMessages, _incomingMessages);
- return _union;
+ return this.<Message>union(_allIncomingMessages, _incomingMessages);
} else {
- EList<Message> _incomingMessages_1 = pc.getIncomingMessages();
- return _incomingMessages_1;
+ return pc.getIncomingMessages();
}
}
public List<Message> getAllOutgoingMessages(final ProtocolClass pc) {
EList<Message> _xifexpression = null;
ProtocolClass _base = pc.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (_operator_notEquals) {
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (_notEquals) {
ProtocolClass _base_1 = pc.getBase();
List<Message> _allOutgoingMessages = this.getAllOutgoingMessages(_base_1);
EList<Message> _outgoingMessages = pc.getOutgoingMessages();
- List<Message> _union = this.<Message>union(_allOutgoingMessages, _outgoingMessages);
- return _union;
+ return this.<Message>union(_allOutgoingMessages, _outgoingMessages);
} else {
EList<Message> _outgoingMessages_1 = pc.getOutgoingMessages();
_xifexpression = _outgoingMessages_1;
@@ -388,79 +360,72 @@ public class RoomExtensions { public List<Message> getIncoming(final ProtocolClass pc, final boolean conj) {
if (conj) {
- List<Message> _allOutgoingMessages = this.getAllOutgoingMessages(pc);
- return _allOutgoingMessages;
+ return this.getAllOutgoingMessages(pc);
} else {
- List<Message> _allIncomingMessages = this.getAllIncomingMessages(pc);
- return _allIncomingMessages;
+ return this.getAllIncomingMessages(pc);
}
}
public List<Message> getOutgoing(final ProtocolClass pc, final boolean conj) {
if (conj) {
- List<Message> _allIncomingMessages = this.getAllIncomingMessages(pc);
- return _allIncomingMessages;
+ return this.getAllIncomingMessages(pc);
} else {
- List<Message> _allOutgoingMessages = this.getAllOutgoingMessages(pc);
- return _allOutgoingMessages;
+ return this.getAllOutgoingMessages(pc);
}
}
public PortClass getPortClass(final ProtocolClass pc, final boolean conj) {
if (conj) {
- PortClass _conjugate = pc.getConjugate();
- return _conjugate;
+ return pc.getConjugate();
} else {
- PortClass _regular = pc.getRegular();
- return _regular;
+ return pc.getRegular();
}
}
public boolean handlesSend(final ProtocolClass pc, final boolean conj) {
- PortClass _portClass = this.getPortClass(pc, conj);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
- return false;
- } else {
- PortClass _portClass_1 = this.getPortClass(pc, conj);
- EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
- for (final MessageHandler hdlr : _msgHandlers) {
- List<Message> _outgoing = this.getOutgoing(pc, conj);
- Message _msg = hdlr.getMsg();
- boolean _contains = _outgoing.contains(_msg);
- if (_contains) {
- return true;
- }
+ PortClass _portClass = this.getPortClass(pc, conj);
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
+ return false;
+ } else {
+ PortClass _portClass_1 = this.getPortClass(pc, conj);
+ EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
+ for (final MessageHandler hdlr : _msgHandlers) {
+ List<Message> _outgoing = this.getOutgoing(pc, conj);
+ Message _msg = hdlr.getMsg();
+ boolean _contains = _outgoing.contains(_msg);
+ if (_contains) {
+ return true;
}
}
- return false;
+ }
+ return false;
}
public boolean handlesReceive(final ProtocolClass pc, final boolean conj) {
- PortClass _portClass = this.getPortClass(pc, conj);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
- return false;
- } else {
- PortClass _portClass_1 = this.getPortClass(pc, conj);
- EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
- for (final MessageHandler hdlr : _msgHandlers) {
- List<Message> _incoming = this.getIncoming(pc, conj);
- Message _msg = hdlr.getMsg();
- boolean _contains = _incoming.contains(_msg);
- if (_contains) {
- return true;
- }
+ PortClass _portClass = this.getPortClass(pc, conj);
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
+ return false;
+ } else {
+ PortClass _portClass_1 = this.getPortClass(pc, conj);
+ EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
+ for (final MessageHandler hdlr : _msgHandlers) {
+ List<Message> _incoming = this.getIncoming(pc, conj);
+ Message _msg = hdlr.getMsg();
+ boolean _contains = _incoming.contains(_msg);
+ if (_contains) {
+ return true;
}
}
- return false;
+ }
+ return false;
}
public boolean isConjugated(final InterfaceItemInstance iii) {
if ((iii instanceof PortInstance)) {
Port _port = ((PortInstance) iii).getPort();
- boolean _isConjugated = _port.isConjugated();
- return _isConjugated;
+ return _port.isConjugated();
} else {
if ((iii instanceof SAPInstance)) {
return true;
@@ -476,51 +441,47 @@ public class RoomExtensions { public List<MessageHandler> getReceiveHandlers(final ProtocolClass pc, final boolean conj) {
PortClass _portClass = this.getPortClass(pc, conj);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
ArrayList<MessageHandler> _arrayList = new ArrayList<MessageHandler>();
return _arrayList;
} else {
- {
- ArrayList<MessageHandler> _arrayList_1 = new ArrayList<MessageHandler>();
- ArrayList<MessageHandler> res = _arrayList_1;
- PortClass _portClass_1 = this.getPortClass(pc, conj);
- EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
- for (final MessageHandler hdlr : _msgHandlers) {
- List<Message> _incoming = this.getIncoming(pc, conj);
- Message _msg = hdlr.getMsg();
- boolean _contains = _incoming.contains(_msg);
- if (_contains) {
- res.add(hdlr);
- }
+ ArrayList<MessageHandler> _arrayList_1 = new ArrayList<MessageHandler>();
+ ArrayList<MessageHandler> res = _arrayList_1;
+ PortClass _portClass_1 = this.getPortClass(pc, conj);
+ EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
+ for (final MessageHandler hdlr : _msgHandlers) {
+ List<Message> _incoming = this.getIncoming(pc, conj);
+ Message _msg = hdlr.getMsg();
+ boolean _contains = _incoming.contains(_msg);
+ if (_contains) {
+ res.add(hdlr);
}
- return res;
}
+ return res;
}
}
public List<MessageHandler> getSendHandlers(final ProtocolClass pc, final boolean conj) {
PortClass _portClass = this.getPortClass(pc, conj);
- boolean _operator_equals = ObjectExtensions.operator_equals(_portClass, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_portClass, null);
+ if (_equals) {
ArrayList<MessageHandler> _arrayList = new ArrayList<MessageHandler>();
return _arrayList;
} else {
- {
- ArrayList<MessageHandler> _arrayList_1 = new ArrayList<MessageHandler>();
- ArrayList<MessageHandler> res = _arrayList_1;
- PortClass _portClass_1 = this.getPortClass(pc, conj);
- EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
- for (final MessageHandler hdlr : _msgHandlers) {
- List<Message> _outgoing = this.getOutgoing(pc, conj);
- Message _msg = hdlr.getMsg();
- boolean _contains = _outgoing.contains(_msg);
- if (_contains) {
- res.add(hdlr);
- }
+ ArrayList<MessageHandler> _arrayList_1 = new ArrayList<MessageHandler>();
+ ArrayList<MessageHandler> res = _arrayList_1;
+ PortClass _portClass_1 = this.getPortClass(pc, conj);
+ EList<MessageHandler> _msgHandlers = _portClass_1.getMsgHandlers();
+ for (final MessageHandler hdlr : _msgHandlers) {
+ List<Message> _outgoing = this.getOutgoing(pc, conj);
+ Message _msg = hdlr.getMsg();
+ boolean _contains = _outgoing.contains(_msg);
+ if (_contains) {
+ res.add(hdlr);
}
- return res;
}
+ return res;
}
}
@@ -530,135 +491,127 @@ public class RoomExtensions { final Function1<MessageHandler,Boolean> _function = new Function1<MessageHandler,Boolean>() {
public Boolean apply(final MessageHandler e) {
Message _msg = e.getMsg();
- boolean _operator_equals = ObjectExtensions.operator_equals(_msg, m);
- return ((Boolean)_operator_equals);
+ boolean _equals = Objects.equal(_msg, m);
+ return Boolean.valueOf(_equals);
}
};
- MessageHandler _findFirst = IterableExtensions.<MessageHandler>findFirst(_sendHandlers, _function);
- return _findFirst;
+ return IterableExtensions.<MessageHandler>findFirst(_sendHandlers, _function);
}
public boolean isIncoming(final Message m) {
EObject _eContainer = m.eContainer();
List<Message> _allIncomingMessages = this.getAllIncomingMessages(((ProtocolClass) _eContainer));
- boolean _contains = _allIncomingMessages.contains(m);
- return _contains;
+ return _allIncomingMessages.contains(m);
}
public String getCodeName(final Message m) {
boolean _isIncoming = this.isIncoming(m);
if (_isIncoming) {
String _name = m.getName();
- String _operator_plus = StringExtensions.operator_plus("IN_", _name);
- return _operator_plus;
+ return ("IN_" + _name);
} else {
String _name_1 = m.getName();
- String _operator_plus_1 = StringExtensions.operator_plus("OUT_", _name_1);
- return _operator_plus_1;
+ return ("OUT_" + _name_1);
}
}
public boolean isLeaf(final State s) {
StateGraph _subgraph = s.getSubgraph();
- boolean _operator_equals = ObjectExtensions.operator_equals(_subgraph, null);
- return _operator_equals;
+ boolean _equals = Objects.equal(_subgraph, null);
+ return _equals;
}
public List<State> getLeafStateList(final StateGraph sg) {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> res = _arrayList;
- EList<State> _states = sg.getStates();
- for (final State s : _states) {
- List<State> _leafStateList = this.getLeafStateList(s);
- res.addAll(_leafStateList);
- }
- return res;
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> res = _arrayList;
+ EList<State> _states = sg.getStates();
+ for (final State s : _states) {
+ List<State> _leafStateList = this.getLeafStateList(s);
+ res.addAll(_leafStateList);
+ }
+ return res;
}
public List<State> getLeafStateList(final State s) {
boolean _isLeaf = this.isLeaf(s);
if (_isLeaf) {
- {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> res = _arrayList;
- res.add(s);
- return res;
- }
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> res = _arrayList;
+ res.add(s);
+ return res;
} else {
StateGraph _subgraph = s.getSubgraph();
- List<State> _leafStateList = this.getLeafStateList(_subgraph);
- return _leafStateList;
+ return this.getLeafStateList(_subgraph);
}
}
public List<State> getStateList(final StateGraph sg) {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> ret = _arrayList;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(sg, null);
- if (_operator_notEquals) {
- EList<State> _states = sg.getStates();
- for (final State e : _states) {
- {
- ret.add(e);
- StateGraph _subgraph = e.getSubgraph();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_subgraph, null);
- if (_operator_notEquals_1) {
- StateGraph _subgraph_1 = e.getSubgraph();
- List<State> _stateList = this.getStateList(_subgraph_1);
- ret.addAll(_stateList);
- }
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> ret = _arrayList;
+ boolean _notEquals = (!Objects.equal(sg, null));
+ if (_notEquals) {
+ EList<State> _states = sg.getStates();
+ for (final State e : _states) {
+ {
+ ret.add(e);
+ StateGraph _subgraph = e.getSubgraph();
+ boolean _notEquals_1 = (!Objects.equal(_subgraph, null));
+ if (_notEquals_1) {
+ StateGraph _subgraph_1 = e.getSubgraph();
+ List<State> _stateList = this.getStateList(_subgraph_1);
+ ret.addAll(_stateList);
}
}
}
- return ret;
+ }
+ return ret;
}
public List<State> getBaseStateList(final StateGraph sg) {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> ret = _arrayList;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(sg, null);
- if (_operator_notEquals) {
- List<State> _stateList = this.getStateList(sg);
- for (final State e : _stateList) {
- if ((e instanceof SimpleState)) {
- ret.add(e);
- }
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> ret = _arrayList;
+ boolean _notEquals = (!Objects.equal(sg, null));
+ if (_notEquals) {
+ List<State> _stateList = this.getStateList(sg);
+ for (final State e : _stateList) {
+ if ((e instanceof SimpleState)) {
+ ret.add(e);
}
}
- return ret;
+ }
+ return ret;
}
public ArrayList<State> getLeafStatesLast(final List<State> states) {
- ArrayList<State> _arrayList = new ArrayList<State>();
- ArrayList<State> leaf = _arrayList;
- ArrayList<State> _arrayList_1 = new ArrayList<State>();
- ArrayList<State> nonLeaf = _arrayList_1;
- for (final State state : states) {
- boolean _isLeaf = this.isLeaf(state);
- if (_isLeaf) {
- leaf.add(state);
- } else {
- nonLeaf.add(state);
- }
+ ArrayList<State> _arrayList = new ArrayList<State>();
+ ArrayList<State> leaf = _arrayList;
+ ArrayList<State> _arrayList_1 = new ArrayList<State>();
+ ArrayList<State> nonLeaf = _arrayList_1;
+ for (final State state : states) {
+ boolean _isLeaf = this.isLeaf(state);
+ if (_isLeaf) {
+ leaf.add(state);
+ } else {
+ nonLeaf.add(state);
}
- nonLeaf.addAll(leaf);
- return nonLeaf;
+ }
+ nonLeaf.addAll(leaf);
+ return nonLeaf;
}
public List<State> getAllBaseStates(final ActorClass ac) {
List<State> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
StateGraph _stateMachine = ac.getStateMachine();
- List<State> _baseStateList = this.getBaseStateList(_stateMachine);
- return _baseStateList;
+ return this.getBaseStateList(_stateMachine);
} else {
ActorClass _base_1 = ac.getBase();
List<State> _allBaseStates = this.getAllBaseStates(_base_1);
StateGraph _stateMachine_1 = ac.getStateMachine();
- List<State> _baseStateList_1 = this.getBaseStateList(_stateMachine_1);
- List<State> _union = this.<State>union(_allBaseStates, _baseStateList_1);
+ List<State> _baseStateList = this.getBaseStateList(_stateMachine_1);
+ List<State> _union = this.<State>union(_allBaseStates, _baseStateList);
_xifexpression = _union;
}
return _xifexpression;
@@ -667,20 +620,19 @@ public class RoomExtensions { public List<State> getAllBaseStatesLeavesLast(final ActorClass ac) {
List<State> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
StateGraph _stateMachine = ac.getStateMachine();
List<State> _baseStateList = this.getBaseStateList(_stateMachine);
- ArrayList<State> _leafStatesLast = this.getLeafStatesLast(_baseStateList);
- return _leafStatesLast;
+ return this.getLeafStatesLast(_baseStateList);
} else {
ActorClass _base_1 = ac.getBase();
List<State> _allBaseStates = this.getAllBaseStates(_base_1);
- ArrayList<State> _leafStatesLast_1 = this.getLeafStatesLast(_allBaseStates);
+ ArrayList<State> _leafStatesLast = this.getLeafStatesLast(_allBaseStates);
StateGraph _stateMachine_1 = ac.getStateMachine();
List<State> _baseStateList_1 = this.getBaseStateList(_stateMachine_1);
- ArrayList<State> _leafStatesLast_2 = this.getLeafStatesLast(_baseStateList_1);
- List<State> _union = this.<State>union(_leafStatesLast_1, _leafStatesLast_2);
+ ArrayList<State> _leafStatesLast_1 = this.getLeafStatesLast(_baseStateList_1);
+ List<State> _union = this.<State>union(_leafStatesLast, _leafStatesLast_1);
_xifexpression = _union;
}
return _xifexpression;
@@ -689,71 +641,70 @@ public class RoomExtensions { public List<State> getAllLeafStates(final ActorClass ac) {
List<State> _xifexpression = null;
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
StateGraph _stateMachine = ac.getStateMachine();
- List<State> _leafStateList = this.getLeafStateList(_stateMachine);
- return _leafStateList;
+ return this.getLeafStateList(_stateMachine);
} else {
ActorClass _base_1 = ac.getBase();
List<State> _allLeafStates = this.getAllLeafStates(_base_1);
StateGraph _stateMachine_1 = ac.getStateMachine();
- List<State> _leafStateList_1 = this.getLeafStateList(_stateMachine_1);
- List<State> _union = this.<State>union(_allLeafStates, _leafStateList_1);
+ List<State> _leafStateList = this.getLeafStateList(_stateMachine_1);
+ List<State> _union = this.<State>union(_allLeafStates, _leafStateList);
_xifexpression = _union;
}
return _xifexpression;
}
public boolean overridesStop(final ActorClass ac) {
- boolean _operator_or = false;
+ boolean _or = false;
EList<StandardOperation> _operations = ac.getOperations();
final Function1<StandardOperation,Boolean> _function = new Function1<StandardOperation,Boolean>() {
public Boolean apply(final StandardOperation e) {
- boolean _operator_and = false;
- boolean _operator_and_1 = false;
+ boolean _and = false;
+ boolean _and_1 = false;
String _name = e.getName();
- boolean _operator_equals = ObjectExtensions.operator_equals(_name, "stop");
- if (!_operator_equals) {
- _operator_and_1 = false;
+ boolean _equals = Objects.equal(_name, "stop");
+ if (!_equals) {
+ _and_1 = false;
} else {
EList<VarDecl> _arguments = e.getArguments();
boolean _isEmpty = _arguments.isEmpty();
- _operator_and_1 = BooleanExtensions.operator_and(_operator_equals, _isEmpty);
+ _and_1 = (_equals && _isEmpty);
}
- if (!_operator_and_1) {
- _operator_and = false;
+ if (!_and_1) {
+ _and = false;
} else {
RefableType _returntype = e.getReturntype();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(_returntype, null);
- _operator_and = BooleanExtensions.operator_and(_operator_and_1, _operator_equals_1);
+ boolean _equals_1 = Objects.equal(_returntype, null);
+ _and = (_and_1 && _equals_1);
}
- return ((Boolean)_operator_and);
+ return Boolean.valueOf(_and);
}
};
boolean _exists = IterableExtensions.<StandardOperation>exists(_operations, _function);
if (_exists) {
- _operator_or = true;
+ _or = true;
} else {
- boolean _operator_and = false;
+ boolean _and = false;
ActorClass _base = ac.getBase();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_base, null);
- if (!_operator_notEquals) {
- _operator_and = false;
+ boolean _notEquals = (!Objects.equal(_base, null));
+ if (!_notEquals) {
+ _and = false;
} else {
ActorClass _base_1 = ac.getBase();
boolean _overridesStop = this.overridesStop(_base_1);
- _operator_and = BooleanExtensions.operator_and(_operator_notEquals, _overridesStop);
+ _and = (_notEquals && _overridesStop);
}
- _operator_or = BooleanExtensions.operator_or(_exists, _operator_and);
+ _or = (_exists || _and);
}
- return _operator_or;
+ return _or;
}
public int getNumberOfInheritedStates(final ActorClass ac) {
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
return 0;
} else {
ActorClass _base_1 = ac.getBase();
@@ -762,15 +713,14 @@ public class RoomExtensions { int _size = _stateList.size();
ActorClass _base_2 = ac.getBase();
int _numberOfInheritedStates = this.getNumberOfInheritedStates(_base_2);
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_size), ((Integer)_numberOfInheritedStates));
- return _operator_plus;
+ return (_size + _numberOfInheritedStates);
}
}
public int getNumberOfInheritedBaseStates(final ActorClass ac) {
ActorClass _base = ac.getBase();
- boolean _operator_equals = ObjectExtensions.operator_equals(_base, null);
- if (_operator_equals) {
+ boolean _equals = Objects.equal(_base, null);
+ if (_equals) {
return 0;
} else {
ActorClass _base_1 = ac.getBase();
@@ -779,147 +729,140 @@ public class RoomExtensions { int _size = _baseStateList.size();
ActorClass _base_2 = ac.getBase();
int _numberOfInheritedBaseStates = this.getNumberOfInheritedBaseStates(_base_2);
- int _operator_plus = IntegerExtensions.operator_plus(((Integer)_size), ((Integer)_numberOfInheritedBaseStates));
- return _operator_plus;
+ return (_size + _numberOfInheritedBaseStates);
}
}
public String getStateId(final State s) {
- String _genStateId = CodegenHelpers.getGenStateId(s);
- return _genStateId;
+ return CodegenHelpers.getGenStateId(s);
}
public String getStatePathName(final State s) {
- String _genStatePathName = CodegenHelpers.getGenStatePathName(s);
- return _genStatePathName;
+ return CodegenHelpers.getGenStatePathName(s);
}
public String getChainId(final TransitionChain t) {
- String _genChainId = CodegenHelpers.getGenChainId(t);
- return _genChainId;
+ return CodegenHelpers.getGenChainId(t);
}
public boolean hasGuard(final Trigger tr) {
- boolean _operator_and = false;
- boolean _operator_and_1 = false;
+ boolean _and = false;
+ boolean _and_1 = false;
Guard _guard = tr.getGuard();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_guard, null);
- if (!_operator_notEquals) {
- _operator_and_1 = false;
+ boolean _notEquals = (!Objects.equal(_guard, null));
+ if (!_notEquals) {
+ _and_1 = false;
} else {
Guard _guard_1 = tr.getGuard();
DetailCode _guard_2 = _guard_1.getGuard();
- boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_guard_2, null);
- _operator_and_1 = BooleanExtensions.operator_and(_operator_notEquals, _operator_notEquals_1);
+ boolean _notEquals_1 = (!Objects.equal(_guard_2, null));
+ _and_1 = (_notEquals && _notEquals_1);
}
- if (!_operator_and_1) {
- _operator_and = false;
+ if (!_and_1) {
+ _and = false;
} else {
Guard _guard_3 = tr.getGuard();
DetailCode _guard_4 = _guard_3.getGuard();
EList<String> _commands = _guard_4.getCommands();
int _size = _commands.size();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)0));
- _operator_and = BooleanExtensions.operator_and(_operator_and_1, _operator_greaterThan);
+ boolean _greaterThan = (_size > 0);
+ _and = (_and_1 && _greaterThan);
}
- return _operator_and;
+ return _and;
}
public boolean hasGuard(final ExpandedActorClass ac, final ActiveTrigger at) {
- boolean hasGuard = false;
- EList<TriggeredTransition> _transitions = at.getTransitions();
- for (final TriggeredTransition t : _transitions) {
- EList<Trigger> _triggers = t.getTriggers();
- final Function1<Trigger,Boolean> _function = new Function1<Trigger,Boolean>() {
- public Boolean apply(final Trigger e) {
- boolean _operator_and = false;
- String _trigger = at.getTrigger();
- boolean _isMatching = ac.isMatching(e, _trigger);
- if (!_isMatching) {
- _operator_and = false;
- } else {
- boolean _hasGuard = RoomExtensions.this.hasGuard(e);
- _operator_and = BooleanExtensions.operator_and(_isMatching, _hasGuard);
- }
- return ((Boolean)_operator_and);
+ boolean hasGuard = false;
+ EList<TriggeredTransition> _transitions = at.getTransitions();
+ for (final TriggeredTransition t : _transitions) {
+ EList<Trigger> _triggers = t.getTriggers();
+ final Function1<Trigger,Boolean> _function = new Function1<Trigger,Boolean>() {
+ public Boolean apply(final Trigger e) {
+ boolean _and = false;
+ String _trigger = at.getTrigger();
+ boolean _isMatching = ac.isMatching(e, _trigger);
+ if (!_isMatching) {
+ _and = false;
+ } else {
+ boolean _hasGuard = RoomExtensions.this.hasGuard(e);
+ _and = (_isMatching && _hasGuard);
}
- };
- boolean _exists = IterableExtensions.<Trigger>exists(_triggers, _function);
- if (_exists) {
- hasGuard = true;
- }
+ return Boolean.valueOf(_and);
+ }
+ };
+ boolean _exists = IterableExtensions.<Trigger>exists(_triggers, _function);
+ if (_exists) {
+ hasGuard = true;
}
- return hasGuard;
+ }
+ return hasGuard;
}
public boolean empty(final DetailCode dc) {
String _detailCode = RoomHelpers.getDetailCode(dc);
- boolean _operator_equals = ObjectExtensions.operator_equals(_detailCode, "");
- return _operator_equals;
+ boolean _equals = Objects.equal(_detailCode, "");
+ return _equals;
}
public boolean hasEntryCode(final State s) {
- DetailCode _entryCode = s.getEntryCode();
- boolean _empty = this.empty(_entryCode);
- boolean _operator_not = BooleanExtensions.operator_not(_empty);
- if (_operator_not) {
- return true;
- }
- if ((s instanceof ExpandedRefinedState)) {
- DetailCode _inheritedEntry = ((ExpandedRefinedState) s).getInheritedEntry();
- boolean _empty_1 = this.empty(_inheritedEntry);
- boolean _operator_not_1 = BooleanExtensions.operator_not(_empty_1);
- return _operator_not_1;
- }
- return false;
+ DetailCode _entryCode = s.getEntryCode();
+ boolean _empty = this.empty(_entryCode);
+ boolean _not = (!_empty);
+ if (_not) {
+ return true;
+ }
+ if ((s instanceof ExpandedRefinedState)) {
+ DetailCode _inheritedEntry = ((ExpandedRefinedState) s).getInheritedEntry();
+ boolean _empty_1 = this.empty(_inheritedEntry);
+ return (!_empty_1);
+ }
+ return false;
}
public boolean hasExitCode(final State s) {
- DetailCode _exitCode = s.getExitCode();
- boolean _empty = this.empty(_exitCode);
- boolean _operator_not = BooleanExtensions.operator_not(_empty);
- if (_operator_not) {
- return true;
- }
- if ((s instanceof ExpandedRefinedState)) {
- DetailCode _inheritedExit = ((ExpandedRefinedState) s).getInheritedExit();
- boolean _empty_1 = this.empty(_inheritedExit);
- boolean _operator_not_1 = BooleanExtensions.operator_not(_empty_1);
- return _operator_not_1;
- }
- return false;
+ DetailCode _exitCode = s.getExitCode();
+ boolean _empty = this.empty(_exitCode);
+ boolean _not = (!_empty);
+ if (_not) {
+ return true;
+ }
+ if ((s instanceof ExpandedRefinedState)) {
+ DetailCode _inheritedExit = ((ExpandedRefinedState) s).getInheritedExit();
+ boolean _empty_1 = this.empty(_inheritedExit);
+ return (!_empty_1);
+ }
+ return false;
}
public boolean hasDoCode(final State s) {
- DetailCode _doCode = s.getDoCode();
- boolean _empty = this.empty(_doCode);
- boolean _operator_not = BooleanExtensions.operator_not(_empty);
- if (_operator_not) {
- return true;
- }
- if ((s instanceof ExpandedRefinedState)) {
- DetailCode _inheritedDo = ((ExpandedRefinedState) s).getInheritedDo();
- boolean _empty_1 = this.empty(_inheritedDo);
- boolean _operator_not_1 = BooleanExtensions.operator_not(_empty_1);
- return _operator_not_1;
- }
- return false;
+ DetailCode _doCode = s.getDoCode();
+ boolean _empty = this.empty(_doCode);
+ boolean _not = (!_empty);
+ if (_not) {
+ return true;
+ }
+ if ((s instanceof ExpandedRefinedState)) {
+ DetailCode _inheritedDo = ((ExpandedRefinedState) s).getInheritedDo();
+ boolean _empty_1 = this.empty(_inheritedDo);
+ return (!_empty_1);
+ }
+ return false;
}
public boolean hasActionCode(final Transition t) {
- boolean _operator_and = false;
+ boolean _and = false;
DetailCode _action = t.getAction();
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(_action, null);
- if (!_operator_notEquals) {
- _operator_and = false;
+ boolean _notEquals = (!Objects.equal(_action, null));
+ if (!_notEquals) {
+ _and = false;
} else {
DetailCode _action_1 = t.getAction();
EList<String> _commands = _action_1.getCommands();
int _size = _commands.size();
- boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size), ((Integer)0));
- _operator_and = BooleanExtensions.operator_and(_operator_notEquals, _operator_greaterThan);
+ boolean _greaterThan = (_size > 0);
+ _and = (_notEquals && _greaterThan);
}
- return _operator_and;
+ return _and;
}
public String getContextId(final TransitionChain tc) {
@@ -929,23 +872,23 @@ public class RoomExtensions { }
public Transition getInitTransition(final StateGraph sg) {
- EList<Transition> _transitions = sg.getTransitions();
- for (final Transition tr : _transitions) {
- if ((tr instanceof InitialTransition)) {
- return tr;
- }
+ EList<Transition> _transitions = sg.getTransitions();
+ for (final Transition tr : _transitions) {
+ if ((tr instanceof InitialTransition)) {
+ return tr;
}
- return null;
+ }
+ return null;
}
public boolean hasInitTransition(final StateGraph sg) {
- EList<Transition> _transitions = sg.getTransitions();
- for (final Transition tr : _transitions) {
- if ((tr instanceof InitialTransition)) {
- return true;
- }
+ EList<Transition> _transitions = sg.getTransitions();
+ for (final Transition tr : _transitions) {
+ if ((tr instanceof InitialTransition)) {
+ return true;
}
- return false;
+ }
+ return false;
}
public List<Transition> getTransitionList(final State s) {
@@ -955,53 +898,56 @@ public class RoomExtensions { return _arrayList;
} else {
StateGraph _subgraph = s.getSubgraph();
- List<Transition> _transitionList = this.getTransitionList(_subgraph);
- return _transitionList;
+ return this.getTransitionList(_subgraph);
}
}
public List<Transition> getTransitionList(final StateGraph sg) {
- EList<Transition> _transitions = sg.getTransitions();
- ArrayList<Transition> _arrayList = new ArrayList<Transition>(_transitions);
- ArrayList<Transition> res = _arrayList;
- EList<State> _states = sg.getStates();
- for (final State s : _states) {
- List<Transition> _transitionList = this.getTransitionList(s);
- res.addAll(_transitionList);
- }
- return res;
+ EList<Transition> _transitions = sg.getTransitions();
+ ArrayList<Transition> _arrayList = new ArrayList<Transition>(_transitions);
+ ArrayList<Transition> res = _arrayList;
+ EList<State> _states = sg.getStates();
+ for (final State s : _states) {
+ List<Transition> _transitionList = this.getTransitionList(s);
+ res.addAll(_transitionList);
+ }
+ return res;
}
public List<Transition> getOutgoingTransitionsHierarchical(final ExpandedActorClass ac, final State s) {
- ArrayList<Transition> _arrayList = new ArrayList<Transition>();
- ArrayList<Transition> result = _arrayList;
- EList<Transition> _outgoingTransitions = ac.getOutgoingTransitions(s);
- result.addAll(_outgoingTransitions);
- EObject _eContainer = s.eContainer();
- StateGraph sg = ((StateGraph) _eContainer);
- EList<TrPoint> _trPoints = sg.getTrPoints();
- for (final TrPoint tp : _trPoints) {
- if ((tp instanceof TransitionPoint)) {
- EList<Transition> _outgoingTransitions_1 = ac.getOutgoingTransitions(tp);
- result.addAll(_outgoingTransitions_1);
- }
+ ArrayList<Transition> _arrayList = new ArrayList<Transition>();
+ ArrayList<Transition> result = _arrayList;
+ EList<Transition> _outgoingTransitions = ac.getOutgoingTransitions(s);
+ result.addAll(_outgoingTransitions);
+ EObject _eContainer = s.eContainer();
+ StateGraph sg = ((StateGraph) _eContainer);
+ EList<TrPoint> _trPoints = sg.getTrPoints();
+ for (final TrPoint tp : _trPoints) {
+ if ((tp instanceof TransitionPoint)) {
+ EList<Transition> _outgoingTransitions_1 = ac.getOutgoingTransitions(tp);
+ result.addAll(_outgoingTransitions_1);
}
- EObject _eContainer_1 = sg.eContainer();
- if ((_eContainer_1 instanceof State)) {
- EObject _eContainer_2 = sg.eContainer();
- List<Transition> _outgoingTransitionsHierarchical = this.getOutgoingTransitionsHierarchical(ac, ((State) _eContainer_2));
- result.addAll(_outgoingTransitionsHierarchical);
- }
- return result;
+ }
+ EObject _eContainer_1 = sg.eContainer();
+ if ((_eContainer_1 instanceof State)) {
+ EObject _eContainer_2 = sg.eContainer();
+ List<Transition> _outgoingTransitionsHierarchical = this.getOutgoingTransitionsHierarchical(ac, ((State) _eContainer_2));
+ result.addAll(_outgoingTransitionsHierarchical);
+ }
+ return result;
}
- public String getPortClassName(final InterfaceItem p) {
+ public String getPortClassName(final EObject p) {
if (p instanceof Port) {
return _getPortClassName((Port)p);
} else if (p instanceof SAPRef) {
return _getPortClassName((SAPRef)p);
} else if (p instanceof SPPRef) {
return _getPortClassName((SPPRef)p);
+ } else if (p instanceof ExternalPort) {
+ return _getPortClassName((ExternalPort)p);
+ } else if (p instanceof ServiceImplementation) {
+ return _getPortClassName((ServiceImplementation)p);
} else {
throw new IllegalArgumentException("Unhandled parameter types: " +
Arrays.<Object>asList(p).toString());
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java index 7b8e0ad3a..536dd0495 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java @@ -9,44 +9,37 @@ import org.eclipse.etrice.core.room.PrimitiveType; import org.eclipse.etrice.core.room.RefableType;
import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.generator.generic.AbstractTransitionChainGenerator;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
-@SuppressWarnings("all")
@Singleton
+@SuppressWarnings("all")
public class TypeHelpers {
@Inject
private AbstractTransitionChainGenerator chainGenerator;
public String typeName(final DataType type) {
if ((type instanceof PrimitiveType)) {
- String _targetName = ((PrimitiveType) type).getTargetName();
- return _targetName;
+ return ((PrimitiveType) type).getTargetName();
} else {
if ((type instanceof ExternalType)) {
- String _targetName_1 = ((ExternalType) type).getTargetName();
- return _targetName_1;
+ return ((ExternalType) type).getTargetName();
} else {
- String _name = type.getName();
- return _name;
+ return type.getName();
}
}
}
public String defaultValue(final DataType dt) {
if ((dt instanceof PrimitiveType)) {
- String _defaultValueLiteral = ((PrimitiveType) dt).getDefaultValueLiteral();
- return _defaultValueLiteral;
+ return ((PrimitiveType) dt).getDefaultValueLiteral();
} else {
if ((dt instanceof ExternalType)) {
String _targetName = ((ExternalType) dt).getTargetName();
- String _operator_plus = StringExtensions.operator_plus("new ", _targetName);
- String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "()");
- return _operator_plus_1;
+ String _plus = ("new " + _targetName);
+ return (_plus + "()");
} else {
String _name = dt.getName();
- String _operator_plus_2 = StringExtensions.operator_plus("new ", _name);
- String _operator_plus_3 = StringExtensions.operator_plus(_operator_plus_2, "()");
- return _operator_plus_3;
+ String _plus_1 = ("new " + _name);
+ return (_plus_1 + "()");
}
}
}
@@ -54,13 +47,11 @@ public class TypeHelpers { public String defaultValue(final VarDecl a) {
RefableType _refType = a.getRefType();
DataType _type = _refType.getType();
- String _defaultValue = this.defaultValue(_type);
- return _defaultValue;
+ return this.defaultValue(_type);
}
public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
- String _generateTypedData = this.chainGenerator.generateTypedData(_data);
- return _generateTypedData;
+ return this.chainGenerator.generateTypedData(_data);
}
}
diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF index 72bca5203..51797e7ab 100644 --- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: eTrice Logging Fragment Bundle-SymbolicName: org.eclipse.etrice.logging
Bundle-Version: 0.2.0.qualifier
Bundle-Vendor: eTrice (Incubation)
-Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
+Fragment-Host: org.apache.log4j;bundle-version="1.2.15.v201012070815"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml index ea588fa4c..e1e5655e0 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml +++ b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml @@ -32,7 +32,7 @@ extensions="behavior"
icon="icons/Behavior.gif"
id="org.eclipse.etrice.ui.behavior.editor.BehaviorEditor"
- matchingStrategy="org.eclipse.graphiti.ui.editor.DiagramEditorFactory$DiagramEditorMatchingStrategy"
+ matchingStrategy="org.eclipse.graphiti.ui.editor.DiagramEditorMatchingStrategy"
name="ROOM Behavior Editor">
<contentTypeBinding
contentTypeId="org.eclipse.graphiti.content.diagram">
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java index f48c176c7..df11f731e 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java +++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/TransitionPropertyDialog.java @@ -308,6 +308,9 @@ public class TransitionPropertyDialog extends AbstractMemberAwarePropertyDialog }
createMembersAndMessagesButtons(body);
+
+ if (inherited)
+ disableAll(body);
}
private void disableAll(Composite parent) {
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java index 5684262cf..47a16eba5 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java +++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/editor/BehaviorEditor.java @@ -31,7 +31,6 @@ import org.eclipse.etrice.ui.common.editor.RoomDiagramEditor; import org.eclipse.graphiti.mm.pictograms.Diagram;
import org.eclipse.graphiti.mm.pictograms.Shape;
import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.ui.editor.DiagramEditorInput;
import org.eclipse.swt.graphics.Image;
@@ -48,7 +47,6 @@ public class BehaviorEditor extends RoomDiagramEditor { return Activator.getImage("icons/Behavior.gif");
}
- @SuppressWarnings("restriction")
@Override
protected void initializeGraphicalViewer() {
super.initializeGraphicalViewer();
@@ -63,7 +61,6 @@ public class BehaviorEditor extends RoomDiagramEditor { getEditingDomain().getCommandStack().flush();
}
- @SuppressWarnings("restriction")
public boolean showStateGraph(StateGraph sg) {
URI boUri = EcoreUtil.getURI(sg);
final StateGraph mySG = (StateGraph) getEditingDomain().getResourceSet().getEObject(boUri, true);
@@ -86,7 +83,7 @@ public class BehaviorEditor extends RoomDiagramEditor { * @return the actor class of this editor
*/
public ActorClass getActorClass() {
- Diagram diagram = ((DiagramEditorInput)getEditorInput()).getDiagram();
+ Diagram diagram = getDiagramTypeProvider().getDiagram();
EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(diagram);
if (bo instanceof ActorClass)
return (ActorClass) bo;
@@ -97,7 +94,6 @@ public class BehaviorEditor extends RoomDiagramEditor { /* (non-Javadoc)
* @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#doSave(org.eclipse.core.runtime.IProgressMonitor)
*/
- @SuppressWarnings("restriction")
@Override
public void doSave(IProgressMonitor monitor) {
getEditingDomain().getCommandStack().execute(new RecordingCommand(getEditingDomain()) {
@@ -115,7 +111,7 @@ public class BehaviorEditor extends RoomDiagramEditor { *
*/
protected void removeUnusedRefinedStates() {
- Diagram diagram = ((DiagramEditorInput)getEditorInput()).getDiagram();
+ Diagram diagram = getDiagramTypeProvider().getDiagram();
ActorClass ac = SupportUtil.getActorClass(diagram);
if (ac.getStateMachine()!=null) {
@@ -147,7 +143,6 @@ public class BehaviorEditor extends RoomDiagramEditor { }
protected void removeEmptySubgraphs() {
- @SuppressWarnings("restriction")
Diagram diagram = getDiagramTypeProvider().getDiagram();
// if our current context is an empty state graph we go one level up
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java index 0b4355d16..21eaa3cdf 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java +++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java @@ -607,11 +607,6 @@ public class TransitionSupport { Color fillColor = RoomHelpers.hasDetailCode(trans.getAction())?
lineColor:manageColor(FILL_COLOR);
updateLabel(trans, conn, fillColor);
-
- if (conn.getConnectionDecorators().size()>=2) {
- ConnectionDecorator cd = conn.getConnectionDecorators().get(1);
- getDiagramEditor().refresh(cd);
- }
}
@Override
diff --git a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java index 487da9d5e..de418656c 100644 --- a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java +++ b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/RoomDiagramEditor.java @@ -62,7 +62,6 @@ public class RoomDiagramEditor extends DiagramEditor { injector.injectMembers(this);
}
- @SuppressWarnings("restriction")
@Override
protected void initializeGraphicalViewer() {
super.initializeGraphicalViewer();
@@ -77,7 +76,6 @@ public class RoomDiagramEditor extends DiagramEditor { /* (non-Javadoc)
* @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#dispose()
*/
- @SuppressWarnings("restriction")
@Override
public void dispose() {
mte.unsetTarget(getEditingDomain());
@@ -90,7 +88,6 @@ public class RoomDiagramEditor extends DiagramEditor { /* (non-Javadoc)
* @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#doSave(org.eclipse.core.runtime.IProgressMonitor)
*/
- @SuppressWarnings("restriction")
@Override
public void doSave(final IProgressMonitor monitor) {
ResourceSet rs = getEditingDomain().getResourceSet();
@@ -145,7 +142,6 @@ public class RoomDiagramEditor extends DiagramEditor { super.doSave(monitor);
}
- @SuppressWarnings("restriction")
@Override
public void createPartControl(Composite parent) {
super.createPartControl(parent);
@@ -167,7 +163,6 @@ public class RoomDiagramEditor extends DiagramEditor { /* (non-Javadoc)
* @see org.eclipse.graphiti.ui.internal.editor.DiagramEditorInternal#setFocus()
*/
- @SuppressWarnings("restriction")
@Override
public void setFocus() {
boolean dirtyAlready = isDirty();
diff --git a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java index 6480cf745..8f10654b2 100644 --- a/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java +++ b/plugins/org.eclipse.etrice.ui.common/src/org/eclipse/etrice/ui/common/editor/SaveOnFocusLostListener.java @@ -58,7 +58,6 @@ public class SaveOnFocusLostListener implements IPartListener { /* (non-Javadoc)
* @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
*/
- @SuppressWarnings("restriction")
@Override
public void partDeactivated(IWorkbenchPart part) {
boolean save = store.getBoolean(PreferenceConstants.SAVE_DIAG_ON_FOCUS_LOST);
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip Binary files differindex 519b8482c..85efd11ec 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip Binary files differindex 00941af0c..99829442c 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip Binary files differindex 982096704..6c2b88c67 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip Binary files differindex 693c9d5fd..ee2ebde8d 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.zip Binary files differindex 6200e3f4e..c14e621a6 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.zip +++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.zip diff --git a/plugins/org.eclipse.etrice.ui.structure/plugin.xml b/plugins/org.eclipse.etrice.ui.structure/plugin.xml index 18b39d6d0..04177e711 100644 --- a/plugins/org.eclipse.etrice.ui.structure/plugin.xml +++ b/plugins/org.eclipse.etrice.ui.structure/plugin.xml @@ -32,7 +32,7 @@ extensions="structure"
icon="icons/Structure.gif"
id="org.eclipse.etrice.ui.structure.editor.StructureEditor"
- matchingStrategy="org.eclipse.graphiti.ui.editor.DiagramEditorFactory$DiagramEditorMatchingStrategy"
+ matchingStrategy="org.eclipse.graphiti.ui.editor.DiagramEditorMatchingStrategy"
name="ROOM Structure Editor">
<contentTypeBinding
contentTypeId="org.eclipse.graphiti.content.diagram">
diff --git a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java index 9b3411909..da37854c3 100644 --- a/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java +++ b/plugins/org.eclipse.etrice.ui.structure/src/org/eclipse/etrice/ui/structure/editor/StructureEditor.java @@ -18,7 +18,6 @@ import org.eclipse.etrice.ui.common.editor.RoomDiagramEditor; import org.eclipse.etrice.ui.structure.Activator;
import org.eclipse.graphiti.mm.pictograms.Diagram;
import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.ui.editor.DiagramEditorInput;
import org.eclipse.swt.graphics.Image;
@@ -39,7 +38,7 @@ public class StructureEditor extends RoomDiagramEditor { * @return the actor class of this editor
*/
public StructureClass getStructureClass() {
- Diagram diagram = ((DiagramEditorInput)getEditorInput()).getDiagram();
+ Diagram diagram = getDiagramTypeProvider().getDiagram();
EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(diagram);
if (bo instanceof StructureClass)
return (StructureClass) bo;
|