Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2016-10-06 05:13:15 -0400
committerJan Belle2016-10-06 05:13:15 -0400
commit45fd4bd2fc91fbc427135303ed8cdb16b319ad97 (patch)
tree3f2488ce3fd0e54defcec01b919e6c8aa5eb6ee5 /plugins/org.eclipse.etrice.generator.config/xtend-gen/org
parente7a667dc6e613fba71c22be5ffaa60fb2ddbb571 (diff)
downloadorg.eclipse.etrice-45fd4bd2fc91fbc427135303ed8cdb16b319ad97.tar.gz
org.eclipse.etrice-45fd4bd2fc91fbc427135303ed8cdb16b319ad97.tar.xz
org.eclipse.etrice-45fd4bd2fc91fbc427135303ed8cdb16b319ad97.zip
[runtime.cpp] Refactored cpp runtime
- Refactored initialization process - Fixed RTObject double deleting children - Sub actors are now static members - Added ReplicatedActorClassBase for replicated Actors [generator.cpp] Modified ActorClassGen and NodeGen to fit the runtime changes Change-Id: I4fc5835c24330a27d00eafbf71dc412a987ec219
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.config/xtend-gen/org')
-rw-r--r--plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java26
1 files changed, 13 insertions, 13 deletions
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 4c69d5bed..b3edd0f69 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
@@ -15,6 +15,7 @@ import com.google.inject.Inject;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.function.Consumer;
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -47,7 +48,6 @@ import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.scoping.impl.ImportUriResolver;
import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
@SuppressWarnings("all")
public class DataConfiguration implements IDataConfiguration {
@@ -295,8 +295,8 @@ public class DataConfiguration implements IDataConfiguration {
String _path = ai.getPath();
List<AttrInstanceConfig> configs = this._dataConfigurationHelper.dynActorInstanceAttrMap.get(_path);
if (configs!=null) {
- final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
- public void apply(final AttrInstanceConfig c) {
+ final Consumer<AttrInstanceConfig> _function = new Consumer<AttrInstanceConfig>() {
+ public void accept(final AttrInstanceConfig c) {
boolean _isReadOnly = c.isReadOnly();
if (_isReadOnly) {
Attribute _attribute = c.getAttribute();
@@ -304,7 +304,7 @@ public class DataConfiguration implements IDataConfiguration {
}
}
};
- IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
+ configs.forEach(_function);
}
return result;
}
@@ -314,8 +314,8 @@ public class DataConfiguration implements IDataConfiguration {
String _path = ai.getPath();
List<AttrInstanceConfig> configs = this._dataConfigurationHelper.dynActorInstanceAttrMap.get(_path);
if (configs!=null) {
- final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
- public void apply(final AttrInstanceConfig c) {
+ final Consumer<AttrInstanceConfig> _function = new Consumer<AttrInstanceConfig>() {
+ public void accept(final AttrInstanceConfig c) {
boolean _isReadOnly = c.isReadOnly();
boolean _not = (!_isReadOnly);
if (_not) {
@@ -324,7 +324,7 @@ public class DataConfiguration implements IDataConfiguration {
}
}
};
- IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
+ configs.forEach(_function);
}
return result;
}
@@ -419,8 +419,8 @@ public class DataConfiguration implements IDataConfiguration {
final HashSet<Attribute> result = new HashSet<Attribute>();
final List<AttrInstanceConfig> configs = this._dataConfigurationHelper.dynActorClassAttrMap.get(actor);
if (configs!=null) {
- final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
- public void apply(final AttrInstanceConfig c) {
+ final Consumer<AttrInstanceConfig> _function = new Consumer<AttrInstanceConfig>() {
+ public void accept(final AttrInstanceConfig c) {
boolean _isReadOnly = c.isReadOnly();
if (_isReadOnly) {
Attribute _attribute = c.getAttribute();
@@ -428,7 +428,7 @@ public class DataConfiguration implements IDataConfiguration {
}
}
};
- IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
+ configs.forEach(_function);
}
return IterableExtensions.<Attribute>toList(result);
}
@@ -437,8 +437,8 @@ public class DataConfiguration implements IDataConfiguration {
final HashSet<Attribute> result = new HashSet<Attribute>();
final List<AttrInstanceConfig> configs = this._dataConfigurationHelper.dynActorClassAttrMap.get(actor);
if (configs!=null) {
- final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
- public void apply(final AttrInstanceConfig c) {
+ final Consumer<AttrInstanceConfig> _function = new Consumer<AttrInstanceConfig>() {
+ public void accept(final AttrInstanceConfig c) {
boolean _isReadOnly = c.isReadOnly();
boolean _not = (!_isReadOnly);
if (_not) {
@@ -447,7 +447,7 @@ public class DataConfiguration implements IDataConfiguration {
}
}
};
- IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
+ configs.forEach(_function);
}
return IterableExtensions.<Attribute>toList(result);
}

Back to the top