Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator')
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java36
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java27
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java14
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java7
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java13
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java10
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java15
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java12
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java4
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemRunnerGen.java4
10 files changed, 116 insertions, 26 deletions
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 65bf46776..107dd6d9f 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
@@ -33,6 +33,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;
@@ -44,18 +45,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
@@ -273,8 +279,8 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.append("\t\t\t");
List<Port> _endPorts = this._roomExtensions.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, "");
@@ -282,10 +288,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();
@@ -294,8 +300,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, "");
@@ -303,10 +309,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();
@@ -315,8 +321,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, "");
@@ -325,10 +331,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();
@@ -485,7 +491,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();
@@ -600,7 +606,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) {
@@ -673,7 +679,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 25db9c587..c4a6950d7 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,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.cpp.gen;
import com.google.common.base.Objects;
@@ -25,24 +35,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 +167,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 +235,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 +429,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 +442,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 +475,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 fff0cfc07..a8be5d723 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,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.cpp.gen;
import com.google.common.base.Objects;
@@ -23,6 +33,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 +42,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 8aff81f59..6c82739a6 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
@@ -25,6 +25,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;
@@ -32,21 +33,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 25fb48169..7ac7edeed 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,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.cpp.gen;
import com.google.common.base.Objects;
@@ -15,6 +25,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.xbase.lib.Conversions;
+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;
@@ -23,9 +34,11 @@ import org.eclipse.xtext.xbase.lib.ListExtensions;
@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/MainGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java
index f2df9e05c..4f21f4e4f 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.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.cpp.gen;
import com.google.inject.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 f08d2faa3..575969e26 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
@@ -36,27 +36,34 @@ 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;
@Singleton
@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
@@ -565,7 +572,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("{");
@@ -599,7 +606,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("{");
@@ -855,7 +862,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();
@@ -875,7 +882,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 d0ea74df4..9f0eef69c 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,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.cpp.gen;
import com.google.inject.Inject;
@@ -16,11 +26,13 @@ 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;
@Singleton
@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 368d980b1..c6bcbee84 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
@@ -21,6 +21,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")
@@ -29,12 +30,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 b84ba20fd..fbed8a340 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
@@ -10,17 +10,21 @@ 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;
@Singleton
@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) {

Back to the top