summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2013-04-01 16:19:36 (EDT)
committerJuergen Haug2013-04-01 16:19:36 (EDT)
commitd4665ec37594f92d57287012073f3b201b386583 (patch)
treefac168af7174eecdd36fe4eddca2e2367965fa09
parent40dfb78555b1e3dd37b5323d4bf34e89561032c8 (diff)
downloadorg.eclipse.etrice-d4665ec37594f92d57287012073f3b201b386583.zip
org.eclipse.etrice-d4665ec37594f92d57287012073f3b201b386583.tar.gz
org.eclipse.etrice-d4665ec37594f92d57287012073f3b201b386583.tar.bz2
re-generation of xtend files (with version 2.4) caused by changerefs/changes/91/11591/1
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen77
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java5
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java3
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen77
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java5
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java3
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java2
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen77
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java5
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java3
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens2
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java32
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java2
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen77
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java5
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java3
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java16
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java13
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java15
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java33
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java17
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java12
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java16
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemRunnerGen.java14
-rw-r--r--plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java10
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java46
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java28
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java15
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java17
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java14
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java25
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java13
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java14
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java14
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java15
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java15
-rw-r--r--plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java3
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java18
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java25
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java15
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java76
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java12
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java17
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.java14
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.java13
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java22
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java12
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java13
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java16
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java13
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java10
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java17
55 files changed, 905 insertions, 140 deletions
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 cd20330..8ea1822 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
@@ -22,5 +22,6 @@ Import-Package: org.apache.log4j,
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.etrice.core.ui.contentassist.antlr,
org.eclipse.etrice.core.ui.internal,
- org.eclipse.etrice.core.ui.contentassist
+ org.eclipse.etrice.core.ui.contentassist,
+ org.eclipse.etrice.core.ui.quickfix
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 b8d0938..fd680f4 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.config.ui/plugin.xml_gen
@@ -33,7 +33,27 @@
definitionId="org.eclipse.etrice.core.Config.Editor.opened">
</reference>
</activeWhen>
- </handler>
+ </handler>
+ <!-- copy qualified name -->
+ <handler
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+ <activeWhen>
+ <reference definitionId="org.eclipse.etrice.core.Config.Editor.opened" />
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+ <activeWhen>
+ <and>
+ <reference definitionId="org.eclipse.etrice.core.Config.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </activeWhen>
+ </handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition id="org.eclipse.etrice.core.Config.Editor.opened">
@@ -46,6 +66,16 @@
</with>
</and>
</definition>
+ <definition id="org.eclipse.etrice.core.Config.XtextEditor.opened">
+ <and>
+ <reference definitionId="isXtextEditorActive"/>
+ <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">
@@ -96,6 +126,19 @@
id="org.eclipse.etrice.core.Config.validate"
name="Validate">
</command>
+ <!-- copy qualified name -->
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
@@ -111,6 +154,36 @@
</visibleWhen>
</command>
</menuContribution>
+ <!-- copy qualified name -->
+ <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.Config.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="menu:edit?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.Config.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <reference definitionId="org.eclipse.etrice.core.Config.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
@@ -269,7 +342,7 @@
<!-- Rename Refactoring -->
<extension point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler"
+ class="org.eclipse.etrice.core.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
<activeWhen>
<reference
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
index c411e6c..c456796 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/AbstractConfigUiModule.java
@@ -138,11 +138,6 @@ public abstract class AbstractConfigUiModule extends DefaultUiModule {
return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;
}
- // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
- public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler> bindIRenameElementHandler() {
- return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler.class;
- }
-
// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
diff --git a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java
index 2f6b532..c4b2fcd 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.config.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractConfigProposalProvider.java
@@ -5,7 +5,6 @@ package org.eclipse.etrice.core.ui.contentassist;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.*;
-import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider;
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
@@ -15,7 +14,7 @@ import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
* with a more concrete subtype.
*/
@SuppressWarnings("all")
-public class AbstractConfigProposalProvider extends TerminalsProposalProvider {
+public class AbstractConfigProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {
public void completeConfigModel_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
index 35ac606..1dd82b6 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
@@ -21,5 +21,6 @@ Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.etrice.core.etmap.ui.contentassist,
org.eclipse.etrice.core.etmap.ui.contentassist.antlr,
- org.eclipse.etrice.core.etmap.ui.internal
+ org.eclipse.etrice.core.etmap.ui.internal,
+ org.eclipse.etrice.core.etmap.ui.quickfix
Bundle-Activator: org.eclipse.etrice.core.etmap.ui.internal.ETMapActivator
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
index efb35b7..7053292 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/plugin.xml_gen
@@ -33,7 +33,27 @@
definitionId="org.eclipse.etrice.core.etmap.ETMap.Editor.opened">
</reference>
</activeWhen>
- </handler>
+ </handler>
+ <!-- copy qualified name -->
+ <handler
+ class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+ <activeWhen>
+ <reference definitionId="org.eclipse.etrice.core.etmap.ETMap.Editor.opened" />
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+ <activeWhen>
+ <and>
+ <reference definitionId="org.eclipse.etrice.core.etmap.ETMap.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </activeWhen>
+ </handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition id="org.eclipse.etrice.core.etmap.ETMap.Editor.opened">
@@ -46,6 +66,16 @@
</with>
</and>
</definition>
+ <definition id="org.eclipse.etrice.core.etmap.ETMap.XtextEditor.opened">
+ <and>
+ <reference definitionId="isXtextEditorActive"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.eclipse.etrice.core.etmap.ETMap"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
@@ -96,6 +126,19 @@
id="org.eclipse.etrice.core.etmap.ETMap.validate"
name="Validate">
</command>
+ <!-- copy qualified name -->
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
@@ -111,6 +154,36 @@
</visibleWhen>
</command>
</menuContribution>
+ <!-- copy qualified name -->
+ <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.etmap.ETMap.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="menu:edit?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.etmap.ETMap.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <reference definitionId="org.eclipse.etrice.core.etmap.ETMap.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
@@ -269,7 +342,7 @@
<!-- Rename Refactoring -->
<extension point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler"
+ class="org.eclipse.etrice.core.etmap.ui.ETMapExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
<activeWhen>
<reference
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
index d7a32eb..57e2748 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/AbstractETMapUiModule.java
@@ -138,11 +138,6 @@ public abstract class AbstractETMapUiModule extends DefaultUiModule {
return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;
}
- // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
- public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler> bindIRenameElementHandler() {
- return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler.class;
- }
-
// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java
index b33342b..10fb2bc 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/AbstractETMapProposalProvider.java
@@ -5,7 +5,6 @@ package org.eclipse.etrice.core.etmap.ui.contentassist;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.*;
-import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider;
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
@@ -15,7 +14,7 @@ import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
* with a more concrete subtype.
*/
@SuppressWarnings("all")
-public class AbstractETMapProposalProvider extends TerminalsProposalProvider {
+public class AbstractETMapProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {
public void completeMappingModel_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
index c6b925d..b387734 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/src-gen/org/eclipse/etrice/core/etmap/ui/contentassist/antlr/internal/InternalETMapLexer.java
@@ -14,8 +14,8 @@ import java.util.ArrayList;
public class InternalETMapLexer extends Lexer {
public static final int RULE_ID=4;
public static final int T__22=22;
- public static final int T__21=21;
public static final int RULE_ANY_OTHER=10;
+ public static final int T__21=21;
public static final int T__20=20;
public static final int EOF=-1;
public static final int RULE_SL_COMMENT=8;
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
index 9b153ed..f018a6a 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
@@ -20,5 +20,6 @@ Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist,
org.eclipse.etrice.core.etphys.ui.contentassist.antlr,
- org.eclipse.etrice.core.etphys.ui.internal
+ org.eclipse.etrice.core.etphys.ui.internal,
+ org.eclipse.etrice.core.etphys.ui.quickfix
Bundle-Activator: org.eclipse.etrice.core.etphys.ui.internal.ETPhysActivator
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen b/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
index e3d825f..74dd9c6 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/plugin.xml_gen
@@ -33,7 +33,27 @@
definitionId="org.eclipse.etrice.core.etphys.ETPhys.Editor.opened">
</reference>
</activeWhen>
- </handler>
+ </handler>
+ <!-- copy qualified name -->
+ <handler
+ class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+ <activeWhen>
+ <reference definitionId="org.eclipse.etrice.core.etphys.ETPhys.Editor.opened" />
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+ <activeWhen>
+ <and>
+ <reference definitionId="org.eclipse.etrice.core.etphys.ETPhys.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </activeWhen>
+ </handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition id="org.eclipse.etrice.core.etphys.ETPhys.Editor.opened">
@@ -46,6 +66,16 @@
</with>
</and>
</definition>
+ <definition id="org.eclipse.etrice.core.etphys.ETPhys.XtextEditor.opened">
+ <and>
+ <reference definitionId="isXtextEditorActive"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.eclipse.etrice.core.etphys.ETPhys"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
@@ -96,6 +126,19 @@
id="org.eclipse.etrice.core.etphys.ETPhys.validate"
name="Validate">
</command>
+ <!-- copy qualified name -->
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
@@ -111,6 +154,36 @@
</visibleWhen>
</command>
</menuContribution>
+ <!-- copy qualified name -->
+ <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.etphys.ETPhys.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="menu:edit?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.etphys.ETPhys.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <reference definitionId="org.eclipse.etrice.core.etphys.ETPhys.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
@@ -269,7 +342,7 @@
<!-- Rename Refactoring -->
<extension point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler"
+ class="org.eclipse.etrice.core.etphys.ui.ETPhysExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
<activeWhen>
<reference
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java
index 1a0adc2..8b51dde 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/AbstractETPhysUiModule.java
@@ -138,11 +138,6 @@ public abstract class AbstractETPhysUiModule extends DefaultUiModule {
return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;
}
- // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
- public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler> bindIRenameElementHandler() {
- return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler.class;
- }
-
// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java
index b466c79..9a541bf 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/AbstractETPhysProposalProvider.java
@@ -5,7 +5,6 @@ package org.eclipse.etrice.core.etphys.ui.contentassist;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.*;
-import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider;
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
@@ -15,7 +14,7 @@ import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
* with a more concrete subtype.
*/
@SuppressWarnings("all")
-public class AbstractETPhysProposalProvider extends TerminalsProposalProvider {
+public class AbstractETPhysProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {
public void completePhysicalModel_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens
index fbcb87a..bb15508 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhys.tokens
@@ -7,8 +7,8 @@ T__25=25
T__24=24
T__23=23
T__22=22
-T__21=21
RULE_ANY_OTHER=10
+T__21=21
T__20=20
T__19=19
T__16=16
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
index 1923572..5a9820e 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysLexer.java
@@ -12,7 +12,11 @@ import java.util.ArrayList;
@SuppressWarnings("all")
public class InternalETPhysLexer extends Lexer {
+ public static final int T__42=42;
+ public static final int T__43=43;
+ public static final int T__40=40;
public static final int RULE_ID=5;
+ public static final int T__41=41;
public static final int T__29=29;
public static final int T__28=28;
public static final int T__27=27;
@@ -24,34 +28,30 @@ public class InternalETPhysLexer extends Lexer {
public static final int RULE_ANY_OTHER=10;
public static final int T__21=21;
public static final int T__20=20;
- public static final int EOF=-1;
- public static final int T__19=19;
- public static final int T__16=16;
- public static final int T__15=15;
- public static final int T__18=18;
- public static final int T__17=17;
- public static final int T__12=12;
- public static final int T__11=11;
- public static final int T__14=14;
- public static final int T__13=13;
- public static final int RULE_INT=4;
- public static final int T__42=42;
- public static final int T__43=43;
- public static final int T__40=40;
- public static final int T__41=41;
public static final int RULE_SL_COMMENT=8;
+ public static final int EOF=-1;
public static final int RULE_ML_COMMENT=7;
public static final int T__30=30;
+ public static final int T__19=19;
public static final int T__31=31;
- public static final int T__32=32;
public static final int RULE_STRING=6;
+ public static final int T__32=32;
public static final int T__33=33;
+ public static final int T__16=16;
public static final int T__34=34;
+ public static final int T__15=15;
public static final int T__35=35;
+ public static final int T__18=18;
public static final int T__36=36;
+ public static final int T__17=17;
public static final int T__37=37;
+ public static final int T__12=12;
public static final int T__38=38;
+ public static final int T__11=11;
public static final int T__39=39;
+ public static final int T__14=14;
+ public static final int T__13=13;
+ public static final int RULE_INT=4;
public static final int RULE_WS=9;
// delegates
diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java
index 8216d5a..f8099f9 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/src-gen/org/eclipse/etrice/core/etphys/ui/contentassist/antlr/internal/InternalETPhysParser.java
@@ -33,8 +33,8 @@ public class InternalETPhysParser extends AbstractInternalContentAssistParser {
public static final int T__24=24;
public static final int T__23=23;
public static final int T__22=22;
- public static final int T__21=21;
public static final int RULE_ANY_OTHER=10;
+ public static final int T__21=21;
public static final int T__20=20;
public static final int EOF=-1;
public static final int T__19=19;
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 0b4a70e..42588c2 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen
+++ b/plugins/org.eclipse.etrice.core.room.ui/plugin.xml_gen
@@ -33,7 +33,27 @@
definitionId="org.eclipse.etrice.core.Room.Editor.opened">
</reference>
</activeWhen>
- </handler>
+ </handler>
+ <!-- copy qualified name -->
+ <handler
+ class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+ <activeWhen>
+ <reference definitionId="org.eclipse.etrice.core.Room.Editor.opened" />
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+ <activeWhen>
+ <and>
+ <reference definitionId="org.eclipse.etrice.core.Room.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </activeWhen>
+ </handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition id="org.eclipse.etrice.core.Room.Editor.opened">
@@ -46,6 +66,16 @@
</with>
</and>
</definition>
+ <definition id="org.eclipse.etrice.core.Room.XtextEditor.opened">
+ <and>
+ <reference definitionId="isXtextEditorActive"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.eclipse.etrice.core.Room"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
@@ -96,6 +126,19 @@
id="org.eclipse.etrice.core.Room.validate"
name="Validate">
</command>
+ <!-- copy qualified name -->
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
@@ -111,6 +154,36 @@
</visibleWhen>
</command>
</menuContribution>
+ <!-- copy qualified name -->
+ <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.Room.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="menu:edit?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.etrice.core.Room.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <reference definitionId="org.eclipse.etrice.core.Room.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
@@ -238,7 +311,7 @@
<!-- Rename Refactoring -->
<extension point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler"
+ class="org.eclipse.etrice.core.ui.RoomExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
<activeWhen>
<reference
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java
index b44f811..ac3b10f 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/AbstractRoomUiModule.java
@@ -123,11 +123,6 @@ public abstract class AbstractRoomUiModule extends DefaultUiModule {
return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;
}
- // contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
- public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameElementHandler> bindIRenameElementHandler() {
- return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler.class;
- }
-
// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
public Class<? extends org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext.Factory> bindContentAssistContext$Factory() {
return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.class;
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java
index 193fd29..31827a9 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/AbstractRoomProposalProvider.java
@@ -5,7 +5,6 @@ package org.eclipse.etrice.core.ui.contentassist;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.*;
-import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider;
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
@@ -15,7 +14,7 @@ import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
* with a more concrete subtype.
*/
@SuppressWarnings("all")
-public class AbstractRoomProposalProvider extends TerminalsProposalProvider {
+public class AbstractRoomProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {
public void completeRoomModel_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
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 5f45614..f40633e 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,3 +1,14 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -31,6 +42,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -38,15 +50,19 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
@SuppressWarnings("all")
public class ActorClassGen extends GenericActorClassGenerator {
@Inject
+ @Extension
protected RoomExtensions _roomExtensions;
@Inject
+ @Extension
private CExtensions _cExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private StateMachineGen _stateMachineGen;
@Inject
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 1512609..f2b3800 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
@@ -1,3 +1,14 @@
+/**
+ * Copyright (c) 2010 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:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -33,7 +44,7 @@ public class CExtensions implements ILanguageExtension {
public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
String[] _generateArglistAndTypedData = this.generateArglistAndTypedData(_data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(1);
+ String _get = _generateArglistAndTypedData[1];
return _get;
}
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 49b9bb4..256b244 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,3 +1,14 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -17,6 +28,7 @@ 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.Extension;
@Singleton
@SuppressWarnings("all")
@@ -25,12 +37,15 @@ public class DataClassGen {
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CExtensions _cExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java
index 358b30a..695c682 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java
@@ -1,3 +1,13 @@
+/**
+ * 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 (initial contribution)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -21,6 +31,7 @@ import org.eclipse.etrice.generator.c.gen.CExtensions;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IntegerRange;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -30,9 +41,11 @@ public class Initialization {
private CExtensions languageExt;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
public CharSequence generateAttributeInit(final InstanceBase instance, final List<Attribute> attributes) {
@@ -98,7 +111,7 @@ public class Initialization {
_or = (_equals || _and);
}
if (_or) {
- String _initAttribute = this.initAttribute(instance, path);
+ CharSequence _initAttribute = this.initAttribute(instance, path);
String _plus = (_initAttribute + COMMENT);
_xifexpression = _plus;
} else {
@@ -114,7 +127,7 @@ public class Initialization {
} else {
_builder_1.appendImmediate(", ", "");
}
- String _initAttribute_1 = this.initAttribute(instance, path);
+ CharSequence _initAttribute_1 = this.initAttribute(instance, path);
_builder_1.append(_initAttribute_1, "");
}
}
@@ -128,8 +141,8 @@ public class Initialization {
return _xblockexpression;
}
- private String initAttribute(final InstanceBase instance, final List<Attribute> path) {
- String _xblockexpression = null;
+ private CharSequence initAttribute(final InstanceBase instance, final List<Attribute> path) {
+ CharSequence _xblockexpression = null;
{
Attribute a = IterableExtensions.<Attribute>last(path);
RefableType _refType = a.getRefType();
@@ -149,7 +162,7 @@ public class Initialization {
}
return _xifexpression;
}
- String _switchResult = null;
+ CharSequence _switchResult = null;
boolean _matched = false;
if (!_matched) {
if (aType instanceof DataClass) {
@@ -169,13 +182,13 @@ public class Initialization {
}
_builder.append("\t");
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, subA);
- CharSequence _initAttributeArray = this.initAttributeArray(instance, _union);
+ Object _initAttributeArray = this.initAttributeArray(instance, _union);
_builder.append(_initAttributeArray, " ");
_builder.newLineIfNotEmpty();
}
}
_builder.append("}");
- _switchResult = _builder.toString();
+ _switchResult = _builder;
}
}
if (!_matched) {
@@ -199,10 +212,10 @@ public class Initialization {
if (aType instanceof PrimitiveType) {
final PrimitiveType _primitiveType = (PrimitiveType)aType;
_matched=true;
- String _xblockexpression_1 = null;
+ CharSequence _xblockexpression_1 = null;
{
String value = this.getPrimitiveValue(instance, path);
- String _xifexpression_1 = null;
+ CharSequence _xifexpression_1 = null;
boolean _and = false;
boolean _and_1 = false;
int _size = a.getSize();
@@ -239,7 +252,7 @@ public class Initialization {
}
}
_builder.append(" }");
- _xifexpression_1 = _builder.toString();
+ _xifexpression_1 = _builder;
} else {
_xifexpression_1 = value;
}
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 23b0337..9a2b42b 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,3 +1,14 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -30,6 +41,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -37,18 +49,23 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
@SuppressWarnings("all")
public class ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CExtensions _cExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
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 5bcbbf2..e8aacb9 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
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.inject.Inject;
@@ -10,11 +20,13 @@ import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.etrice.generator.generic.GenericStateMachineGenerator;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
public class StateMachineGen extends GenericStateMachineGenerator {
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
public CharSequence genHeaderConstants(final ExpandedActorClass xpac) {
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 b576998..9e81841 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,3 +1,14 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.common.base.Objects;
@@ -46,6 +57,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IntegerRange;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -55,15 +67,19 @@ import org.eclipse.xtext.xbase.lib.ListExtensions;
@SuppressWarnings("all")
public class SubSystemClassGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CExtensions stdExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
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 033adcb..7918680 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
@@ -1,3 +1,14 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (changed for C code generator)
+ */
package org.eclipse.etrice.generator.c.gen;
import com.google.inject.Inject;
@@ -9,14 +20,17 @@ 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.Extension;
@Singleton
@SuppressWarnings("all")
public class SubSystemRunnerGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private RoomExtensions roomExt;
public void doGenerate(final Root root) {
diff --git a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
index ff2c9b4..11faac3 100644
--- a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
+++ b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2012 Juergen Haug
+ * 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
+ */
package org.eclipse.etrice.generator.config;
import com.google.common.base.Objects;
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
index 8304e7d..a681c29 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 Draeger Medical GmbH (http://www.draeger.com).
+ * 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:
+ * Peter Karlitschek (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -33,6 +43,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
@@ -47,18 +58,23 @@ public class ActorClassGen extends GenericActorClassGenerator {
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions _cppExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private StateMachineGen _stateMachineGen;
@Inject
@@ -276,8 +292,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.append("\t\t\t");
List<Port> _endPorts = RoomHelpers.getEndPorts(ac);
- final Function1<Port,CharSequence> _function_2 = new Function1<Port,CharSequence>() {
- public CharSequence apply(final Port port) {
+ final Function1<Port,String> _function_2 = new Function1<Port,String>() {
+ public String apply(final Port port) {
StringConcatenation _builder = new StringConcatenation();
String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(port);
_builder.append(_portClassName, "");
@@ -285,10 +301,10 @@ public class ActorClassGen extends GenericActorClassGenerator {
String _name = port.getName();
_builder.append(_name, "");
_builder.append(";");
- return _builder;
+ return _builder.toString();
}
};
- List<CharSequence> _map = ListExtensions.<Port, CharSequence>map(_endPorts, _function_2);
+ List<String> _map = ListExtensions.<Port, String>map(_endPorts, _function_2);
String _join = IterableExtensions.join(_map, "\n");
_builder.append(_join, " ");
_builder.newLineIfNotEmpty();
@@ -297,8 +313,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.append("\t\t\t");
EList<SAPRef> _strSAPs = ac.getStrSAPs();
- final Function1<SAPRef,CharSequence> _function_3 = new Function1<SAPRef,CharSequence>() {
- public CharSequence apply(final SAPRef sap) {
+ final Function1<SAPRef,String> _function_3 = new Function1<SAPRef,String>() {
+ public String apply(final SAPRef sap) {
StringConcatenation _builder = new StringConcatenation();
String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(sap);
_builder.append(_portClassName, "");
@@ -306,10 +322,10 @@ public class ActorClassGen extends GenericActorClassGenerator {
String _name = sap.getName();
_builder.append(_name, "");
_builder.append(";");
- return _builder;
+ return _builder.toString();
}
};
- List<CharSequence> _map_1 = ListExtensions.<SAPRef, CharSequence>map(_strSAPs, _function_3);
+ List<String> _map_1 = ListExtensions.<SAPRef, String>map(_strSAPs, _function_3);
String _join_1 = IterableExtensions.join(_map_1, "\n");
_builder.append(_join_1, " ");
_builder.newLineIfNotEmpty();
@@ -318,8 +334,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.append("\t\t\t");
EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations();
- final Function1<ServiceImplementation,CharSequence> _function_4 = new Function1<ServiceImplementation,CharSequence>() {
- public CharSequence apply(final ServiceImplementation svc) {
+ final Function1<ServiceImplementation,String> _function_4 = new Function1<ServiceImplementation,String>() {
+ public String apply(final ServiceImplementation svc) {
StringConcatenation _builder = new StringConcatenation();
String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(svc);
_builder.append(_portClassName, "");
@@ -328,10 +344,10 @@ public class ActorClassGen extends GenericActorClassGenerator {
String _name = _spp.getName();
_builder.append(_name, "");
_builder.append(";");
- return _builder;
+ return _builder.toString();
}
};
- List<CharSequence> _map_2 = ListExtensions.<ServiceImplementation, CharSequence>map(_serviceImplementations, _function_4);
+ List<String> _map_2 = ListExtensions.<ServiceImplementation, String>map(_serviceImplementations, _function_4);
String _join_2 = IterableExtensions.join(_map_2, "\n");
_builder.append(_join_2, " ");
_builder.newLineIfNotEmpty();
@@ -488,7 +504,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
return _xblockexpression;
}
- private CharSequence generateConstructorInitalizerList(final ActorClass ac) {
+ private String generateConstructorInitalizerList(final ActorClass ac) {
ArrayList<CharSequence> _arrayList = new ArrayList<CharSequence>();
ArrayList<CharSequence> initializerList = _arrayList;
ActorClass _base = ac.getBase();
@@ -603,7 +619,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
String _join = IterableExtensions.join(initializerList, ",\n");
_builder_5.append(_join, "");
_builder_5.newLineIfNotEmpty();
- return _builder_5;
+ return _builder_5.toString();
}
private CharSequence generateSourceFile(final Root root, final ExpandedActorClass xpac, final ActorClass ac) {
@@ -676,7 +692,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.append("const std::vector<std::vector<etRuntime::Address> >& peer_addr)");
_builder.newLine();
_builder.append(": ");
- CharSequence _generateConstructorInitalizerList = this.generateConstructorInitalizerList(ac);
+ String _generateConstructorInitalizerList = this.generateConstructorInitalizerList(ac);
_builder.append(_generateConstructorInitalizerList, "");
_builder.newLineIfNotEmpty();
_builder.append("{");
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java
index a0aef9d..8154f11 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java
@@ -1,3 +1,14 @@
+/**
+ * Copyright (c) 2012 Juergen Haug
+ * 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
+ * Peter Karlitschek
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -25,24 +36,29 @@ import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class ConfigGenAddon {
@Inject
+ @Extension
private CppExtensions stdExt;
@Inject
+ @Extension
private TypeHelpers typeHelpers;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
private IDataConfiguration dataConfigExt;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
public CharSequence genActorInstanceConfig(final ActorInstance ai, final String aiVariableName) {
@@ -152,7 +168,7 @@ public class ConfigGenAddon {
}
}
_builder_2.append(" }");
- CharSequence arrayExpr = _builder_2;
+ String arrayExpr = _builder_2.toString();
StringConcatenation _builder_3 = new StringConcatenation();
_builder_3.append(invokes, "");
_builder_3.append(".");
@@ -220,7 +236,7 @@ public class ConfigGenAddon {
CharSequence _invokeGetter = this.helpers.invokeGetter(_name, null);
String _plus_1 = (_plus + _invokeGetter);
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _applyInstanceConfig = this.applyInstanceConfig(instance, _plus_1, _union);
+ Object _applyInstanceConfig = this.applyInstanceConfig(instance, _plus_1, _union);
_builder.append(_applyInstanceConfig, "");
_builder.newLineIfNotEmpty();
}
@@ -414,7 +430,7 @@ public class ConfigGenAddon {
return _builder;
}
- public CharSequence genMinMaxConstants(final ActorClass ac) {
+ public String genMinMaxConstants(final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
{
EList<Attribute> _attributes = ac.getAttributes();
@@ -427,13 +443,13 @@ public class ConfigGenAddon {
_builder.newLineIfNotEmpty();
}
}
- CharSequence result = _builder;
+ String result = _builder.toString();
int _length = result.length();
boolean _notEquals = (_length != 0);
if (_notEquals) {
StringConcatenation _builder_1 = new StringConcatenation();
_builder_1.append("//--------------------- Attribute Specifications");
- String _plus = (result + _builder_1.toString());
+ String _plus = (result + _builder_1);
result = _plus;
}
return result;
@@ -460,7 +476,7 @@ public class ConfigGenAddon {
String _name = e.getName();
String _plus_1 = (_plus + _name);
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _genMinMaxConstantsRec = this.genMinMaxConstantsRec(ac, _plus_1, _union);
+ Object _genMinMaxConstantsRec = this.genMinMaxConstantsRec(ac, _plus_1, _union);
_builder.append(_genMinMaxConstantsRec, "");
_builder.newLineIfNotEmpty();
}
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
index fff0cfc..d2c8278 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
@@ -1,3 +1,14 @@
+/**
+ * Copyright (c) 2010 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:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ * Peter Karlitschek
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -23,6 +34,7 @@ import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
@@ -31,12 +43,13 @@ public class CppExtensions implements ILanguageExtension {
private IDiagnostician diagnostician;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
String[] _generateArglistAndTypedData = this.generateArglistAndTypedData(_data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(1);
+ String _get = _generateArglistAndTypedData[1];
return _get;
}
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
index 676cb9b..ba1014a 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 Draeger Medical GmbH (http://www.draeger.com).
+ * 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:
+ * Peter Karlitschek (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -25,6 +35,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -35,21 +46,27 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
@SuppressWarnings("all")
public class DataClassGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions stdExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
+ @Extension
private TypeHelpers typeHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java
index f09b873..b5fbde5 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java
@@ -1,3 +1,14 @@
+/**
+ * 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Peter Karlitschek
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -14,14 +25,17 @@ 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.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
public class Initialization {
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java
index f418b20..d967280 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 Draeger Medical GmbH (http://www.draeger.com).
+ * 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:
+ * Peter Karlitschek (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.common.base.Objects;
@@ -37,6 +47,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
/**
@@ -46,21 +57,27 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
@SuppressWarnings("all")
public class ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions stdExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
@@ -569,7 +586,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append(": ");
- CharSequence _generateConstructorInitalizerList = this.generateConstructorInitalizerList(pclass, "0");
+ String _generateConstructorInitalizerList = this.generateConstructorInitalizerList(pclass, "0");
_builder.append(_generateConstructorInitalizerList, " ");
_builder.newLineIfNotEmpty();
_builder.append("{");
@@ -603,7 +620,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append(": ");
- CharSequence _generateConstructorInitalizerList_1 = this.generateConstructorInitalizerList(pclass, "idx");
+ String _generateConstructorInitalizerList_1 = this.generateConstructorInitalizerList(pclass, "idx");
_builder.append(_generateConstructorInitalizerList_1, " ");
_builder.newLineIfNotEmpty();
_builder.append("{");
@@ -859,7 +876,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
return _xblockexpression;
}
- public CharSequence generateConstructorInitalizerList(final PortClass pc, final String index) {
+ public String generateConstructorInitalizerList(final PortClass pc, final String index) {
ArrayList<CharSequence> _arrayList = new ArrayList<CharSequence>();
ArrayList<CharSequence> initializerList = _arrayList;
StringConcatenation _builder = new StringConcatenation();
@@ -879,7 +896,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
String _join = IterableExtensions.join(initializerList, ",\n");
_builder_1.append(_join, "");
_builder_1.newLineIfNotEmpty();
- return _builder_1;
+ return _builder_1.toString();
}
private CharSequence messageCall(final Message m) {
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java
index 975d49b..d1c317a 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java
@@ -1,3 +1,14 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Peter Karlitschek
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.inject.Inject;
@@ -17,6 +28,7 @@ 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.Extension;
/**
* @author Peter Karlitschek
@@ -25,6 +37,7 @@ import org.eclipse.xtext.util.Tuples;
@SuppressWarnings("all")
public class StateMachineGen extends GenericStateMachineGenerator {
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java
index d0e574e..e46c7d2 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 Draeger Medical GmbH (http://www.draeger.com).
+ * 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:
+ * Peter Karlitschek (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.inject.Inject;
@@ -21,6 +31,7 @@ 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.Extension;
/**
* @author Peter Karlitschek
@@ -32,12 +43,15 @@ public class SubSystemClassGen {
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions _cppExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java
index 87c3312..08d8821 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 Draeger Medical GmbH (http://www.draeger.com).
+ * 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:
+ * Peter Karlitschek (initial contribution)
+ */
package org.eclipse.etrice.generator.cpp.gen;
import com.google.inject.Inject;
@@ -10,6 +20,7 @@ import org.eclipse.etrice.generator.cpp.gen.CppExtensions;
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.Extension;
/**
* @author Peter Karlitschek
@@ -18,12 +29,15 @@ import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@SuppressWarnings("all")
public class SubSystemRunnerGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private CppExtensions _cppExtensions;
@Inject
+ @Extension
private RoomExtensions roomExt;
public void doGenerate(final Root root) {
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
index 6066f5d..251a47b 100644
--- 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
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Thomas Jung, Thomas Schuetz (initial contribution)
+ */
package org.eclipse.etrice.generator.doc.gen;
import com.google.common.base.Objects;
@@ -33,15 +43,18 @@ import org.eclipse.etrice.generator.base.IRoomGenerator;
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.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@Singleton
@SuppressWarnings("all")
public class DocGen implements IRoomGenerator {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
@@ -828,7 +841,7 @@ public class DocGen implements IRoomGenerator {
boolean _isLeaf = RoomHelpers.isLeaf(s_1);
boolean _not = (!_isLeaf);
if (_not) {
- CharSequence _generateStateDoc = this.generateStateDoc(model, ac, s_1);
+ Object _generateStateDoc = this.generateStateDoc(model, ac, s_1);
_builder.append(_generateStateDoc, "");
_builder.newLineIfNotEmpty();
}
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
index ec54b2a..65d3ed5 100644
--- 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
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.doc.gen;
import com.google.common.base.Objects;
@@ -23,14 +33,17 @@ 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.Exceptions;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
public class InstanceDiagramGen implements IRoomGenerator {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
@@ -204,7 +217,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
{
EList<ActorInstance> _instances = ai.getInstances();
for(final ActorInstance sub_ai : _instances) {
- CharSequence _instance = this.instance(sub_ai);
+ Object _instance = this.instance(sub_ai);
_builder.append(_instance, "");
_builder.newLineIfNotEmpty();
}
diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java
index 85ec425..4630a0a 100644
--- a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java
+++ b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java
@@ -1,3 +1,6 @@
+/**
+ * generated by Xtext
+ */
package org.eclipse.etrice.generator.generator;
import org.eclipse.emf.ecore.resource.Resource;
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 0604bbb..a306d01 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,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -31,6 +41,7 @@ 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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -41,9 +52,11 @@ public class ActorClassGen extends GenericActorClassGenerator {
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions _javaExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
@@ -53,12 +66,15 @@ public class ActorClassGen extends GenericActorClassGenerator {
private ConfigGenAddon configGenAddon;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
+ @Extension
private StateMachineGen _stateMachineGen;
@Inject
@@ -290,7 +306,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLineIfNotEmpty();
_builder.newLine();
_builder.append("\t");
- CharSequence _genMinMaxConstants = this.configGenAddon.genMinMaxConstants(ac);
+ String _genMinMaxConstants = this.configGenAddon.genMinMaxConstants(ac);
_builder.append(_genMinMaxConstants, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
index 2218478..4a2b40b 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2012 Juergen Haug
+ * 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
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -24,24 +34,29 @@ import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.etrice.generator.java.gen.Initialization;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class ConfigGenAddon {
@Inject
+ @Extension
private JavaExtensions stdExt;
@Inject
+ @Extension
private TypeHelpers typeHelpers;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
private IDataConfiguration dataConfigExt;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
@@ -130,7 +145,7 @@ public class ConfigGenAddon {
CharSequence _invokeGetter = this.helpers.invokeGetter(_name, null);
String _plus_1 = (_plus + _invokeGetter);
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _applyInstanceConfig = this.applyInstanceConfig(instance, _plus_1, _union);
+ Object _applyInstanceConfig = this.applyInstanceConfig(instance, _plus_1, _union);
_builder.append(_applyInstanceConfig, "");
_builder.newLineIfNotEmpty();
}
@@ -323,7 +338,7 @@ public class ConfigGenAddon {
return _builder;
}
- public CharSequence genMinMaxConstants(final ActorClass ac) {
+ public String genMinMaxConstants(final ActorClass ac) {
StringConcatenation _builder = new StringConcatenation();
{
List<Attribute> _allAttributes = RoomHelpers.getAllAttributes(ac);
@@ -336,13 +351,13 @@ public class ConfigGenAddon {
_builder.newLineIfNotEmpty();
}
}
- CharSequence result = _builder;
+ String result = _builder.toString();
int _length = result.length();
boolean _notEquals = (_length != 0);
if (_notEquals) {
StringConcatenation _builder_1 = new StringConcatenation();
_builder_1.append("//--------------------- Attribute Specifications");
- String _plus = (result + _builder_1.toString());
+ String _plus = (result + _builder_1);
result = _plus;
}
return result;
@@ -368,7 +383,7 @@ public class ConfigGenAddon {
String _name = e.getName();
String _plus_1 = (_plus + _name);
List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _genMinMaxConstantsRec = this.genMinMaxConstantsRec(ac, _plus_1, _union);
+ Object _genMinMaxConstantsRec = this.genMinMaxConstantsRec(ac, _plus_1, _union);
_builder.append(_genMinMaxConstantsRec, "");
_builder.newLineIfNotEmpty();
}
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 75104c2..16ab620 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,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -22,6 +32,7 @@ import org.eclipse.etrice.generator.java.gen.Initialization;
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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -32,15 +43,19 @@ public class DataClassGen {
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions _javaExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java
index a7c9bea..e94abef 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java
@@ -1,3 +1,13 @@
+/**
+ * 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -19,21 +29,26 @@ 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.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@Singleton
@SuppressWarnings("all")
public class Initialization {
@Inject
+ @Extension
private TypeHelpers typeHelpers;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private JavaExtensions languageExt;
@Inject
+ @Extension
private ProcedureHelpers procedureHelpers;
public CharSequence attributeInitialization(final List<Attribute> attribs, final EObject roomClass, final boolean useClassDefaultsOnly) {
@@ -142,37 +157,44 @@ public class Initialization {
}
private CharSequence attributeInitPrimitiveRec(final List<Attribute> path, final EObject roomClass) {
- Attribute a = IterableExtensions.<Attribute>last(path);
- RefableType _refType = a.getRefType();
- DataType aType = _refType.getType();
- boolean _isDataClass = this.typeHelpers.isDataClass(aType);
- if (_isDataClass) {
- StringConcatenation _builder = new StringConcatenation();
- {
- List<Attribute> _allAttributes = RoomHelpers.getAllAttributes(((DataClass) aType));
- for(final Attribute e : _allAttributes) {
- List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
- CharSequence _attributeInitPrimitiveRec = this.attributeInitPrimitiveRec(_union, roomClass);
- _builder.append(_attributeInitPrimitiveRec, "");
- _builder.newLineIfNotEmpty();
+ CharSequence _xblockexpression = null;
+ {
+ Attribute a = IterableExtensions.<Attribute>last(path);
+ RefableType _refType = a.getRefType();
+ DataType aType = _refType.getType();
+ CharSequence _xifexpression = null;
+ boolean _isDataClass = this.typeHelpers.isDataClass(aType);
+ if (_isDataClass) {
+ StringConcatenation _builder = new StringConcatenation();
+ {
+ List<Attribute> _allAttributes = RoomHelpers.getAllAttributes(((DataClass) aType));
+ for(final Attribute e : _allAttributes) {
+ List<Attribute> _union = this._roomExtensions.<Attribute>union(path, e);
+ Object _attributeInitPrimitiveRec = this.attributeInitPrimitiveRec(_union, roomClass);
+ _builder.append(_attributeInitPrimitiveRec, "");
+ _builder.newLineIfNotEmpty();
+ }
}
- }
- return _builder;
- } else {
- boolean _isPrimitive = this.typeHelpers.isPrimitive(aType);
- if (_isPrimitive) {
- String value = this.getDataConfigValue(path, roomClass);
- CharSequence _xifexpression = null;
- boolean _notEquals = (!Objects.equal(value, null));
- if (_notEquals) {
- String _valueLiteral = this.languageExt.toValueLiteral(((PrimitiveType) aType), value);
- CharSequence _attributeInit = this.attributeInit(path, _valueLiteral);
- _xifexpression = _attributeInit;
+ return _builder.toString();
+ } else {
+ CharSequence _xifexpression_1 = null;
+ boolean _isPrimitive = this.typeHelpers.isPrimitive(aType);
+ if (_isPrimitive) {
+ String value = this.getDataConfigValue(path, roomClass);
+ CharSequence _xifexpression_2 = null;
+ boolean _notEquals = (!Objects.equal(value, null));
+ if (_notEquals) {
+ String _valueLiteral = this.languageExt.toValueLiteral(((PrimitiveType) aType), value);
+ CharSequence _attributeInit = this.attributeInit(path, _valueLiteral);
+ _xifexpression_2 = _attributeInit;
+ }
+ return _xifexpression_2;
}
- return _xifexpression;
+ _xifexpression = _xifexpression_1;
}
+ _xblockexpression = (_xifexpression);
}
- return null;
+ return _xblockexpression;
}
private CharSequence attributeInit(final Attribute a, final String value) {
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 a9ab127..834f949 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
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2010 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:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -29,7 +39,7 @@ public class JavaExtensions implements ILanguageExtension {
public String getTypedDataDefinition(final Message m) {
VarDecl _data = m.getData();
String[] _generateArglistAndTypedData = this.generateArglistAndTypedData(_data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(1);
+ String _get = _generateArglistAndTypedData[1];
return _get;
}
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 1ccdd94..8375307 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,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -32,6 +42,7 @@ import org.eclipse.etrice.generator.java.gen.Initialization;
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.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -42,21 +53,27 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions _javaExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
+ @Extension
private Initialization _initialization;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
+ @Extension
private DataClassGen _dataClassGen;
@Inject
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 437683c..8534648 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
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -30,6 +40,7 @@ import org.eclipse.etrice.generator.java.gen.JavaExtensions;
import org.eclipse.etrice.generator.java.gen.VariableServiceGen;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
+import org.eclipse.xtext.xbase.lib.Extension;
@Singleton
@SuppressWarnings("all")
@@ -38,9 +49,11 @@ public class SubSystemClassGen {
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions _javaExtensions;
@Inject
+ @Extension
private RoomExtensions _roomExtensions;
@Inject
@@ -50,6 +63,7 @@ public class SubSystemClassGen {
private ConfigGenAddon configGenAddon;
@Inject
+ @Extension
private ProcedureHelpers _procedureHelpers;
@Inject
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 9e07a94..4ab7927 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
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.inject.Inject;
@@ -11,14 +21,17 @@ 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.Extension;
@Singleton
@SuppressWarnings("all")
public class SubSystemRunnerGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private RoomExtensions roomExt;
public void doGenerate(final Root root) {
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
index c78648f..093acb9 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2012 Juergen Haug
+ * 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
+ */
package org.eclipse.etrice.generator.java.gen;
import com.google.common.base.Objects;
@@ -33,6 +43,7 @@ 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.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
import org.eclipse.xtext.xbase.lib.StringExtensions;
@@ -41,21 +52,26 @@ import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class VariableServiceGen {
@Inject
+ @Extension
private JavaIoFileSystemAccess fileAccess;
@Inject
+ @Extension
private JavaExtensions stdExt;
@Inject
+ @Extension
private RoomExtensions roomExt;
@Inject
private IDataConfiguration configExt;
@Inject
+ @Extension
private ProcedureHelpers helpers;
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
@@ -715,7 +731,7 @@ public class VariableServiceGen {
List<Attribute> _allAttributes = RoomHelpers.getAllAttributes(dataClass);
for(final Attribute at : _allAttributes) {
List<Attribute> _union = this.roomExt.<Attribute>union(path, at);
- CharSequence _genGetAttributeValues = this.genGetAttributeValues(_union, ai);
+ Object _genGetAttributeValues = this.genGetAttributeValues(_union, ai);
_builder_1.append(_genGetAttributeValues, "");
_builder_1.newLineIfNotEmpty();
}
@@ -865,7 +881,7 @@ public class VariableServiceGen {
List<Attribute> _allAttributes = RoomHelpers.getAllAttributes(dataClass);
for(final Attribute at : _allAttributes) {
List<Attribute> _union = this.roomExt.<Attribute>union(path, at);
- CharSequence _genSetAttributeValues1 = this.genSetAttributeValues1(_union, ai);
+ Object _genSetAttributeValues1 = this.genSetAttributeValues1(_union, ai);
_builder_1.append(_genSetAttributeValues1, "");
_builder_1.newLineIfNotEmpty();
}
@@ -953,7 +969,7 @@ public class VariableServiceGen {
List<Attribute> _allAttributes = RoomHelpers.getAllAttributes(dataClass);
for(final Attribute at : _allAttributes) {
List<Attribute> _union = this.roomExt.<Attribute>union(path, at);
- CharSequence _genSetAttributeValues2 = this.genSetAttributeValues2(_union, ai);
+ Object _genSetAttributeValues2 = this.genSetAttributeValues2(_union, ai);
_builder.append(_genSetAttributeValues2, "");
_builder.newLineIfNotEmpty();
}
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 7f3ca89..0f4bfab 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
@@ -1,3 +1,13 @@
+/**
+ * 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.inject.Inject;
@@ -15,6 +25,7 @@ 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.Extension;
/**
* Target language independent part of an actor class generator.
@@ -23,6 +34,7 @@ import org.eclipse.xtext.util.Tuples;
@SuppressWarnings("all")
public class GenericActorClassGenerator {
@Inject
+ @Extension
protected RoomExtensions _roomExtensions;
@Inject
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 1e4ebc7..1bf1c50 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
@@ -1,3 +1,13 @@
+/**
+ * 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.inject.Inject;
@@ -16,6 +26,7 @@ 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.Extension;
/**
* Target language independent protocol class generator.
@@ -23,9 +34,11 @@ import org.eclipse.xtext.util.Tuples;
@SuppressWarnings("all")
public class GenericProtocolClassGenerator {
@Inject
+ @Extension
protected ILanguageExtension _iLanguageExtension;
@Inject
+ @Extension
protected RoomExtensions _roomExtensions;
/**
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 7e9d4e9..e23f629 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,3 +1,13 @@
+/**
+ * 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.common.base.Objects;
@@ -38,6 +48,7 @@ import org.eclipse.etrice.generator.generic.TransitionChainGenerator;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
@@ -47,6 +58,7 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
@SuppressWarnings("all")
public class GenericStateMachineGenerator {
@Inject
+ @Extension
protected RoomExtensions _roomExtensions;
@Inject
@@ -1563,7 +1575,7 @@ public class GenericStateMachineGenerator {
if ((_eContainer_1 instanceof State)) {
EObject _eContainer_2 = state.eContainer();
EObject _eContainer_3 = _eContainer_2.eContainer();
- CharSequence _genDoCodes = this.genDoCodes(((State) _eContainer_3));
+ Object _genDoCodes = this.genDoCodes(((State) _eContainer_3));
_builder.append(_genDoCodes, "");
_builder.newLineIfNotEmpty();
}
@@ -2103,7 +2115,7 @@ public class GenericStateMachineGenerator {
boolean _not = (!_isEmpty_1);
_xblockexpression = (_not);
}
- return Boolean.valueOf(_xblockexpression);
+ return _xblockexpression;
}
protected CharSequence guard(final Transition tt, final String trigger, final ExpandedActorClass ac) {
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 4090354..05332b3 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,3 +1,14 @@
+/**
+ * Copyright (c) 2011 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:
+ * Henrik Rentz-Reichert (initial contribution)
+ * Thomas Schuetz (refactoring, adapted for other target languages)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.common.base.Objects;
@@ -23,6 +34,7 @@ import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.generic.TypeHelpers;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.StringExtensions;
/**
@@ -33,6 +45,7 @@ import org.eclipse.xtext.xbase.lib.StringExtensions;
@SuppressWarnings("all")
public class ProcedureHelpers {
@Inject
+ @Extension
private TypeHelpers _typeHelpers;
@Inject
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 2e1583f..52bc629 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,3 +1,13 @@
+/**
+ * Copyright (c) 2011 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:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.common.base.Objects;
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 713de8e..f1f578a 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
@@ -1,3 +1,13 @@
+/**
+ * Copyright (c) 2010 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:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ */
package org.eclipse.etrice.generator.generic;
import com.google.common.base.Objects;
@@ -22,7 +32,6 @@ import org.eclipse.etrice.core.room.VarDecl;
import org.eclipse.etrice.core.room.util.RoomHelpers;
import org.eclipse.etrice.generator.base.IDataConfiguration;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
-import org.eclipse.xtext.xbase.lib.Conversions;
@Singleton
@SuppressWarnings("all")
@@ -103,19 +112,19 @@ public class TypeHelpers {
public String getArgumentList(final VarDecl data) {
String[] _generateArglistAndTypedData = this.languageExt.generateArglistAndTypedData(data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(0);
+ String _get = _generateArglistAndTypedData[0];
return _get;
}
public String getTypedDataDefinition(final VarDecl data) {
String[] _generateArglistAndTypedData = this.languageExt.generateArglistAndTypedData(data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(1);
+ String _get = _generateArglistAndTypedData[1];
return _get;
}
public String generateTypedArgumentList(final VarDecl data) {
String[] _generateArglistAndTypedData = this.languageExt.generateArglistAndTypedData(data);
- String _get = ((List<String>)Conversions.doWrapArray(_generateArglistAndTypedData)).get(2);
+ String _get = _generateArglistAndTypedData[2];
return _get;
}