diff options
213 files changed, 1179 insertions, 2327 deletions
diff --git a/examples/my.etrice.generator.launch/.classpath b/examples/my.etrice.generator.launch/.classpath index ad32c83a7..1fa3e6803 100644 --- a/examples/my.etrice.generator.launch/.classpath +++ b/examples/my.etrice.generator.launch/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/examples/my.etrice.generator.launch/.settings/org.eclipse.jdt.core.prefs b/examples/my.etrice.generator.launch/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/examples/my.etrice.generator.launch/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF index 82a414742..83982e3e8 100644 --- a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF +++ b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Derived Generator Launcher Bundle-SymbolicName: my.etrice.generator.launch;singleton:=true Bundle-Version: 1.1.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: my.etrice.generator;bundle-version="1.1.1", org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.etrice.generator.launch;bundle-version="1.1.1", diff --git a/examples/my.etrice.generator/.classpath b/examples/my.etrice.generator/.classpath index ad32c83a7..1fa3e6803 100644 --- a/examples/my.etrice.generator/.classpath +++ b/examples/my.etrice.generator/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/examples/my.etrice.generator/.settings/org.eclipse.jdt.core.prefs b/examples/my.etrice.generator/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/examples/my.etrice.generator/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/examples/my.etrice.generator/META-INF/MANIFEST.MF b/examples/my.etrice.generator/META-INF/MANIFEST.MF index 2f43b6a68..111888072 100644 --- a/examples/my.etrice.generator/META-INF/MANIFEST.MF +++ b/examples/my.etrice.generator/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Derived Generator Bundle-SymbolicName: my.etrice.generator Bundle-Version: 1.1.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.etrice.core.room;bundle-version="1.1.1", org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", diff --git a/orga/spec/example models/WikiDiagrams/.classpath b/orga/spec/example models/WikiDiagrams/.classpath index c3f482b27..d15fa6ffd 100644 --- a/orga/spec/example models/WikiDiagrams/.classpath +++ b/orga/spec/example models/WikiDiagrams/.classpath @@ -3,6 +3,6 @@ <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="/org.eclipse.etrice.runtime.java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/.classpath b/plugins/org.eclipse.etrice.abstractexec.behavior/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.abstractexec.behavior/.classpath +++ b/plugins/org.eclipse.etrice.abstractexec.behavior/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.abstractexec.behavior/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60c096c32..000000000 --- a/plugins/org.eclipse.etrice.abstractexec.behavior/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Wed May 23 19:11:47 CEST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF index 65c84c7f3..8aa8e947f 100644 --- a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Abstract Execution for State Machines Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior;singleton:=true Bundle-Version: 1.1.1.qualifier Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", diff --git a/plugins/org.eclipse.etrice.core.common.ui/.classpath b/plugins/org.eclipse.etrice.core.common.ui/.classpath index 9389ddb61..751bfd4fe 100644 --- a/plugins/org.eclipse.etrice.core.common.ui/.classpath +++ b/plugins/org.eclipse.etrice.core.common.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/org.eclipse.etrice.core.common.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.core.common.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.core.common.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF index 50ffb5bc8..81258d720 100644 --- a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport, org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.common.ui.contentassist, org.eclipse.etrice.core.common.ui.contentassist.antlr, org.eclipse.etrice.core.common.ui.editor, diff --git a/plugins/org.eclipse.etrice.core.common/.classpath b/plugins/org.eclipse.etrice.core.common/.classpath index 9389ddb61..b2fd74cdb 100644 --- a/plugins/org.eclipse.etrice.core.common/.classpath +++ b/plugins/org.eclipse.etrice.core.common/.classpath @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="xtend-gen"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.core.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.core.common/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.core.common/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF index 7189642ba..17f6c1649 100644 --- a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.common, org.eclipse.etrice.core.common.base, org.eclipse.etrice.core.common.base.impl, diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java index 0ad1c7187..6281fdc5d 100644 --- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java +++ b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java @@ -44,24 +44,18 @@ public class PostprocessingHelpers { public static EAttribute getAttribute(final EClass cls, final String name) { EList<EAttribute> _eAllAttributes = cls.getEAllAttributes(); - final Function1<EAttribute, Boolean> _function = new Function1<EAttribute, Boolean>() { - @Override - public Boolean apply(final EAttribute a) { - String _name = a.getName(); - return Boolean.valueOf(_name.equals(name)); - } + final Function1<EAttribute, Boolean> _function = (EAttribute a) -> { + String _name = a.getName(); + return Boolean.valueOf(_name.equals(name)); }; return IterableExtensions.<EAttribute>findFirst(_eAllAttributes, _function); } public static EReference getReference(final EClass cls, final String name) { EList<EReference> _eAllReferences = cls.getEAllReferences(); - final Function1<EReference, Boolean> _function = new Function1<EReference, Boolean>() { - @Override - public Boolean apply(final EReference a) { - String _name = a.getName(); - return Boolean.valueOf(_name.equals(name)); - } + final Function1<EReference, Boolean> _function = (EReference a) -> { + String _name = a.getName(); + return Boolean.valueOf(_name.equals(name)); }; return IterableExtensions.<EReference>findFirst(_eAllReferences, _function); } diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java index 94484ece7..7510e4031 100644 --- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java +++ b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java @@ -15,6 +15,7 @@ import com.google.common.base.Objects; import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.function.Consumer; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource; @@ -22,7 +23,6 @@ import org.eclipse.xtend.lib.Property; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Functions.Function1; import org.eclipse.xtext.xbase.lib.IterableExtensions; -import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; import org.eclipse.xtext.xbase.lib.Pure; /** @@ -76,15 +76,12 @@ public class ValidationHelpers { public static class NamedObjectList extends ArrayList<ValidationHelpers.NamedObject> { public void addAll(final List<? extends EObject> items, final EStructuralFeature feature) { - final Procedure1<EObject> _function = new Procedure1<EObject>() { - @Override - public void apply(final EObject it) { - Object _eGet = it.eGet(feature); - ValidationHelpers.NamedObject _namedObject = new ValidationHelpers.NamedObject(((String) _eGet), it, feature); - NamedObjectList.this.add(_namedObject); - } + final Consumer<EObject> _function = (EObject it) -> { + Object _eGet = it.eGet(feature); + ValidationHelpers.NamedObject _namedObject = new ValidationHelpers.NamedObject(((String) _eGet), it, feature); + this.add(_namedObject); }; - IterableExtensions.forEach(items, _function); + items.forEach(_function); } } @@ -104,12 +101,9 @@ public class ValidationHelpers { allOfName.add(_name_2); } } - final Function1<ValidationHelpers.NamedObject, Boolean> _function = new Function1<ValidationHelpers.NamedObject, Boolean>() { - @Override - public Boolean apply(final ValidationHelpers.NamedObject i) { - String _name = i.getName(); - return Boolean.valueOf(duplicateNames.contains(_name)); - } + final Function1<ValidationHelpers.NamedObject, Boolean> _function = (ValidationHelpers.NamedObject i_1) -> { + String _name_3 = i_1.getName(); + return Boolean.valueOf(duplicateNames.contains(_name_3)); }; _xblockexpression = IterableExtensions.<ValidationHelpers.NamedObject>filter(items, _function); } @@ -117,13 +111,10 @@ public class ValidationHelpers { } public static Iterable<ValidationHelpers.NamedObject> inSameResource(final Iterable<ValidationHelpers.NamedObject> items, final Resource resource) { - final Function1<ValidationHelpers.NamedObject, Boolean> _function = new Function1<ValidationHelpers.NamedObject, Boolean>() { - @Override - public Boolean apply(final ValidationHelpers.NamedObject i) { - EObject _obj = i.getObj(); - Resource _eResource = _obj.eResource(); - return Boolean.valueOf(Objects.equal(_eResource, resource)); - } + final Function1<ValidationHelpers.NamedObject, Boolean> _function = (ValidationHelpers.NamedObject i) -> { + EObject _obj = i.getObj(); + Resource _eResource = _obj.eResource(); + return Boolean.valueOf(Objects.equal(_eResource, resource)); }; return IterableExtensions.<ValidationHelpers.NamedObject>filter(items, _function); } diff --git a/plugins/org.eclipse.etrice.core.config.ui/.classpath b/plugins/org.eclipse.etrice.core.config.ui/.classpath index 6c8f56046..7785d7be7 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/.classpath +++ b/plugins/org.eclipse.etrice.core.config.ui/.classpath @@ -7,6 +7,6 @@ <accessrule kind="accessible" pattern="org/eclipse/xtext/ui/codetemplates/ui/partialEditing/IPartialContentAssistParser"/> </accessrules> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.core.config.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.core.config.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.core.config.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 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 19a607d30..5c24dfe06 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 @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", Import-Package: org.apache.commons.logging, org.apache.log4j, org.eclipse.etrice.core.genmodel.etricegen -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.ui.contentassist.antlr, org.eclipse.etrice.core.ui.internal, org.eclipse.etrice.core.ui.contentassist, diff --git a/plugins/org.eclipse.etrice.core.config/.classpath b/plugins/org.eclipse.etrice.core.config/.classpath index ff7256004..b8f18c26b 100644 --- a/plugins/org.eclipse.etrice.core.config/.classpath +++ b/plugins/org.eclipse.etrice.core.config/.classpath @@ -4,6 +4,6 @@ <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="xtend-gen"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.core.config/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.core.config/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.core.config/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF index 843a84641..2fca5a3fa 100644 --- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Import-Package: org.apache.commons.logging, org.apache.log4j, org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core, org.eclipse.etrice.core.services, org.eclipse.etrice.core.config, diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/.classpath b/plugins/org.eclipse.etrice.core.etmap.ui/.classpath index f2fedd487..580660c57 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/.classpath +++ b/plugins/org.eclipse.etrice.core.etmap.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/xtext/ui/codetemplates/ui/partialEditing/IPartialContentAssistParser"/> 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 30f091a23..395257912 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 @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", org.eclipse.etrice.core.room;bundle-version="1.1.1" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etmap.ui.contentassist, org.eclipse.etrice.core.etmap.ui.contentassist.antlr, org.eclipse.etrice.core.etmap.ui.internal, diff --git a/plugins/org.eclipse.etrice.core.etmap/.classpath b/plugins/org.eclipse.etrice.core.etmap/.classpath index 9389ddb61..751bfd4fe 100644 --- a/plugins/org.eclipse.etrice.core.etmap/.classpath +++ b/plugins/org.eclipse.etrice.core.etmap/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF index 02823cfa9..2408c1d51 100644 --- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etmap, org.eclipse.etrice.core.etmap.eTMap, org.eclipse.etrice.core.etmap.eTMap.impl, diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/.classpath b/plugins/org.eclipse.etrice.core.etphys.ui/.classpath index f2fedd487..580660c57 100644 --- a/plugins/org.eclipse.etrice.core.etphys.ui/.classpath +++ b/plugins/org.eclipse.etrice.core.etphys.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/xtext/ui/codetemplates/ui/partialEditing/IPartialContentAssistParser"/> 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 fdc94c1c9..a4ff647f8 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 @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.eclipse.compare, org.eclipse.etrice.core.common.ui;bundle-version="1.1.1" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist, org.eclipse.etrice.core.etphys.ui.contentassist.antlr, org.eclipse.etrice.core.etphys.ui.internal, diff --git a/plugins/org.eclipse.etrice.core.etphys/.classpath b/plugins/org.eclipse.etrice.core.etphys/.classpath index 9389ddb61..751bfd4fe 100644 --- a/plugins/org.eclipse.etrice.core.etphys/.classpath +++ b/plugins/org.eclipse.etrice.core.etphys/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF index e1e7c7c7f..8878d9eab 100644 --- a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etphys, org.eclipse.etrice.core.etphys.converters, org.eclipse.etrice.core.etphys.eTPhys, diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/.classpath b/plugins/org.eclipse.etrice.core.fsm.ui/.classpath index 6ea81b1e6..fc5b6d483 100644 --- a/plugins/org.eclipse.etrice.core.fsm.ui/.classpath +++ b/plugins/org.eclipse.etrice.core.fsm.ui/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.core.fsm.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.core.fsm.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF index d001afbea..e1bed5d5c 100644 --- a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.fsm.ui, org.eclipse.etrice.core.fsm.ui.contentassist, org.eclipse.etrice.core.fsm.ui.contentassist.antlr, diff --git a/plugins/org.eclipse.etrice.core.fsm/.classpath b/plugins/org.eclipse.etrice.core.fsm/.classpath index 6ea81b1e6..fc5b6d483 100644 --- a/plugins/org.eclipse.etrice.core.fsm/.classpath +++ b/plugins/org.eclipse.etrice.core.fsm/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.core.fsm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.core.fsm/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.core.fsm/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF index 55ef53ded..827d2377e 100644 --- a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.fsm, org.eclipse.etrice.core.fsm.fSM, org.eclipse.etrice.core.fsm.fSM.impl, diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java index aff4dbc9e..543e0a6b7 100644 --- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java +++ b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java @@ -100,21 +100,15 @@ public class FSMValidationUtilXtend { final HashMap<String, TriggeredTransition> trig2trans = CollectionLiterals.<String, TriggeredTransition>newHashMap(); final ArrayList<FSMValidationUtilXtend.Result> result = CollectionLiterals.<FSMValidationUtilXtend.Result>newArrayList(); EList<Transition> _transitions = parent.getTransitions(); - final Function1<Transition, Boolean> _function = new Function1<Transition, Boolean>() { - @Override - public Boolean apply(final Transition t) { - return Boolean.valueOf((((t instanceof TriggeredTransition) && (((TriggeredTransition) t).getFrom() instanceof StateTerminal)) && Objects.equal(myState, ((StateTerminal) ((TriggeredTransition) t).getFrom()).getState()))); - } + final Function1<Transition, Boolean> _function = (Transition t) -> { + return Boolean.valueOf((((t instanceof TriggeredTransition) && (((TriggeredTransition) t).getFrom() instanceof StateTerminal)) && Objects.equal(myState, ((StateTerminal) ((TriggeredTransition) t).getFrom()).getState()))); }; Iterable<Transition> _filter = IterableExtensions.<Transition>filter(_transitions, _function); for (final Transition t : _filter) { EList<Trigger> _triggers = ((TriggeredTransition) t).getTriggers(); - final Function1<Trigger, Boolean> _function_1 = new Function1<Trigger, Boolean>() { - @Override - public Boolean apply(final Trigger k) { - Guard _guard = k.getGuard(); - return Boolean.valueOf(Objects.equal(_guard, null)); - } + final Function1<Trigger, Boolean> _function_1 = (Trigger k) -> { + Guard _guard = k.getGuard(); + return Boolean.valueOf(Objects.equal(_guard, null)); }; Iterable<Trigger> _filter_1 = IterableExtensions.<Trigger>filter(_triggers, _function_1); for (final Trigger k : _filter_1) { diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/.classpath b/plugins/org.eclipse.etrice.core.genmodel.fsm/.classpath index 121e527a9..751c8f2e5 100644 --- a/plugins/org.eclipse.etrice.core.genmodel.fsm/.classpath +++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF index 643502d9d..d1390cfed 100644 --- a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.1.1.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport, org.eclipse.etrice.core.fsm;bundle-version="1.1.1";visibility:=reexport, org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.etrice.core.genmodel/.classpath b/plugins/org.eclipse.etrice.core.genmodel/.classpath index 07a5d58a2..de3cea875 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/.classpath +++ b/plugins/org.eclipse.etrice.core.genmodel/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="model"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.core.genmodel/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.core.genmodel/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 1c4184b1c..000000000 --- a/plugins/org.eclipse.etrice.core.genmodel/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Tue May 22 07:58:45 CEST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF index c6fec3bca..02335205b 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.1.1.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse eTrice Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.genmodel, org.eclipse.etrice.core.genmodel.builder, org.eclipse.etrice.core.genmodel.etricegen, diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF index 9d5f484c0..bb493f7fe 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1", org.eclipse.core.filesystem;bundle-version="1.3.0", org.eclipse.help Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.ui, org.eclipse.etrice.core.ui.contentassist, org.eclipse.etrice.core.ui.contentassist.antlr, diff --git a/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/quickfix/DetailCodeIndentHelper.java b/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/quickfix/DetailCodeIndentHelper.java index ecbec4f46..8d0443612 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/quickfix/DetailCodeIndentHelper.java +++ b/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/quickfix/DetailCodeIndentHelper.java @@ -43,55 +43,49 @@ public class DetailCodeIndentHelper { return editorString; } Iterable<String> _tail = IterableExtensions.<String>tail(editorLines); - final Function1<String, Integer> _function = new Function1<String, Integer>() { - @Override - public Integer apply(final String it) { - return Integer.valueOf(DetailCodeIndentHelper.countIndent(it)); - } + final Function1<String, Integer> _function = (String it) -> { + return Integer.valueOf(DetailCodeIndentHelper.countIndent(it)); }; List<String> _sortBy = IterableExtensions.<String, Integer>sortBy(_tail, _function); String _head = IterableExtensions.<String>head(_sortBy); final int minIndent = DetailCodeIndentHelper.countIndent(_head); final ArrayList<String> newEditorLines = new ArrayList<String>(); - final Procedure2<String, Integer> _function_1 = new Procedure2<String, Integer>() { - @Override - public void apply(final String line, final Integer lineCount) { - String _xifexpression = null; - if (((lineCount).intValue() != 0)) { - _xifexpression = (editorIndent + mark); - } - String front = _xifexpression; - int _countIndent = DetailCodeIndentHelper.countIndent(line); - int indentCount = (_countIndent - minIndent); - String _xifexpression_1 = null; - if ((((lineCount).intValue() != 0) && (indentCount > 0))) { - StringConcatenation _builder = new StringConcatenation(); - { - IntegerRange _upTo = new IntegerRange(1, indentCount); - for(final Integer i : _upTo) { - _builder.append("\t"); - } + final Procedure2<String, Integer> _function_1 = (String line, Integer lineCount) -> { + String _xifexpression = null; + if (((lineCount).intValue() != 0)) { + _xifexpression = (editorIndent + mark); + } + String front = _xifexpression; + int _countIndent = DetailCodeIndentHelper.countIndent(line); + int indentCount = (_countIndent - minIndent); + String _xifexpression_1 = null; + if ((((lineCount).intValue() != 0) && (indentCount > 0))) { + StringConcatenation _builder = new StringConcatenation(); + { + IntegerRange _upTo = new IntegerRange(1, indentCount); + for(final Integer i : _upTo) { + _builder.append("\t"); } - _xifexpression_1 = _builder.toString(); } - String indent = _xifexpression_1; - String noneWSLine = Strings.removeLeadingWhitespace(line); - String _xifexpression_2 = null; - int _size = editorLines.size(); - int _minus = (_size - 1); - boolean _notEquals = ((lineCount).intValue() != _minus); - if (_notEquals) { - _xifexpression_2 = mark; - } - String end = _xifexpression_2; - StringConcatenation _builder_1 = new StringConcatenation(); - _builder_1.append(front, ""); - _builder_1.append(indent, ""); - _builder_1.append(noneWSLine, ""); - _builder_1.append(end, ""); - String newEditorLine = _builder_1.toString(); - newEditorLines.add(newEditorLine); + _xifexpression_1 = _builder.toString(); + } + String indent = _xifexpression_1; + String noneWSLine = Strings.removeLeadingWhitespace(line); + String _xifexpression_2 = null; + int _size_1 = editorLines.size(); + int _minus = (_size_1 - 1); + boolean _notEquals = ((lineCount).intValue() != _minus); + if (_notEquals) { + _xifexpression_2 = mark; } + String end = _xifexpression_2; + StringConcatenation _builder_1 = new StringConcatenation(); + _builder_1.append(front, ""); + _builder_1.append(indent, ""); + _builder_1.append(noneWSLine, ""); + _builder_1.append(end, ""); + String newEditorLine = _builder_1.toString(); + newEditorLines.add(newEditorLine); }; IterableExtensions.<String>forEach(editorLines, _function_1); String _newLine_1 = Strings.newLine(); diff --git a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF index 8f403b04c..d5c06ad3f 100644 --- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", org.eclipse.core.runtime;bundle-version="3.7.0" Import-Package: org.apache.log4j, org.eclipse.etrice.core.room -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core, org.eclipse.etrice.core.formatting, org.eclipse.etrice.core.naming, diff --git a/plugins/org.eclipse.etrice.doc/.classpath b/plugins/org.eclipse.etrice.doc/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.doc/.classpath +++ b/plugins/org.eclipse.etrice.doc/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.doc/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.doc/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF index 3429b3f25..88b888c4c 100644 --- a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.help -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.eclipse.etrice.doc.ETriceHelp Export-Package: org.eclipse.etrice.doc Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.etrice.etunit.converter/.classpath b/plugins/org.eclipse.etrice.etunit.converter/.classpath index 121e527a9..751c8f2e5 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/.classpath +++ b/plugins/org.eclipse.etrice.etunit.converter/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.etunit.converter/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.etunit.converter/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 28fb95b2f..000000000 --- a/plugins/org.eclipse.etrice.etunit.converter/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Mon Apr 16 21:05:31 CEST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF index 19a7bf74a..f3e835463 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.1.1.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse eTrice Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.etunit.converter, org.eclipse.etrice.etunit.converter.Etunit, org.eclipse.etrice.etunit.converter.Etunit.impl, diff --git a/plugins/org.eclipse.etrice.generator.c/.classpath b/plugins/org.eclipse.etrice.generator.c/.classpath index c31ca403f..13a6c6528 100644 --- a/plugins/org.eclipse.etrice.generator.c/.classpath +++ b/plugins/org.eclipse.etrice.generator.c/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="xtend-gen"/> diff --git a/plugins/org.eclipse.etrice.generator.c/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.c/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 956262663..000000000 --- a/plugins/org.eclipse.etrice.generator.c/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Dec 06 13:36:04 CET 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF index 3f3c61c07..e6340905d 100644 --- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.c, org.eclipse.etrice.generator.c.gen, org.eclipse.etrice.generator.c.setup 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 cc4e095e3..3393eeb23 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 @@ -130,29 +130,20 @@ public class ActorClassGen extends GenericActorClassGenerator { { final ActorClass ac = xpac.getActorClass(); List<Port> _allEndPorts = this._roomHelpers.getAllEndPorts(ac); - final Function1<Port, Boolean> _function = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port p) { - GeneralProtocolClass _protocol = p.getProtocol(); - CommunicationType _commType = ((ProtocolClass) _protocol).getCommType(); - return Boolean.valueOf(Objects.equal(_commType, CommunicationType.EVENT_DRIVEN)); - } + final Function1<Port, Boolean> _function = (Port p) -> { + GeneralProtocolClass _protocol = p.getProtocol(); + CommunicationType _commType = ((ProtocolClass) _protocol).getCommType(); + return Boolean.valueOf(Objects.equal(_commType, CommunicationType.EVENT_DRIVEN)); }; final Iterable<Port> eventPorts = IterableExtensions.<Port>filter(_allEndPorts, _function); List<Port> _allEndPorts_1 = this._roomHelpers.getAllEndPorts(ac); - final Function1<Port, Boolean> _function_1 = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port p) { - return Boolean.valueOf((Objects.equal(((ProtocolClass) p.getProtocol()).getCommType(), CommunicationType.DATA_DRIVEN) && p.isConjugated())); - } + final Function1<Port, Boolean> _function_1 = (Port p) -> { + return Boolean.valueOf((Objects.equal(((ProtocolClass) p.getProtocol()).getCommType(), CommunicationType.DATA_DRIVEN) && p.isConjugated())); }; final Iterable<Port> sendPorts = IterableExtensions.<Port>filter(_allEndPorts_1, _function_1); List<Port> _allEndPorts_2 = this._roomHelpers.getAllEndPorts(ac); - final Function1<Port, Boolean> _function_2 = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port p) { - return Boolean.valueOf((Objects.equal(((ProtocolClass) p.getProtocol()).getCommType(), CommunicationType.DATA_DRIVEN) && (!p.isConjugated()))); - } + final Function1<Port, Boolean> _function_2 = (Port p) -> { + return Boolean.valueOf((Objects.equal(((ProtocolClass) p.getProtocol()).getCommType(), CommunicationType.DATA_DRIVEN) && (!p.isConjugated()))); }; final Iterable<Port> recvPorts = IterableExtensions.<Port>filter(_allEndPorts_2, _function_2); ComponentCommunicationType _commType = ac.getCommType(); @@ -518,45 +509,30 @@ public class ActorClassGen extends GenericActorClassGenerator { { final ActorClass ac = xpac.getActorClass(); List<Port> _allEndPorts = this._roomHelpers.getAllEndPorts(ac); - final Function1<Port, Boolean> _function = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port p) { - GeneralProtocolClass _protocol = p.getProtocol(); - CommunicationType _commType = ((ProtocolClass) _protocol).getCommType(); - return Boolean.valueOf(Objects.equal(_commType, CommunicationType.EVENT_DRIVEN)); - } + final Function1<Port, Boolean> _function = (Port p) -> { + GeneralProtocolClass _protocol = p.getProtocol(); + CommunicationType _commType = ((ProtocolClass) _protocol).getCommType(); + return Boolean.valueOf(Objects.equal(_commType, CommunicationType.EVENT_DRIVEN)); }; final Iterable<Port> eventPorts = IterableExtensions.<Port>filter(_allEndPorts, _function); - final Function1<Port, Boolean> _function_1 = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port it) { - int _multiplicity = it.getMultiplicity(); - return Boolean.valueOf((_multiplicity != 1)); - } + final Function1<Port, Boolean> _function_1 = (Port it) -> { + int _multiplicity = it.getMultiplicity(); + return Boolean.valueOf((_multiplicity != 1)); }; final Iterable<Port> replEventPorts = IterableExtensions.<Port>filter(eventPorts, _function_1); List<Port> _allEndPorts_1 = this._roomHelpers.getAllEndPorts(ac); - final Function1<Port, Boolean> _function_2 = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port p) { - return Boolean.valueOf(((Objects.equal(((ProtocolClass) p.getProtocol()).getCommType(), CommunicationType.DATA_DRIVEN) && p.isConjugated()) && (p.getMultiplicity() == 1))); - } + final Function1<Port, Boolean> _function_2 = (Port p) -> { + return Boolean.valueOf(((Objects.equal(((ProtocolClass) p.getProtocol()).getCommType(), CommunicationType.DATA_DRIVEN) && p.isConjugated()) && (p.getMultiplicity() == 1))); }; final Iterable<Port> sendPorts = IterableExtensions.<Port>filter(_allEndPorts_1, _function_2); List<Port> _allEndPorts_2 = this._roomHelpers.getAllEndPorts(ac); - final Function1<Port, Boolean> _function_3 = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port p) { - return Boolean.valueOf(((Objects.equal(((ProtocolClass) p.getProtocol()).getCommType(), CommunicationType.DATA_DRIVEN) && (!p.isConjugated())) && (p.getMultiplicity() == 1))); - } + final Function1<Port, Boolean> _function_3 = (Port p) -> { + return Boolean.valueOf(((Objects.equal(((ProtocolClass) p.getProtocol()).getCommType(), CommunicationType.DATA_DRIVEN) && (!p.isConjugated())) && (p.getMultiplicity() == 1))); }; final Iterable<Port> recvPorts = IterableExtensions.<Port>filter(_allEndPorts_2, _function_3); List<InterfaceItem> _allInterfaceItems = this._roomHelpers.getAllInterfaceItems(ac); - final Function1<InterfaceItem, Boolean> _function_4 = new Function1<InterfaceItem, Boolean>() { - @Override - public Boolean apply(final InterfaceItem p) { - return Boolean.valueOf(((!Objects.equal(ActorClassGen.this._roomHelpers.getPortClass(p), null)) && (ActorClassGen.this._roomHelpers.getPortClass(p).getOperations().size() > 0))); - } + final Function1<InterfaceItem, Boolean> _function_4 = (InterfaceItem p) -> { + return Boolean.valueOf(((!Objects.equal(this._roomHelpers.getPortClass(p), null)) && (this._roomHelpers.getPortClass(p).getOperations().size() > 0))); }; final Iterable<InterfaceItem> portsWithOperations = IterableExtensions.<InterfaceItem>filter(_allInterfaceItems, _function_4); EObject _eContainer = ac.eContainer(); @@ -607,12 +583,9 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("/* simple event ports */"); _builder.newLine(); { - final Function1<Port, Boolean> _function_5 = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port it) { - int _multiplicity = it.getMultiplicity(); - return Boolean.valueOf((_multiplicity == 1)); - } + final Function1<Port, Boolean> _function_5 = (Port it) -> { + int _multiplicity = it.getMultiplicity(); + return Boolean.valueOf((_multiplicity == 1)); }; Iterable<Port> _filter = IterableExtensions.<Port>filter(eventPorts, _function_5); for(final Port ep : _filter) { diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java index 750650568..893f29e41 100644 --- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java +++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java @@ -271,11 +271,8 @@ public class NodeGen { final String clsname = (_plus + _name_1); NodeClass _type = nr.getType(); EList<PhysicalThread> _threads = _type.getThreads(); - final Function1<PhysicalThread, Boolean> _function = new Function1<PhysicalThread, Boolean>() { - @Override - public Boolean apply(final PhysicalThread t) { - return Boolean.valueOf(usedThreads.contains(t)); - } + final Function1<PhysicalThread, Boolean> _function = (PhysicalThread t) -> { + return Boolean.valueOf(usedThreads.contains(t)); }; final Iterable<PhysicalThread> threads = IterableExtensions.<PhysicalThread>filter(_threads, _function); final boolean logData = (Main.getSettings().isGenerateDataInstrumentation() && this._roomHelpers.isAnnotationPresent(ssc.getAnnotations(), "DataLogging")); @@ -411,12 +408,9 @@ public class NodeGen { _builder.append("/* initialization of all message services */"); _builder.newLine(); { - final Function1<PhysicalThread, Long> _function_1 = new Function1<PhysicalThread, Long>() { - @Override - public Long apply(final PhysicalThread it) { - long _prio = it.getPrio(); - return Long.valueOf((-_prio)); - } + final Function1<PhysicalThread, Long> _function_1 = (PhysicalThread it) -> { + long _prio = it.getPrio(); + return Long.valueOf((-_prio)); }; List<PhysicalThread> _sortBy = IterableExtensions.<PhysicalThread, Long>sortBy(threads, _function_1); for(final PhysicalThread thread : _sortBy) { @@ -525,12 +519,9 @@ public class NodeGen { _builder.newLineIfNotEmpty(); _builder.newLine(); { - final Function1<PhysicalThread, Long> _function_2 = new Function1<PhysicalThread, Long>() { - @Override - public Long apply(final PhysicalThread it) { - long _prio = it.getPrio(); - return Long.valueOf((-_prio)); - } + final Function1<PhysicalThread, Long> _function_2 = (PhysicalThread it) -> { + long _prio_1 = it.getPrio(); + return Long.valueOf((-_prio_1)); }; List<PhysicalThread> _sortBy_1 = IterableExtensions.<PhysicalThread, Long>sortBy(threads, _function_2); for(final PhysicalThread thread_1 : _sortBy_1) { @@ -985,11 +976,8 @@ public class NodeGen { { NodeClass _type = nr.getType(); EList<PhysicalThread> _threads = _type.getThreads(); - final Function1<PhysicalThread, Boolean> _function = new Function1<PhysicalThread, Boolean>() { - @Override - public Boolean apply(final PhysicalThread t) { - return Boolean.valueOf(usedThreads.contains(t)); - } + final Function1<PhysicalThread, Boolean> _function = (PhysicalThread t) -> { + return Boolean.valueOf(usedThreads.contains(t)); }; Iterable<PhysicalThread> _filter = IterableExtensions.<PhysicalThread>filter(_threads, _function); for(final PhysicalThread thread : _filter) { @@ -1182,96 +1170,63 @@ public class NodeGen { final String instName = this._roomExtensions.getPathName(_path); final ArrayList<InterfaceItemInstance> replEventItems = new ArrayList<InterfaceItemInstance>(); EList<InterfaceItemInstance> _orderedIfItemInstances = ai.getOrderedIfItemInstances(); - final Function1<InterfaceItemInstance, Boolean> _function = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance e) { - return Boolean.valueOf(e.isReplicated()); - } + final Function1<InterfaceItemInstance, Boolean> _function = (InterfaceItemInstance e) -> { + return Boolean.valueOf(e.isReplicated()); }; Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function); Iterables.<InterfaceItemInstance>addAll(replEventItems, _filter); - final Function1<InterfaceItemInstance, Boolean> _function_1 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance e) { - EList<InterfaceItemInstance> _peers = e.getPeers(); - boolean _isEmpty = _peers.isEmpty(); - return Boolean.valueOf((!_isEmpty)); - } + final Function1<InterfaceItemInstance, Boolean> _function_1 = (InterfaceItemInstance e) -> { + EList<InterfaceItemInstance> _peers = e.getPeers(); + boolean _isEmpty = _peers.isEmpty(); + return Boolean.valueOf((!_isEmpty)); }; InterfaceItemInstance _findFirst = IterableExtensions.<InterfaceItemInstance>findFirst(replEventItems, _function_1); final boolean haveReplSubItems = (!Objects.equal(_findFirst, null)); - final Function1<InterfaceItemInstance, Boolean> _function_2 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance i) { - InterfaceItem _interfaceItem = i.getInterfaceItem(); - return Boolean.valueOf((_interfaceItem instanceof Port)); - } + final Function1<InterfaceItemInstance, Boolean> _function_2 = (InterfaceItemInstance i) -> { + InterfaceItem _interfaceItem = i.getInterfaceItem(); + return Boolean.valueOf((_interfaceItem instanceof Port)); }; final Iterable<InterfaceItemInstance> replEventPorts = IterableExtensions.<InterfaceItemInstance>filter(replEventItems, _function_2); - final Function1<InterfaceItemInstance, Boolean> _function_3 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance i) { - InterfaceItem _interfaceItem = i.getInterfaceItem(); - return Boolean.valueOf((_interfaceItem instanceof SPP)); - } + final Function1<InterfaceItemInstance, Boolean> _function_3 = (InterfaceItemInstance i) -> { + InterfaceItem _interfaceItem = i.getInterfaceItem(); + return Boolean.valueOf((_interfaceItem instanceof SPP)); }; final Iterable<InterfaceItemInstance> replEventSPPs = IterableExtensions.<InterfaceItemInstance>filter(replEventItems, _function_3); EList<InterfaceItemInstance> _orderedIfItemInstances_1 = ai.getOrderedIfItemInstances(); - final Function1<InterfaceItemInstance, Boolean> _function_4 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance e) { - return Boolean.valueOf(e.isSimple()); - } + final Function1<InterfaceItemInstance, Boolean> _function_4 = (InterfaceItemInstance e) -> { + return Boolean.valueOf(e.isSimple()); }; final Iterable<InterfaceItemInstance> simplePorts = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances_1, _function_4); final ArrayList<InterfaceItemInstance> simpleEventItems = new ArrayList<InterfaceItemInstance>(); - final Function1<InterfaceItemInstance, Boolean> _function_5 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance p) { - ProtocolClass _protocol = p.getProtocol(); - CommunicationType _commType = _protocol.getCommType(); - return Boolean.valueOf(Objects.equal(_commType, CommunicationType.EVENT_DRIVEN)); - } + final Function1<InterfaceItemInstance, Boolean> _function_5 = (InterfaceItemInstance p) -> { + ProtocolClass _protocol = p.getProtocol(); + CommunicationType _commType = _protocol.getCommType(); + return Boolean.valueOf(Objects.equal(_commType, CommunicationType.EVENT_DRIVEN)); }; Iterable<InterfaceItemInstance> _filter_1 = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_5); Iterables.<InterfaceItemInstance>addAll(simpleEventItems, _filter_1); - final Function1<InterfaceItemInstance, Boolean> _function_6 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance i) { - InterfaceItem _interfaceItem = i.getInterfaceItem(); - return Boolean.valueOf((_interfaceItem instanceof Port)); - } + final Function1<InterfaceItemInstance, Boolean> _function_6 = (InterfaceItemInstance i) -> { + InterfaceItem _interfaceItem = i.getInterfaceItem(); + return Boolean.valueOf((_interfaceItem instanceof Port)); }; final Iterable<InterfaceItemInstance> simpleEventPorts = IterableExtensions.<InterfaceItemInstance>filter(simpleEventItems, _function_6); - final Function1<InterfaceItemInstance, Boolean> _function_7 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance i) { - InterfaceItem _interfaceItem = i.getInterfaceItem(); - return Boolean.valueOf((_interfaceItem instanceof SAP)); - } + final Function1<InterfaceItemInstance, Boolean> _function_7 = (InterfaceItemInstance i) -> { + InterfaceItem _interfaceItem = i.getInterfaceItem(); + return Boolean.valueOf((_interfaceItem instanceof SAP)); }; final Iterable<InterfaceItemInstance> simpleEventSAPs = IterableExtensions.<InterfaceItemInstance>filter(simpleEventItems, _function_7); - final Function1<InterfaceItemInstance, Boolean> _function_8 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance p) { - ProtocolClass _protocol = p.getProtocol(); - CommunicationType _commType = _protocol.getCommType(); - return Boolean.valueOf(Objects.equal(_commType, CommunicationType.DATA_DRIVEN)); - } + final Function1<InterfaceItemInstance, Boolean> _function_8 = (InterfaceItemInstance p) -> { + ProtocolClass _protocol = p.getProtocol(); + CommunicationType _commType = _protocol.getCommType(); + return Boolean.valueOf(Objects.equal(_commType, CommunicationType.DATA_DRIVEN)); }; final Iterable<InterfaceItemInstance> dataPorts = IterableExtensions.<InterfaceItemInstance>filter(simplePorts, _function_8); - final Function1<InterfaceItemInstance, Boolean> _function_9 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance p) { - return Boolean.valueOf(((p instanceof PortInstance) && (!((PortInstance) p).getPort().isConjugated()))); - } + final Function1<InterfaceItemInstance, Boolean> _function_9 = (InterfaceItemInstance p) -> { + return Boolean.valueOf(((p instanceof PortInstance) && (!((PortInstance) p).getPort().isConjugated()))); }; final Iterable<InterfaceItemInstance> recvPorts = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_9); - final Function1<InterfaceItemInstance, Boolean> _function_10 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance p) { - return Boolean.valueOf(((p instanceof PortInstance) && ((PortInstance) p).getPort().isConjugated())); - } + final Function1<InterfaceItemInstance, Boolean> _function_10 = (InterfaceItemInstance p) -> { + return Boolean.valueOf(((p instanceof PortInstance) && ((PortInstance) p).getPort().isConjugated())); }; final Iterable<InterfaceItemInstance> sendPorts = IterableExtensions.<InterfaceItemInstance>filter(dataPorts, _function_10); final HashMap<InterfaceItemInstance, Integer> offsets = new HashMap<InterfaceItemInstance, Integer>(); @@ -1325,13 +1280,10 @@ public class NodeGen { _builder.append("/* Replicated Sub Ports: {varData, msgService, peerAddress, localId, index} */"); _builder.newLine(); { - final Function1<InterfaceItemInstance, Boolean> _function_11 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance e) { - EList<InterfaceItemInstance> _peers = e.getPeers(); - boolean _isEmpty = _peers.isEmpty(); - return Boolean.valueOf((!_isEmpty)); - } + final Function1<InterfaceItemInstance, Boolean> _function_11 = (InterfaceItemInstance e) -> { + EList<InterfaceItemInstance> _peers = e.getPeers(); + boolean _isEmpty = _peers.isEmpty(); + return Boolean.valueOf((!_isEmpty)); }; Iterable<InterfaceItemInstance> _filter_2 = IterableExtensions.<InterfaceItemInstance>filter(replEventItems, _function_11); boolean _hasElements = false; @@ -1519,42 +1471,27 @@ public class NodeGen { CharSequence _xblockexpression = null; { EList<InterfaceItemInstance> _orderedIfItemInstances = ai.getOrderedIfItemInstances(); - final Function1<InterfaceItemInstance, Boolean> _function = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance e) { - return Boolean.valueOf((e.isSimple() && (e instanceof PortInstance))); - } + final Function1<InterfaceItemInstance, Boolean> _function = (InterfaceItemInstance e) -> { + return Boolean.valueOf((e.isSimple() && (e instanceof PortInstance))); }; Iterable<InterfaceItemInstance> _filter = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function); - final Function1<InterfaceItemInstance, PortInstance> _function_1 = new Function1<InterfaceItemInstance, PortInstance>() { - @Override - public PortInstance apply(final InterfaceItemInstance inst) { - return ((PortInstance) inst); - } + final Function1<InterfaceItemInstance, PortInstance> _function_1 = (InterfaceItemInstance inst) -> { + return ((PortInstance) inst); }; final Iterable<PortInstance> simplePorts = IterableExtensions.<InterfaceItemInstance, PortInstance>map(_filter, _function_1); - final Function1<PortInstance, Boolean> _function_2 = new Function1<PortInstance, Boolean>() { - @Override - public Boolean apply(final PortInstance p) { - return Boolean.valueOf((p.getPort().isConjugated() && Objects.equal(p.getProtocol().getCommType(), CommunicationType.DATA_DRIVEN))); - } + final Function1<PortInstance, Boolean> _function_2 = (PortInstance p) -> { + return Boolean.valueOf((p.getPort().isConjugated() && Objects.equal(p.getProtocol().getCommType(), CommunicationType.DATA_DRIVEN))); }; final Iterable<PortInstance> sendPorts = IterableExtensions.<PortInstance>filter(simplePorts, _function_2); - final Function1<PortInstance, Boolean> _function_3 = new Function1<PortInstance, Boolean>() { - @Override - public Boolean apply(final PortInstance p) { - Port _port = p.getPort(); - List<Message> _outgoing = NodeGen.this._roomHelpers.getOutgoing(_port); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - return Boolean.valueOf((NodeGen.this._typeHelpers.isEnumeration(m.getData().getRefType().getType()) || NodeGen.this._typeHelpers.isBoolean(m.getData().getRefType().getType()))); - } - }; - Iterable<Message> _filter = IterableExtensions.<Message>filter(_outgoing, _function); - boolean _isEmpty = IterableExtensions.isEmpty(_filter); - return Boolean.valueOf((!_isEmpty)); - } + final Function1<PortInstance, Boolean> _function_3 = (PortInstance p) -> { + Port _port = p.getPort(); + List<Message> _outgoing = this._roomHelpers.getOutgoing(_port); + final Function1<Message, Boolean> _function_4 = (Message m) -> { + return Boolean.valueOf((this._typeHelpers.isEnumeration(m.getData().getRefType().getType()) || this._typeHelpers.isBoolean(m.getData().getRefType().getType()))); + }; + Iterable<Message> _filter_1 = IterableExtensions.<Message>filter(_outgoing, _function_4); + boolean _isEmpty = IterableExtensions.isEmpty(_filter_1); + return Boolean.valueOf((!_isEmpty)); }; final Iterable<PortInstance> loggedPorts = IterableExtensions.<PortInstance>filter(sendPorts, _function_3); StringConcatenation _builder = new StringConcatenation(); @@ -1701,32 +1638,23 @@ public class NodeGen { GeneralProtocolClass _protocol = _port.getProtocol(); final ProtocolClass pc = ((ProtocolClass) _protocol); List<Message> _allIncomingMessages = this._roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - return Boolean.valueOf((!Objects.equal(_data, null))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + VarDecl _data = m.getData(); + return Boolean.valueOf((!Objects.equal(_data, null))); }; Iterable<Message> messages = IterableExtensions.<Message>filter(_allIncomingMessages, _function); - final Function1<Message, Boolean> _function_1 = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - RefableType _refType = _data.getRefType(); - DataType _type = _refType.getType(); - return Boolean.valueOf(NodeGen.this._typeHelpers.isEnumeration(_type)); - } + final Function1<Message, Boolean> _function_1 = (Message m) -> { + VarDecl _data = m.getData(); + RefableType _refType = _data.getRefType(); + DataType _type = _refType.getType(); + return Boolean.valueOf(this._typeHelpers.isEnumeration(_type)); }; final Iterable<Message> enumMsgs = IterableExtensions.<Message>filter(messages, _function_1); - final Function1<Message, Boolean> _function_2 = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - RefableType _refType = _data.getRefType(); - DataType _type = _refType.getType(); - return Boolean.valueOf(NodeGen.this._typeHelpers.isBoolean(_type)); - } + final Function1<Message, Boolean> _function_2 = (Message m) -> { + VarDecl _data = m.getData(); + RefableType _refType = _data.getRefType(); + DataType _type = _refType.getType(); + return Boolean.valueOf(this._typeHelpers.isBoolean(_type)); }; final Iterable<Message> boolMsgs = IterableExtensions.<Message>filter(messages, _function_2); final boolean usesMSC = (Main.getSettings().isGenerateMSCInstrumentation() && (!(IterableExtensions.isEmpty(enumMsgs) && IterableExtensions.isEmpty(boolMsgs)))); @@ -1814,32 +1742,23 @@ public class NodeGen { { InterfaceItem _interfaceItem = pi.getInterfaceItem(); List<Message> _incoming = this._roomHelpers.getIncoming(_interfaceItem); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - return Boolean.valueOf((!Objects.equal(_data, null))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + VarDecl _data = m.getData(); + return Boolean.valueOf((!Objects.equal(_data, null))); }; Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_incoming, _function); - final Function1<Message, Boolean> _function_1 = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - RefableType _refType = _data.getRefType(); - DataType _type = _refType.getType(); - return Boolean.valueOf(NodeGen.this._typeHelpers.isEnumeration(_type)); - } + final Function1<Message, Boolean> _function_1 = (Message m) -> { + VarDecl _data = m.getData(); + RefableType _refType = _data.getRefType(); + DataType _type = _refType.getType(); + return Boolean.valueOf(this._typeHelpers.isEnumeration(_type)); }; final Iterable<Message> enumMsgs = IterableExtensions.<Message>filter(sentMsgs, _function_1); - final Function1<Message, Boolean> _function_2 = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - RefableType _refType = _data.getRefType(); - DataType _type = _refType.getType(); - return Boolean.valueOf(NodeGen.this._typeHelpers.isBoolean(_type)); - } + final Function1<Message, Boolean> _function_2 = (Message m) -> { + VarDecl _data = m.getData(); + RefableType _refType = _data.getRefType(); + DataType _type = _refType.getType(); + return Boolean.valueOf(this._typeHelpers.isBoolean(_type)); }; final Iterable<Message> boolMsgs = IterableExtensions.<Message>filter(sentMsgs, _function_2); final boolean usesMSC = (Main.getSettings().isGenerateMSCInstrumentation() && (!(IterableExtensions.isEmpty(enumMsgs) && IterableExtensions.isEmpty(boolMsgs)))); @@ -2016,11 +1935,8 @@ public class NodeGen { { NodeClass _type = nr.getType(); EList<PhysicalThread> _threads = _type.getThreads(); - final Function1<PhysicalThread, Boolean> _function = new Function1<PhysicalThread, Boolean>() { - @Override - public Boolean apply(final PhysicalThread t) { - return Boolean.valueOf(usedThreads.contains(t)); - } + final Function1<PhysicalThread, Boolean> _function = (PhysicalThread t) -> { + return Boolean.valueOf(usedThreads.contains(t)); }; Iterable<PhysicalThread> _filter = IterableExtensions.<PhysicalThread>filter(_threads, _function); boolean _hasElements = false; @@ -2031,29 +1947,20 @@ public class NodeGen { _builder.appendImmediate("\n", ""); } EList<ActorInstance> _allContainedInstances = ssi.getAllContainedInstances(); - final Function1<ActorInstance, Boolean> _function_1 = new Function1<ActorInstance, Boolean>() { - @Override - public Boolean apply(final ActorInstance ai) { - ETMapUtil.MappedThread _mappedThread = ETMapUtil.getMappedThread(ai); - PhysicalThread _thread = _mappedThread.getThread(); - return Boolean.valueOf(Objects.equal(_thread, thread)); - } + final Function1<ActorInstance, Boolean> _function_1 = (ActorInstance ai) -> { + ETMapUtil.MappedThread _mappedThread = ETMapUtil.getMappedThread(ai); + PhysicalThread _thread = _mappedThread.getThread(); + return Boolean.valueOf(Objects.equal(_thread, thread)); }; final Iterable<ActorInstance> instancesOnThread = IterableExtensions.<ActorInstance>filter(_allContainedInstances, _function_1); _builder.newLineIfNotEmpty(); - final Function1<ActorInstance, Boolean> _function_2 = new Function1<ActorInstance, Boolean>() { - @Override - public Boolean apply(final ActorInstance ai) { - return Boolean.valueOf((Objects.equal(ai.getActorClass().getCommType(), ComponentCommunicationType.EVENT_DRIVEN) || Objects.equal(ai.getActorClass().getCommType(), ComponentCommunicationType.ASYNCHRONOUS))); - } + final Function1<ActorInstance, Boolean> _function_2 = (ActorInstance ai) -> { + return Boolean.valueOf((Objects.equal(ai.getActorClass().getCommType(), ComponentCommunicationType.EVENT_DRIVEN) || Objects.equal(ai.getActorClass().getCommType(), ComponentCommunicationType.ASYNCHRONOUS))); }; final Iterable<ActorInstance> dispatchedInstances = IterableExtensions.<ActorInstance>filter(instancesOnThread, _function_2); _builder.newLineIfNotEmpty(); - final Function1<ActorInstance, Boolean> _function_3 = new Function1<ActorInstance, Boolean>() { - @Override - public Boolean apply(final ActorInstance ai) { - return Boolean.valueOf((Objects.equal(ai.getActorClass().getCommType(), ComponentCommunicationType.DATA_DRIVEN) || Objects.equal(ai.getActorClass().getCommType(), ComponentCommunicationType.ASYNCHRONOUS))); - } + final Function1<ActorInstance, Boolean> _function_3 = (ActorInstance ai) -> { + return Boolean.valueOf((Objects.equal(ai.getActorClass().getCommType(), ComponentCommunicationType.DATA_DRIVEN) || Objects.equal(ai.getActorClass().getCommType(), ComponentCommunicationType.ASYNCHRONOUS))); }; final Iterable<ActorInstance> executedInstances = IterableExtensions.<ActorInstance>filter(instancesOnThread, _function_3); _builder.newLineIfNotEmpty(); @@ -2227,13 +2134,10 @@ public class NodeGen { _builder.newLineIfNotEmpty(); { EList<InterfaceItemInstance> _orderedIfItemInstances = ai_1.getOrderedIfItemInstances(); - final Function1<InterfaceItemInstance, Boolean> _function_4 = new Function1<InterfaceItemInstance, Boolean>() { - @Override - public Boolean apply(final InterfaceItemInstance p) { - ProtocolClass _protocol = p.getProtocol(); - CommunicationType _commType = _protocol.getCommType(); - return Boolean.valueOf(Objects.equal(_commType, CommunicationType.EVENT_DRIVEN)); - } + final Function1<InterfaceItemInstance, Boolean> _function_4 = (InterfaceItemInstance p) -> { + ProtocolClass _protocol = p.getProtocol(); + CommunicationType _commType = _protocol.getCommType(); + return Boolean.valueOf(Objects.equal(_commType, CommunicationType.EVENT_DRIVEN)); }; Iterable<InterfaceItemInstance> _filter_1 = IterableExtensions.<InterfaceItemInstance>filter(_orderedIfItemInstances, _function_4); for(final InterfaceItemInstance pi_2 : _filter_1) { @@ -2650,11 +2554,8 @@ public class NodeGen { { ProtocolClass _protocol = pi.getProtocol(); EList<Message> _incomingMessages = _protocol.getIncomingMessages(); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - return Boolean.valueOf(((!Objects.equal(m.getData(), null)) && NodeGen.this._typeHelpers.isEnumerationOrPrimitive(m.getData().getRefType().getType()))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + return Boolean.valueOf(((!Objects.equal(m.getData(), null)) && this._typeHelpers.isEnumerationOrPrimitive(m.getData().getRefType().getType()))); }; Iterable<Message> _filter = IterableExtensions.<Message>filter(_incomingMessages, _function); final Message msg = ((Message[])Conversions.unwrapArray(_filter, Message.class))[0]; @@ -2750,11 +2651,8 @@ public class NodeGen { matched = true; ProtocolClass _protocol_1 = pi.getProtocol(); EList<Message> _incomingMessages = _protocol_1.getIncomingMessages(); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - return Boolean.valueOf(((!Objects.equal(m.getData(), null)) && NodeGen.this._typeHelpers.isEnumerationOrPrimitive(m.getData().getRefType().getType()))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + return Boolean.valueOf(((!Objects.equal(m.getData(), null)) && this._typeHelpers.isEnumerationOrPrimitive(m.getData().getRefType().getType()))); }; Iterable<Message> _filter = IterableExtensions.<Message>filter(_incomingMessages, _function); boolean _isEmpty = IterableExtensions.isEmpty(_filter); 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 04f0106dc..0cb9a4361 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 @@ -498,20 +498,14 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { } List<Message> messages = _xifexpression; final List<PortClass> allPortClasses = this._roomExtensions.getAllPortClasses(pc, (conj).booleanValue()); - final Function1<PortClass, EList<Attribute>> _function = new Function1<PortClass, EList<Attribute>>() { - @Override - public EList<Attribute> apply(final PortClass p) { - return p.getAttributes(); - } + final Function1<PortClass, EList<Attribute>> _function = (PortClass p) -> { + return p.getAttributes(); }; List<EList<Attribute>> _map = ListExtensions.<PortClass, EList<Attribute>>map(allPortClasses, _function); Iterable<Attribute> _flatten = Iterables.<Attribute>concat(_map); final List<Attribute> allAttributes = IterableExtensions.<Attribute>toList(_flatten); - final Function1<PortClass, EList<PortOperation>> _function_1 = new Function1<PortClass, EList<PortOperation>>() { - @Override - public EList<PortOperation> apply(final PortClass p) { - return p.getOperations(); - } + final Function1<PortClass, EList<PortOperation>> _function_1 = (PortClass p) -> { + return p.getOperations(); }; List<EList<PortOperation>> _map_1 = ListExtensions.<PortClass, EList<PortOperation>>map(allPortClasses, _function_1); Iterable<PortOperation> _flatten_1 = Iterables.<PortOperation>concat(_map_1); @@ -661,32 +655,23 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { CharSequence _xblockexpression = null; { List<Message> _allIncomingMessages = this._roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - return Boolean.valueOf((!Objects.equal(_data, null))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + VarDecl _data = m.getData(); + return Boolean.valueOf((!Objects.equal(_data, null))); }; Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_allIncomingMessages, _function); - final Function1<Message, Boolean> _function_1 = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - RefableType _refType = _data.getRefType(); - DataType _type = _refType.getType(); - return Boolean.valueOf(ProtocolClassGen.this._typeHelpers.isEnumeration(_type)); - } + final Function1<Message, Boolean> _function_1 = (Message m) -> { + VarDecl _data = m.getData(); + RefableType _refType = _data.getRefType(); + DataType _type = _refType.getType(); + return Boolean.valueOf(this._typeHelpers.isEnumeration(_type)); }; final Iterable<Message> enumMsgs = IterableExtensions.<Message>filter(sentMsgs, _function_1); - final Function1<Message, Boolean> _function_2 = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - RefableType _refType = _data.getRefType(); - DataType _type = _refType.getType(); - return Boolean.valueOf(ProtocolClassGen.this._typeHelpers.isBoolean(_type)); - } + final Function1<Message, Boolean> _function_2 = (Message m) -> { + VarDecl _data = m.getData(); + RefableType _refType = _data.getRefType(); + DataType _type = _refType.getType(); + return Boolean.valueOf(this._typeHelpers.isBoolean(_type)); }; final Iterable<Message> boolMsgs = IterableExtensions.<Message>filter(sentMsgs, _function_2); final boolean usesMSC = (Main.getSettings().isGenerateMSCInstrumentation() && (!(IterableExtensions.isEmpty(enumMsgs) && IterableExtensions.isEmpty(boolMsgs)))); @@ -909,32 +894,23 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { CharSequence _xblockexpression = null; { List<Message> _allIncomingMessages = this._roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - return Boolean.valueOf((!Objects.equal(_data, null))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + VarDecl _data = m.getData(); + return Boolean.valueOf((!Objects.equal(_data, null))); }; Iterable<Message> messages = IterableExtensions.<Message>filter(_allIncomingMessages, _function); - final Function1<Message, Boolean> _function_1 = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - RefableType _refType = _data.getRefType(); - DataType _type = _refType.getType(); - return Boolean.valueOf(ProtocolClassGen.this._typeHelpers.isEnumeration(_type)); - } + final Function1<Message, Boolean> _function_1 = (Message m) -> { + VarDecl _data = m.getData(); + RefableType _refType = _data.getRefType(); + DataType _type = _refType.getType(); + return Boolean.valueOf(this._typeHelpers.isEnumeration(_type)); }; final Iterable<Message> enumMsgs = IterableExtensions.<Message>filter(messages, _function_1); - final Function1<Message, Boolean> _function_2 = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - RefableType _refType = _data.getRefType(); - DataType _type = _refType.getType(); - return Boolean.valueOf(ProtocolClassGen.this._typeHelpers.isBoolean(_type)); - } + final Function1<Message, Boolean> _function_2 = (Message m) -> { + VarDecl _data = m.getData(); + RefableType _refType = _data.getRefType(); + DataType _type = _refType.getType(); + return Boolean.valueOf(this._typeHelpers.isBoolean(_type)); }; final Iterable<Message> boolMsgs = IterableExtensions.<Message>filter(messages, _function_2); final boolean usesMSC = (Main.getSettings().isGenerateMSCInstrumentation() && (!(IterableExtensions.isEmpty(enumMsgs) && IterableExtensions.isEmpty(boolMsgs)))); @@ -968,12 +944,9 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { _builder.append(" {"); _builder.newLineIfNotEmpty(); { - if ((usesMSC && IterableExtensions.<Message>exists(enumMsgs, new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - return Boolean.valueOf(Objects.equal(m, message)); - } - }))) { + if ((usesMSC && IterableExtensions.<Message>exists(enumMsgs, ((Function1<Message, Boolean>) (Message m) -> { + return Boolean.valueOf(Objects.equal(m, message)); + })))) { _builder.append("\t"); _builder.append("#ifdef ET_ASYNC_MSC_LOGGER_ACTIVATE"); _builder.newLine(); @@ -1023,12 +996,9 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { } } { - if ((usesMSC && IterableExtensions.<Message>exists(boolMsgs, new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - return Boolean.valueOf(Objects.equal(m, message)); - } - }))) { + if ((usesMSC && IterableExtensions.<Message>exists(boolMsgs, ((Function1<Message, Boolean>) (Message m) -> { + return Boolean.valueOf(Objects.equal(m, message)); + })))) { _builder.append("\t"); _builder.append("#ifdef ET_ASYNC_MSC_LOGGER_ACTIVATE"); _builder.newLine(); diff --git a/plugins/org.eclipse.etrice.generator.config/.classpath b/plugins/org.eclipse.etrice.generator.config/.classpath index 358df1bc1..ef5811bf8 100644 --- a/plugins/org.eclipse.etrice.generator.config/.classpath +++ b/plugins/org.eclipse.etrice.generator.config/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.config/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.config/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.generator.config/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF index 80755366a..004ee69f6 100644 --- a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: eTrice Generator Config Bundle-SymbolicName: org.eclipse.etrice.generator.config;singleton:=true Bundle-Version: 1.1.1.qualifier Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", org.eclipse.etrice.core.fsm;bundle-version="1.1.1", 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 2821f29ff..5bf61078e 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 { @@ -307,17 +307,14 @@ 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>() { - @Override - public void apply(final AttrInstanceConfig c) { - boolean _isReadOnly = c.isReadOnly(); - if (_isReadOnly) { - Attribute _attribute = c.getAttribute(); - result.add(_attribute); - } + final Consumer<AttrInstanceConfig> _function = (AttrInstanceConfig c) -> { + boolean _isReadOnly = c.isReadOnly(); + if (_isReadOnly) { + Attribute _attribute = c.getAttribute(); + result.add(_attribute); } }; - IterableExtensions.<AttrInstanceConfig>forEach(configs, _function); + configs.forEach(_function); } return result; } @@ -328,18 +325,15 @@ 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>() { - @Override - public void apply(final AttrInstanceConfig c) { - boolean _isReadOnly = c.isReadOnly(); - boolean _not = (!_isReadOnly); - if (_not) { - Attribute _attribute = c.getAttribute(); - result.add(_attribute); - } + final Consumer<AttrInstanceConfig> _function = (AttrInstanceConfig c) -> { + boolean _isReadOnly = c.isReadOnly(); + boolean _not = (!_isReadOnly); + if (_not) { + Attribute _attribute = c.getAttribute(); + result.add(_attribute); } }; - IterableExtensions.<AttrInstanceConfig>forEach(configs, _function); + configs.forEach(_function); } return result; } @@ -432,17 +426,14 @@ 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>() { - @Override - public void apply(final AttrInstanceConfig c) { - boolean _isReadOnly = c.isReadOnly(); - if (_isReadOnly) { - Attribute _attribute = c.getAttribute(); - result.add(_attribute); - } + final Consumer<AttrInstanceConfig> _function = (AttrInstanceConfig c) -> { + boolean _isReadOnly = c.isReadOnly(); + if (_isReadOnly) { + Attribute _attribute = c.getAttribute(); + result.add(_attribute); } }; - IterableExtensions.<AttrInstanceConfig>forEach(configs, _function); + configs.forEach(_function); } return IterableExtensions.<Attribute>toList(result); } @@ -452,18 +443,15 @@ 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>() { - @Override - public void apply(final AttrInstanceConfig c) { - boolean _isReadOnly = c.isReadOnly(); - boolean _not = (!_isReadOnly); - if (_not) { - Attribute _attribute = c.getAttribute(); - result.add(_attribute); - } + final Consumer<AttrInstanceConfig> _function = (AttrInstanceConfig c) -> { + boolean _isReadOnly = c.isReadOnly(); + boolean _not = (!_isReadOnly); + if (_not) { + Attribute _attribute = c.getAttribute(); + result.add(_attribute); } }; - IterableExtensions.<AttrInstanceConfig>forEach(configs, _function); + configs.forEach(_function); } return IterableExtensions.<Attribute>toList(result); } diff --git a/plugins/org.eclipse.etrice.generator.cpp/.classpath b/plugins/org.eclipse.etrice.generator.cpp/.classpath index 358df1bc1..ef5811bf8 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/.classpath +++ b/plugins/org.eclipse.etrice.generator.cpp/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.cpp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.cpp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.generator.cpp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF index 82b87e106..c985f7177 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.cpp, org.eclipse.etrice.generator.cpp.gen, org.eclipse.etrice.generator.cpp.setup 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 270831896..aa325c002 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 @@ -17,6 +17,7 @@ import com.google.inject.Singleton; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.Consumer; import org.eclipse.emf.common.util.EList; import org.eclipse.etrice.core.fsm.fSM.ComponentCommunicationType; import org.eclipse.etrice.core.fsm.fSM.DetailCode; @@ -52,7 +53,6 @@ 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; -import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; @Singleton @SuppressWarnings("all") @@ -87,21 +87,15 @@ public class ActorClassGen extends GenericActorClassGenerator { final Map<ActorClass, WiredActorClass> ac2wired = CollectionLiterals.<ActorClass, WiredActorClass>newHashMap(); EList<WiredStructureClass> _wiredInstances = root.getWiredInstances(); Iterable<WiredActorClass> _filter = Iterables.<WiredActorClass>filter(_wiredInstances, WiredActorClass.class); - final Procedure1<WiredActorClass> _function = new Procedure1<WiredActorClass>() { - @Override - public void apply(final WiredActorClass it) { - ActorClass _actorClass = it.getActorClass(); - ac2wired.put(_actorClass, it); - } + final Consumer<WiredActorClass> _function = (WiredActorClass it) -> { + ActorClass _actorClass = it.getActorClass(); + ac2wired.put(_actorClass, it); }; - IterableExtensions.<WiredActorClass>forEach(_filter, _function); + _filter.forEach(_function); EList<ExpandedActorClass> _xpActorClasses = root.getXpActorClasses(); - final Function1<ExpandedActorClass, Boolean> _function_1 = new Function1<ExpandedActorClass, Boolean>() { - @Override - public Boolean apply(final ExpandedActorClass cl) { - ActorClass _actorClass = cl.getActorClass(); - return Boolean.valueOf(ActorClassGen.this._fileSystemHelpers.isValidGenerationLocation(_actorClass)); - } + final Function1<ExpandedActorClass, Boolean> _function_1 = (ExpandedActorClass cl) -> { + ActorClass _actorClass = cl.getActorClass(); + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(_actorClass)); }; Iterable<ExpandedActorClass> _filter_1 = IterableExtensions.<ExpandedActorClass>filter(_xpActorClasses, _function_1); for (final ExpandedActorClass xpac : _filter_1) { @@ -423,14 +417,11 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine(); _builder.append("\t\t"); List<Port> _endPorts_1 = this._roomHelpers.getEndPorts(ac); - final Function1<Port, CharSequence> _function = new Function1<Port, CharSequence>() { - @Override - public CharSequence apply(final Port it) { - String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(it); - String _plus = (_portClassName + "&"); - String _name = it.getName(); - return ActorClassGen.this._procedureHelpers.getterImplementation(_plus, _name, clsname); - } + final Function1<Port, CharSequence> _function = (Port it) -> { + String _portClassName_3 = this._roomExtensions.getPortClassName(it); + String _plus = (_portClassName_3 + "&"); + String _name_12 = it.getName(); + return this._procedureHelpers.getterImplementation(_plus, _name_12, clsname); }; List<CharSequence> _map = ListExtensions.<Port, CharSequence>map(_endPorts_1, _function); String _join = IterableExtensions.join(_map, this._roomExtensions.NEWLINE); @@ -439,14 +430,11 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine(); _builder.append("\t\t"); EList<SAP> _serviceAccessPoints_1 = ac.getServiceAccessPoints(); - final Function1<SAP, CharSequence> _function_1 = new Function1<SAP, CharSequence>() { - @Override - public CharSequence apply(final SAP it) { - String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(it); - String _plus = (_portClassName + "&"); - String _name = it.getName(); - return ActorClassGen.this._procedureHelpers.getterImplementation(_plus, _name, clsname); - } + final Function1<SAP, CharSequence> _function_1 = (SAP it) -> { + String _portClassName_3 = this._roomExtensions.getPortClassName(it); + String _plus = (_portClassName_3 + "&"); + String _name_12 = it.getName(); + return this._procedureHelpers.getterImplementation(_plus, _name_12, clsname); }; List<CharSequence> _map_1 = ListExtensions.<SAP, CharSequence>map(_serviceAccessPoints_1, _function_1); String _join_1 = IterableExtensions.join(_map_1, this._roomExtensions.NEWLINE); @@ -455,15 +443,12 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine(); _builder.append("\t\t"); EList<ServiceImplementation> _serviceImplementations_1 = ac.getServiceImplementations(); - final Function1<ServiceImplementation, CharSequence> _function_2 = new Function1<ServiceImplementation, CharSequence>() { - @Override - public CharSequence apply(final ServiceImplementation it) { - String _portClassName = ActorClassGen.this._roomExtensions.getPortClassName(it); - String _plus = (_portClassName + "&"); - SPP _spp = it.getSpp(); - String _name = _spp.getName(); - return ActorClassGen.this._procedureHelpers.getterImplementation(_plus, _name, clsname); - } + final Function1<ServiceImplementation, CharSequence> _function_2 = (ServiceImplementation it) -> { + String _portClassName_3 = this._roomExtensions.getPortClassName(it); + String _plus = (_portClassName_3 + "&"); + SPP _spp_1 = it.getSpp(); + String _name_12 = _spp_1.getName(); + return this._procedureHelpers.getterImplementation(_plus, _name_12, clsname); }; List<CharSequence> _map_2 = ListExtensions.<ServiceImplementation, CharSequence>map(_serviceImplementations_1, _function_2); String _join_2 = IterableExtensions.join(_map_2, this._roomExtensions.NEWLINE); @@ -597,94 +582,79 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append("(parent, name)"); initList.add(_builder.toString()); List<Port> _endPorts = this._roomHelpers.getEndPorts(ac); - final Function1<Port, String> _function = new Function1<Port, String>() { - @Override - public String apply(final Port it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("(this, \""); - String _name_1 = it.getName(); - _builder.append(_name_1, ""); - _builder.append("\", IFITEM_"); - String _name_2 = it.getName(); - _builder.append(_name_2, ""); - _builder.append(")"); - return _builder.toString(); - } + final Function1<Port, String> _function = (Port it) -> { + StringConcatenation _builder_1 = new StringConcatenation(); + String _name_1 = it.getName(); + _builder_1.append(_name_1, ""); + _builder_1.append("(this, \""); + String _name_2 = it.getName(); + _builder_1.append(_name_2, ""); + _builder_1.append("\", IFITEM_"); + String _name_3 = it.getName(); + _builder_1.append(_name_3, ""); + _builder_1.append(")"); + return _builder_1.toString(); }; List<String> _map = ListExtensions.<Port, String>map(_endPorts, _function); Iterables.<CharSequence>addAll(initList, _map); EList<ActorRef> _actorRefs = ac.getActorRefs(); - final Function1<ActorRef, String> _function_1 = new Function1<ActorRef, String>() { - @Override - public String apply(final ActorRef it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("(this, \""); - String _name_1 = it.getName(); - _builder.append(_name_1, ""); - _builder.append("\")"); - return _builder.toString(); - } + final Function1<ActorRef, String> _function_1 = (ActorRef it) -> { + StringConcatenation _builder_1 = new StringConcatenation(); + String _name_1 = it.getName(); + _builder_1.append(_name_1, ""); + _builder_1.append("(this, \""); + String _name_2 = it.getName(); + _builder_1.append(_name_2, ""); + _builder_1.append("\")"); + return _builder_1.toString(); }; List<String> _map_1 = ListExtensions.<ActorRef, String>map(_actorRefs, _function_1); Iterables.<CharSequence>addAll(initList, _map_1); EList<SAP> _serviceAccessPoints = ac.getServiceAccessPoints(); - final Function1<SAP, String> _function_2 = new Function1<SAP, String>() { - @Override - public String apply(final SAP it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("(this, \""); - String _name_1 = it.getName(); - _builder.append(_name_1, ""); - _builder.append("\", IFITEM_"); - String _name_2 = it.getName(); - _builder.append(_name_2, ""); - _builder.append(")"); - return _builder.toString(); - } + final Function1<SAP, String> _function_2 = (SAP it) -> { + StringConcatenation _builder_1 = new StringConcatenation(); + String _name_1 = it.getName(); + _builder_1.append(_name_1, ""); + _builder_1.append("(this, \""); + String _name_2 = it.getName(); + _builder_1.append(_name_2, ""); + _builder_1.append("\", IFITEM_"); + String _name_3 = it.getName(); + _builder_1.append(_name_3, ""); + _builder_1.append(")"); + return _builder_1.toString(); }; List<String> _map_2 = ListExtensions.<SAP, String>map(_serviceAccessPoints, _function_2); Iterables.<CharSequence>addAll(initList, _map_2); EList<ServiceImplementation> _serviceImplementations = ac.getServiceImplementations(); - final Function1<ServiceImplementation, String> _function_3 = new Function1<ServiceImplementation, String>() { - @Override - public String apply(final ServiceImplementation it) { - StringConcatenation _builder = new StringConcatenation(); - SPP _spp = it.getSpp(); - String _name = _spp.getName(); - _builder.append(_name, ""); - _builder.append("(this, \""); - SPP _spp_1 = it.getSpp(); - String _name_1 = _spp_1.getName(); - _builder.append(_name_1, ""); - _builder.append("\", IFITEM_"); - SPP _spp_2 = it.getSpp(); - String _name_2 = _spp_2.getName(); - _builder.append(_name_2, ""); - _builder.append(")"); - return _builder.toString(); - } + final Function1<ServiceImplementation, String> _function_3 = (ServiceImplementation it) -> { + StringConcatenation _builder_1 = new StringConcatenation(); + SPP _spp = it.getSpp(); + String _name_1 = _spp.getName(); + _builder_1.append(_name_1, ""); + _builder_1.append("(this, \""); + SPP _spp_1 = it.getSpp(); + String _name_2 = _spp_1.getName(); + _builder_1.append(_name_2, ""); + _builder_1.append("\", IFITEM_"); + SPP _spp_2 = it.getSpp(); + String _name_3 = _spp_2.getName(); + _builder_1.append(_name_3, ""); + _builder_1.append(")"); + return _builder_1.toString(); }; List<String> _map_3 = ListExtensions.<ServiceImplementation, String>map(_serviceImplementations, _function_3); Iterables.<CharSequence>addAll(initList, _map_3); EList<Attribute> _attributes = ac.getAttributes(); - final Function1<Attribute, String> _function_4 = new Function1<Attribute, String>() { - @Override - public String apply(final Attribute it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("("); - String _initializerListValue = initHelper.getInitializerListValue(it); - _builder.append(_initializerListValue, ""); - _builder.append(")"); - return _builder.toString(); - } + final Function1<Attribute, String> _function_4 = (Attribute it) -> { + StringConcatenation _builder_1 = new StringConcatenation(); + String _name_1 = it.getName(); + _builder_1.append(_name_1, ""); + _builder_1.append("("); + String _initializerListValue = initHelper.getInitializerListValue(it); + _builder_1.append(_initializerListValue, ""); + _builder_1.append(")"); + return _builder_1.toString(); }; List<String> _map_4 = ListExtensions.<Attribute, String>map(_attributes, _function_4); Iterables.<CharSequence>addAll(initList, _map_4); 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 55cd24062..44b6c04f4 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 @@ -551,25 +551,19 @@ public class ConfigGenAddon { private String getMinMaxType(final PrimitiveType type) { String _switchResult = null; String _typeName = this.typeHelpers.typeName(type); - boolean _matched = false; - if (Objects.equal(_typeName, "byte")) { - _matched=true; - _switchResult = "int"; - } - if (!_matched) { - if (Objects.equal(_typeName, "short")) { - _matched=true; + switch (_typeName) { + case "byte": _switchResult = "int"; - } - } - if (!_matched) { - if (Objects.equal(_typeName, "float")) { - _matched=true; + break; + case "short": + _switchResult = "int"; + break; + case "float": _switchResult = "double"; - } - } - if (!_matched) { - _switchResult = this.typeHelpers.typeName(type); + break; + default: + _switchResult = this.typeHelpers.typeName(type); + break; } return _switchResult; } 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 d884e0753..f6030edbe 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 @@ -253,12 +253,9 @@ public class CppExtensions implements ILanguageExtension { Iterable<String> _plus = Iterables.<String>concat(((Iterable<? extends String>)Conversions.doWrapArray(_split)), Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList(_name))); String[] _split_1 = appendSegments.split("\\."); Iterable<String> _plus_1 = Iterables.<String>concat(_plus, ((Iterable<? extends String>)Conversions.doWrapArray(_split_1))); - final Function1<String, Boolean> _function = new Function1<String, Boolean>() { - @Override - public Boolean apply(final String it) { - boolean _isEmpty = it.isEmpty(); - return Boolean.valueOf((!_isEmpty)); - } + final Function1<String, Boolean> _function = (String it) -> { + boolean _isEmpty = it.isEmpty(); + return Boolean.valueOf((!_isEmpty)); }; Iterable<String> _filter = IterableExtensions.<String>filter(_plus_1, _function); String _join = IterableExtensions.join(_filter, "_"); @@ -545,12 +542,9 @@ public class CppExtensions implements ILanguageExtension { if (_isEmpty) { _xifexpression = ac.getName(); } else { - final Function1<KeyValue, Boolean> _function = new Function1<KeyValue, Boolean>() { - @Override - public Boolean apply(final KeyValue it) { - String _key = it.getKey(); - return Boolean.valueOf(Objects.equal(_key, "fqnClassName")); - } + final Function1<KeyValue, Boolean> _function = (KeyValue it) -> { + String _key = it.getKey(); + return Boolean.valueOf(Objects.equal(_key, "fqnClassName")); }; Iterable<KeyValue> _filter = IterableExtensions.<KeyValue>filter(attributes, _function); KeyValue _head = IterableExtensions.<KeyValue>head(_filter); @@ -581,12 +575,9 @@ public class CppExtensions implements ILanguageExtension { } else { String _xblockexpression_1 = null; { - final Function1<KeyValue, Boolean> _function = new Function1<KeyValue, Boolean>() { - @Override - public Boolean apply(final KeyValue it) { - String _key = it.getKey(); - return Boolean.valueOf(Objects.equal(_key, "includePath")); - } + final Function1<KeyValue, Boolean> _function = (KeyValue it) -> { + String _key = it.getKey(); + return Boolean.valueOf(Objects.equal(_key, "includePath")); }; final Iterable<KeyValue> path = IterableExtensions.<KeyValue>filter(attributes, _function); String _xifexpression_1 = null; @@ -594,12 +585,9 @@ public class CppExtensions implements ILanguageExtension { if (_isEmpty_1) { String _xblockexpression_2 = null; { - final Function1<KeyValue, Boolean> _function_1 = new Function1<KeyValue, Boolean>() { - @Override - public Boolean apply(final KeyValue it) { - String _key = it.getKey(); - return Boolean.valueOf(Objects.equal(_key, "fqnClassName")); - } + final Function1<KeyValue, Boolean> _function_1 = (KeyValue it) -> { + String _key = it.getKey(); + return Boolean.valueOf(Objects.equal(_key, "fqnClassName")); }; Iterable<KeyValue> _filter = IterableExtensions.<KeyValue>filter(attributes, _function_1); KeyValue _head = IterableExtensions.<KeyValue>head(_filter); diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppProcedureHelpers.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppProcedureHelpers.java index 9bcf8ee17..6b4e0eb55 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppProcedureHelpers.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppProcedureHelpers.java @@ -94,24 +94,21 @@ public class CppProcedureHelpers extends ProcedureHelpers { * @return an argument list for the attributes with const except for ref {@link Attribute}s */ public String constArgList(final Iterable<Attribute> attributes) { - final Function1<Attribute, String> _function = new Function1<Attribute, String>() { - @Override - public String apply(final Attribute it) { - String _xifexpression = null; - RefableType _type = it.getType(); - boolean _isRef = _type.isRef(); - boolean _not = (!_isRef); - if (_not) { - _xifexpression = "const "; - } else { - _xifexpression = ""; - } - String _signatureString = CppProcedureHelpers.this.signatureString(it); - String _plus = (_xifexpression + _signatureString); - String _plus_1 = (_plus + " "); - String _name = it.getName(); - return (_plus_1 + _name); + final Function1<Attribute, String> _function = (Attribute it) -> { + String _xifexpression = null; + RefableType _type = it.getType(); + boolean _isRef = _type.isRef(); + boolean _not = (!_isRef); + if (_not) { + _xifexpression = "const "; + } else { + _xifexpression = ""; } + String _signatureString = this.signatureString(it); + String _plus = (_xifexpression + _signatureString); + String _plus_1 = (_plus + " "); + String _name = it.getName(); + return (_plus_1 + _name); }; Iterable<String> _map = IterableExtensions.<Attribute, String>map(attributes, _function); return IterableExtensions.join(_map, ", "); 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 08eda1542..90aef2972 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 @@ -462,18 +462,15 @@ public class DataClassGen { initList.add(_plus); } EList<Attribute> _attributes = dataClass.getAttributes(); - final Function1<Attribute, String> _function = new Function1<Attribute, String>() { - @Override - public String apply(final Attribute it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("("); - String _initializerListValue = initHelper.getInitializerListValue(it); - _builder.append(_initializerListValue, ""); - _builder.append(")"); - return _builder.toString(); - } + final Function1<Attribute, String> _function = (Attribute it) -> { + StringConcatenation _builder = new StringConcatenation(); + String _name_1 = it.getName(); + _builder.append(_name_1, ""); + _builder.append("("); + String _initializerListValue = initHelper.getInitializerListValue(it); + _builder.append(_initializerListValue, ""); + _builder.append(")"); + return _builder.toString(); }; List<String> _map = ListExtensions.<Attribute, String>map(_attributes, _function); Iterables.<CharSequence>addAll(initList, _map); @@ -497,18 +494,15 @@ public class DataClassGen { initList.add(_plus); } EList<Attribute> _attributes = dataClass.getAttributes(); - final Function1<Attribute, String> _function = new Function1<Attribute, String>() { - @Override - public String apply(final Attribute it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("(rhs."); - String _name_1 = it.getName(); - _builder.append(_name_1, ""); - _builder.append(")"); - return _builder.toString(); - } + final Function1<Attribute, String> _function = (Attribute it) -> { + StringConcatenation _builder = new StringConcatenation(); + String _name_1 = it.getName(); + _builder.append(_name_1, ""); + _builder.append("(rhs."); + String _name_2 = it.getName(); + _builder.append(_name_2, ""); + _builder.append(")"); + return _builder.toString(); }; List<String> _map = ListExtensions.<Attribute, String>map(_attributes, _function); Iterables.<CharSequence>addAll(initList, _map); @@ -533,11 +527,8 @@ public class DataClassGen { _builder.append("("); DataClass _base_2 = dataClass.getBase(); List<Attribute> _allAttributes = this._roomHelpers.getAllAttributes(_base_2); - final Function1<Attribute, String> _function = new Function1<Attribute, String>() { - @Override - public String apply(final Attribute it) { - return it.getName(); - } + final Function1<Attribute, String> _function = (Attribute it) -> { + return it.getName(); }; List<String> _map = ListExtensions.<Attribute, String>map(_allAttributes, _function); String _join = IterableExtensions.join(_map, ", "); @@ -546,18 +537,15 @@ public class DataClassGen { initList.add(_builder.toString()); } EList<Attribute> _attributes = dataClass.getAttributes(); - final Function1<Attribute, String> _function_1 = new Function1<Attribute, String>() { - @Override - public String apply(final Attribute it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("("); - String _name_1 = it.getName(); - _builder.append(_name_1, ""); - _builder.append(")"); - return _builder.toString(); - } + final Function1<Attribute, String> _function_1 = (Attribute it) -> { + StringConcatenation _builder_1 = new StringConcatenation(); + String _name_1 = it.getName(); + _builder_1.append(_name_1, ""); + _builder_1.append("("); + String _name_2 = it.getName(); + _builder_1.append(_name_2, ""); + _builder_1.append(")"); + return _builder_1.toString(); }; List<String> _map_1 = ListExtensions.<Attribute, String>map(_attributes, _function_1); Iterables.<CharSequence>addAll(initList, _map_1); 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 610e28d18..7f6cfbfa6 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 @@ -63,11 +63,8 @@ public class Initialization { public CharSequence genExtraInitializers(final Iterable<Attribute> attributes) { CharSequence _xblockexpression = null; { - final Function1<Attribute, Boolean> _function = new Function1<Attribute, Boolean>() { - @Override - public Boolean apply(final Attribute it) { - return Boolean.valueOf(((Objects.equal(Initialization.this.getInitializerListValue(it), null) && (!Objects.equal(Initialization.this.getInitValue(it), null))) && Initialization.this.getInitValue(it).startsWith("{"))); - } + final Function1<Attribute, Boolean> _function = (Attribute it) -> { + return Boolean.valueOf(((Objects.equal(this.getInitializerListValue(it), null) && (!Objects.equal(this.getInitValue(it), null))) && this.getInitValue(it).startsWith("{"))); }; final Iterable<Attribute> extraInitAttrs = IterableExtensions.<Attribute>filter(attributes, _function); boolean _isEmpty = IterableExtensions.isEmpty(extraInitAttrs); @@ -78,12 +75,9 @@ public class Initialization { _builder.append("// extra initialization"); _builder.newLine(); { - final Function1<Attribute, Boolean> _function_1 = new Function1<Attribute, Boolean>() { - @Override - public Boolean apply(final Attribute it) { - int _size = it.getSize(); - return Boolean.valueOf((_size > 0)); - } + final Function1<Attribute, Boolean> _function_1 = (Attribute it) -> { + int _size = it.getSize(); + return Boolean.valueOf((_size > 0)); }; Iterable<Attribute> _filter = IterableExtensions.<Attribute>filter(extraInitAttrs, _function_1); for(final Attribute it : _filter) { @@ -110,12 +104,9 @@ public class Initialization { } } { - final Function1<Attribute, Boolean> _function_2 = new Function1<Attribute, Boolean>() { - @Override - public Boolean apply(final Attribute it) { - int _size = it.getSize(); - return Boolean.valueOf((_size == 0)); - } + final Function1<Attribute, Boolean> _function_2 = (Attribute it_1) -> { + int _size_1 = it_1.getSize(); + return Boolean.valueOf((_size_1 == 0)); }; Iterable<Attribute> _filter_1 = IterableExtensions.<Attribute>filter(extraInitAttrs, _function_2); for(final Attribute it_1 : _filter_1) { diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java index 74632625e..d02e2ac15 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java @@ -19,6 +19,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; import org.eclipse.emf.common.util.EList; import org.eclipse.etrice.core.common.converter.TimeConverter; import org.eclipse.etrice.core.etmap.util.ETMapUtil; @@ -53,7 +54,6 @@ 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; -import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; @Singleton @SuppressWarnings("all") @@ -84,14 +84,11 @@ public class NodeGen { final Map<SubSystemClass, WiredSubSystemClass> sscc2wired = CollectionLiterals.<SubSystemClass, WiredSubSystemClass>newHashMap(); EList<WiredStructureClass> _wiredInstances = root.getWiredInstances(); Iterable<WiredSubSystemClass> _filter = Iterables.<WiredSubSystemClass>filter(_wiredInstances, WiredSubSystemClass.class); - final Procedure1<WiredSubSystemClass> _function = new Procedure1<WiredSubSystemClass>() { - @Override - public void apply(final WiredSubSystemClass it) { - SubSystemClass _subSystemClass = it.getSubSystemClass(); - sscc2wired.put(_subSystemClass, it); - } + final Consumer<WiredSubSystemClass> _function = (WiredSubSystemClass it) -> { + SubSystemClass _subSystemClass = it.getSubSystemClass(); + sscc2wired.put(_subSystemClass, it); }; - IterableExtensions.<WiredSubSystemClass>forEach(_filter, _function); + _filter.forEach(_function); Collection<NodeRef> _nodeRefs = ETMapUtil.getNodeRefs(); for (final NodeRef nr : _nodeRefs) { List<String> _subSystemInstancePaths = ETMapUtil.getSubSystemInstancePaths(nr); @@ -134,11 +131,8 @@ public class NodeGen { final String clsname = this._cppExtensions.getCppClassName(nr, comp); NodeClass _type = nr.getType(); EList<PhysicalThread> _threads = _type.getThreads(); - final Function1<PhysicalThread, Boolean> _function = new Function1<PhysicalThread, Boolean>() { - @Override - public Boolean apply(final PhysicalThread t) { - return Boolean.valueOf(usedThreads.contains(t)); - } + final Function1<PhysicalThread, Boolean> _function = (PhysicalThread t) -> { + return Boolean.valueOf(usedThreads.contains(t)); }; final Iterable<PhysicalThread> threads = IterableExtensions.<PhysicalThread>filter(_threads, _function); StringConcatenation _builder = new StringConcatenation(); @@ -366,18 +360,15 @@ public class NodeGen { _builder.append("SubSystemClassBase(parent, name)"); initList.add(_builder.toString()); EList<ActorRef> _actorRefs = cc.getActorRefs(); - final Function1<ActorRef, String> _function = new Function1<ActorRef, String>() { - @Override - public String apply(final ActorRef it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("(this, \""); - String _name_1 = it.getName(); - _builder.append(_name_1, ""); - _builder.append("\")"); - return _builder.toString(); - } + final Function1<ActorRef, String> _function = (ActorRef it) -> { + StringConcatenation _builder_1 = new StringConcatenation(); + String _name = it.getName(); + _builder_1.append(_name, ""); + _builder_1.append("(this, \""); + String _name_1 = it.getName(); + _builder_1.append(_name_1, ""); + _builder_1.append("\")"); + return _builder_1.toString(); }; List<String> _map = ListExtensions.<ActorRef, String>map(_actorRefs, _function); Iterables.<CharSequence>addAll(initList, _map); @@ -395,11 +386,8 @@ public class NodeGen { final String clsname = this._cppExtensions.getCppClassName(nr, comp); NodeClass _type = nr.getType(); EList<PhysicalThread> _threads = _type.getThreads(); - final Function1<PhysicalThread, Boolean> _function = new Function1<PhysicalThread, Boolean>() { - @Override - public Boolean apply(final PhysicalThread t) { - return Boolean.valueOf(usedThreads.contains(t)); - } + final Function1<PhysicalThread, Boolean> _function = (PhysicalThread t) -> { + return Boolean.valueOf(usedThreads.contains(t)); }; final Iterable<PhysicalThread> threads = IterableExtensions.<PhysicalThread>filter(_threads, _function); StringConcatenation _builder = new StringConcatenation(); @@ -574,12 +562,9 @@ public class NodeGen { _builder.append("IMessageMemory* msgMemory;"); _builder.newLine(); { - final Function1<PhysicalThread, Long> _function_1 = new Function1<PhysicalThread, Long>() { - @Override - public Long apply(final PhysicalThread it) { - long _prio = it.getPrio(); - return Long.valueOf((-_prio)); - } + final Function1<PhysicalThread, Long> _function_1 = (PhysicalThread it) -> { + long _prio = it.getPrio(); + return Long.valueOf((-_prio)); }; List<PhysicalThread> _sortBy = IterableExtensions.<PhysicalThread, Long>sortBy(threads, _function_1); for(final PhysicalThread thread_3 : _sortBy) { 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 a1a46c78d..844f3f2f3 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 @@ -86,11 +86,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { public void doGenerate(final Root root) { EList<ProtocolClass> _usedProtocolClasses = root.getUsedProtocolClasses(); - final Function1<ProtocolClass, Boolean> _function = new Function1<ProtocolClass, Boolean>() { - @Override - public Boolean apply(final ProtocolClass cl) { - return Boolean.valueOf(ProtocolClassGen.this._fileSystemHelpers.isValidGenerationLocation(cl)); - } + final Function1<ProtocolClass, Boolean> _function = (ProtocolClass cl) -> { + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(cl)); }; Iterable<ProtocolClass> _filter = IterableExtensions.<ProtocolClass>filter(_usedProtocolClasses, _function); for (final ProtocolClass pc : _filter) { @@ -925,18 +922,15 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { boolean _notEquals = (!Objects.equal(pc, null)); if (_notEquals) { EList<Attribute> _attributes = pc.getAttributes(); - final Function1<Attribute, String> _function = new Function1<Attribute, String>() { - @Override - public String apply(final Attribute it) { - StringConcatenation _builder = new StringConcatenation(); - String _name = it.getName(); - _builder.append(_name, ""); - _builder.append("("); - String _initializerListValue = initHelper.getInitializerListValue(it); - _builder.append(_initializerListValue, ""); - _builder.append(")"); - return _builder.toString(); - } + final Function1<Attribute, String> _function = (Attribute it) -> { + StringConcatenation _builder_1 = new StringConcatenation(); + String _name = it.getName(); + _builder_1.append(_name, ""); + _builder_1.append("("); + String _initializerListValue = initHelper.getInitializerListValue(it); + _builder_1.append(_initializerListValue, ""); + _builder_1.append(")"); + return _builder_1.toString(); }; List<String> _map = ListExtensions.<Attribute, String>map(_attributes, _function); Iterables.<CharSequence>addAll(initList, _map); @@ -1183,12 +1177,9 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { CharSequence _xblockexpression = null; { List<Message> _allIncomingMessages = this._roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - return Boolean.valueOf((!Objects.equal(_data, null))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + VarDecl _data = m.getData(); + return Boolean.valueOf((!Objects.equal(_data, null))); }; final Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_allIncomingMessages, _function); StringConcatenation _builder = new StringConcatenation(); @@ -1418,12 +1409,9 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { CharSequence _xblockexpression = null; { List<Message> _allIncomingMessages = this._roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - return Boolean.valueOf((!Objects.equal(_data, null))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + VarDecl _data = m.getData(); + return Boolean.valueOf((!Objects.equal(_data, null))); }; final Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_allIncomingMessages, _function); StringConcatenation _builder = new StringConcatenation(); diff --git a/plugins/org.eclipse.etrice.generator.doc/.classpath b/plugins/org.eclipse.etrice.generator.doc/.classpath index c31ca403f..13a6c6528 100644 --- a/plugins/org.eclipse.etrice.generator.doc/.classpath +++ b/plugins/org.eclipse.etrice.generator.doc/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="xtend-gen"/> diff --git a/plugins/org.eclipse.etrice.generator.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.doc/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 956262663..000000000 --- a/plugins/org.eclipse.etrice.generator.doc/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Dec 06 13:36:04 CET 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF index 2bb7bbe4a..b4efe6456 100644 --- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", org.eclipse.xtext.util;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.doc;uses:="org.eclipse.etrice.generator.base", org.eclipse.etrice.generator.doc.gen 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 925d0c37a..9775f4a35 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 @@ -17,6 +17,7 @@ import java.io.File; import java.util.Arrays; import java.util.List; import java.util.Set; +import java.util.function.Consumer; import org.eclipse.emf.common.util.EList; import org.eclipse.etrice.core.common.base.Documentation; import org.eclipse.etrice.core.common.base.util.RelativePathHelpers; @@ -54,7 +55,6 @@ import org.eclipse.xtext.xbase.lib.CollectionLiterals; 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.Procedures.Procedure1; @Singleton @SuppressWarnings("all") @@ -107,119 +107,83 @@ public class DocGen { String _plus = (path + _name_1); this.fileAccess.setOutputPath(_plus); EList<LogicalSystem> _systems = model.getSystems(); - final Procedure1<LogicalSystem> _function = new Procedure1<LogicalSystem>() { - @Override - public void apply(final LogicalSystem it) { - CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx); - String _docFragmentName = DocGen.this.docFragmentName(it); - DocGen.this.saveAs(_generateDoc, _docFragmentName); - } + final Consumer<LogicalSystem> _function = (LogicalSystem it) -> { + CharSequence _generateDoc = this.generateDoc(it, ctx); + String _docFragmentName = this.docFragmentName(it); + this.saveAs(_generateDoc, _docFragmentName); }; - IterableExtensions.<LogicalSystem>forEach(_systems, _function); + _systems.forEach(_function); EList<LogicalSystem> _systems_1 = model.getSystems(); - final Procedure1<LogicalSystem> _function_1 = new Procedure1<LogicalSystem>() { - @Override - public void apply(final LogicalSystem it) { - EList<RoomModel> _referencedModels = root.getReferencedModels(it); - referencedModels.addAll(_referencedModels); - } + final Consumer<LogicalSystem> _function_1 = (LogicalSystem it) -> { + EList<RoomModel> _referencedModels = root.getReferencedModels(it); + referencedModels.addAll(_referencedModels); }; - IterableExtensions.<LogicalSystem>forEach(_systems_1, _function_1); + _systems_1.forEach(_function_1); EList<SubSystemClass> _subSystemClasses = model.getSubSystemClasses(); - final Procedure1<SubSystemClass> _function_2 = new Procedure1<SubSystemClass>() { - @Override - public void apply(final SubSystemClass it) { - CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx); - String _docFragmentName = DocGen.this.docFragmentName(it); - DocGen.this.saveAs(_generateDoc, _docFragmentName); - } + final Consumer<SubSystemClass> _function_2 = (SubSystemClass it) -> { + CharSequence _generateDoc = this.generateDoc(it, ctx); + String _docFragmentName = this.docFragmentName(it); + this.saveAs(_generateDoc, _docFragmentName); }; - IterableExtensions.<SubSystemClass>forEach(_subSystemClasses, _function_2); + _subSystemClasses.forEach(_function_2); EList<SubSystemClass> _subSystemClasses_1 = model.getSubSystemClasses(); - final Procedure1<SubSystemClass> _function_3 = new Procedure1<SubSystemClass>() { - @Override - public void apply(final SubSystemClass it) { - EList<RoomModel> _referencedModels = root.getReferencedModels(it); - referencedModels.addAll(_referencedModels); - } + final Consumer<SubSystemClass> _function_3 = (SubSystemClass it) -> { + EList<RoomModel> _referencedModels = root.getReferencedModels(it); + referencedModels.addAll(_referencedModels); }; - IterableExtensions.<SubSystemClass>forEach(_subSystemClasses_1, _function_3); + _subSystemClasses_1.forEach(_function_3); EList<GeneralProtocolClass> _protocolClasses = model.getProtocolClasses(); - final Procedure1<GeneralProtocolClass> _function_4 = new Procedure1<GeneralProtocolClass>() { - @Override - public void apply(final GeneralProtocolClass it) { - CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx); - String _docFragmentName = DocGen.this.docFragmentName(it); - DocGen.this.saveAs(_generateDoc, _docFragmentName); - } + final Consumer<GeneralProtocolClass> _function_4 = (GeneralProtocolClass it) -> { + CharSequence _generateDoc = this.generateDoc(it, ctx); + String _docFragmentName = this.docFragmentName(it); + this.saveAs(_generateDoc, _docFragmentName); }; - IterableExtensions.<GeneralProtocolClass>forEach(_protocolClasses, _function_4); + _protocolClasses.forEach(_function_4); EList<GeneralProtocolClass> _protocolClasses_1 = model.getProtocolClasses(); - final Procedure1<GeneralProtocolClass> _function_5 = new Procedure1<GeneralProtocolClass>() { - @Override - public void apply(final GeneralProtocolClass it) { - EList<RoomModel> _referencedModels = root.getReferencedModels(it); - referencedModels.addAll(_referencedModels); - } + final Consumer<GeneralProtocolClass> _function_5 = (GeneralProtocolClass it) -> { + EList<RoomModel> _referencedModels = root.getReferencedModels(it); + referencedModels.addAll(_referencedModels); }; - IterableExtensions.<GeneralProtocolClass>forEach(_protocolClasses_1, _function_5); + _protocolClasses_1.forEach(_function_5); EList<EnumerationType> _enumerationTypes = model.getEnumerationTypes(); - final Procedure1<EnumerationType> _function_6 = new Procedure1<EnumerationType>() { - @Override - public void apply(final EnumerationType it) { - CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx); - String _docFragmentName = DocGen.this.docFragmentName(it); - DocGen.this.saveAs(_generateDoc, _docFragmentName); - } + final Consumer<EnumerationType> _function_6 = (EnumerationType it) -> { + CharSequence _generateDoc = this.generateDoc(it, ctx); + String _docFragmentName = this.docFragmentName(it); + this.saveAs(_generateDoc, _docFragmentName); }; - IterableExtensions.<EnumerationType>forEach(_enumerationTypes, _function_6); + _enumerationTypes.forEach(_function_6); EList<EnumerationType> _enumerationTypes_1 = model.getEnumerationTypes(); - final Procedure1<EnumerationType> _function_7 = new Procedure1<EnumerationType>() { - @Override - public void apply(final EnumerationType it) { - EList<RoomModel> _referencedModels = root.getReferencedModels(it); - referencedModels.addAll(_referencedModels); - } + final Consumer<EnumerationType> _function_7 = (EnumerationType it) -> { + EList<RoomModel> _referencedModels = root.getReferencedModels(it); + referencedModels.addAll(_referencedModels); }; - IterableExtensions.<EnumerationType>forEach(_enumerationTypes_1, _function_7); + _enumerationTypes_1.forEach(_function_7); EList<DataClass> _dataClasses = model.getDataClasses(); - final Procedure1<DataClass> _function_8 = new Procedure1<DataClass>() { - @Override - public void apply(final DataClass it) { - CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx); - String _docFragmentName = DocGen.this.docFragmentName(it); - DocGen.this.saveAs(_generateDoc, _docFragmentName); - } + final Consumer<DataClass> _function_8 = (DataClass it) -> { + CharSequence _generateDoc = this.generateDoc(it, ctx); + String _docFragmentName = this.docFragmentName(it); + this.saveAs(_generateDoc, _docFragmentName); }; - IterableExtensions.<DataClass>forEach(_dataClasses, _function_8); + _dataClasses.forEach(_function_8); EList<DataClass> _dataClasses_1 = model.getDataClasses(); - final Procedure1<DataClass> _function_9 = new Procedure1<DataClass>() { - @Override - public void apply(final DataClass it) { - EList<RoomModel> _referencedModels = root.getReferencedModels(it); - referencedModels.addAll(_referencedModels); - } + final Consumer<DataClass> _function_9 = (DataClass it) -> { + EList<RoomModel> _referencedModels = root.getReferencedModels(it); + referencedModels.addAll(_referencedModels); }; - IterableExtensions.<DataClass>forEach(_dataClasses_1, _function_9); + _dataClasses_1.forEach(_function_9); EList<ActorClass> _actorClasses = model.getActorClasses(); - final Procedure1<ActorClass> _function_10 = new Procedure1<ActorClass>() { - @Override - public void apply(final ActorClass it) { - CharSequence _generateDoc = DocGen.this.generateDoc(it, ctx); - String _docFragmentName = DocGen.this.docFragmentName(it); - DocGen.this.saveAs(_generateDoc, _docFragmentName); - } + final Consumer<ActorClass> _function_10 = (ActorClass it) -> { + CharSequence _generateDoc = this.generateDoc(it, ctx); + String _docFragmentName = this.docFragmentName(it); + this.saveAs(_generateDoc, _docFragmentName); }; - IterableExtensions.<ActorClass>forEach(_actorClasses, _function_10); + _actorClasses.forEach(_function_10); EList<ActorClass> _actorClasses_1 = model.getActorClasses(); - final Procedure1<ActorClass> _function_11 = new Procedure1<ActorClass>() { - @Override - public void apply(final ActorClass it) { - EList<RoomModel> _referencedModels = root.getReferencedModels(it); - referencedModels.addAll(_referencedModels); - } + final Consumer<ActorClass> _function_11 = (ActorClass it) -> { + EList<RoomModel> _referencedModels = root.getReferencedModels(it); + referencedModels.addAll(_referencedModels); }; - IterableExtensions.<ActorClass>forEach(_actorClasses_1, _function_11); + _actorClasses_1.forEach(_function_11); this.fileAccess.setOutputPath(path); CharSequence _generateModelDoc = this.generateModelDoc(ctx, referencedModels); this.saveAs(_generateModelDoc, file); @@ -437,11 +401,8 @@ public class DocGen { _builder.append("\\begin{itemize}"); _builder.newLine(); { - final Function1<RoomModel, String> _function = new Function1<RoomModel, String>() { - @Override - public String apply(final RoomModel it) { - return it.getName(); - } + final Function1<RoomModel, String> _function = (RoomModel it) -> { + return it.getName(); }; List<RoomModel> _sortBy = IterableExtensions.<RoomModel, String>sortBy(referencedModels, _function); for(final RoomModel refModel : _sortBy) { diff --git a/plugins/org.eclipse.etrice.generator.fsm/.classpath b/plugins/org.eclipse.etrice.generator.fsm/.classpath index 358df1bc1..ef5811bf8 100644 --- a/plugins/org.eclipse.etrice.generator.fsm/.classpath +++ b/plugins/org.eclipse.etrice.generator.fsm/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.fsm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.fsm/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.generator.fsm/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF index 07b2ef509..42ea8f456 100644 --- a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Generator for Finite State Machines Bundle-SymbolicName: org.eclipse.etrice.generator.fsm Bundle-Version: 1.1.1.qualifier Bundle-Vendor: eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.fsm.base, org.eclipse.etrice.generator.fsm.generic Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", diff --git a/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java b/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java index 2117b584f..c11e78fd6 100644 --- a/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java +++ b/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java @@ -696,11 +696,8 @@ public abstract class AbstractStateMachineGenerator { final List<State> baseStateList = this._fSMHelpers.getBaseStateList(_stateMachine_1); _builder.newLineIfNotEmpty(); _builder.append("\t"); - final Function1<State, Boolean> _function = new Function1<State, Boolean>() { - @Override - public Boolean apply(final State s) { - return Boolean.valueOf(AbstractStateMachineGenerator.this._fSMHelpers.hasEntryCode(s, true)); - } + final Function1<State, Boolean> _function = (State s) -> { + return Boolean.valueOf(this._fSMHelpers.hasEntryCode(s, true)); }; Iterable<State> _filter = IterableExtensions.<State>filter(baseStateList, _function); boolean _isEmpty = IterableExtensions.isEmpty(_filter); @@ -1470,11 +1467,8 @@ public abstract class AbstractStateMachineGenerator { _builder.append(_genDoCodes, ""); _builder.newLineIfNotEmpty(); List<Transition> _outgoingTransitionsHierarchical = this._fSMExtensions.getOutgoingTransitionsHierarchical(xpmc, state); - final Function1<Transition, Boolean> _function = new Function1<Transition, Boolean>() { - @Override - public Boolean apply(final Transition t) { - return Boolean.valueOf((t instanceof GuardedTransition)); - } + final Function1<Transition, Boolean> _function = (Transition t) -> { + return Boolean.valueOf((t instanceof GuardedTransition)); }; Iterable<Transition> transitions = IterableExtensions.<Transition>filter(_outgoingTransitionsHierarchical, _function); _builder.newLineIfNotEmpty(); @@ -1751,11 +1745,8 @@ public abstract class AbstractStateMachineGenerator { } StateGraph _stateMachine_1 = xpmc.getStateMachine(); List<TrPoint> _allTrPointsRecursive = this._fSMHelpers.getAllTrPointsRecursive(_stateMachine_1); - final Function1<TrPoint, Boolean> _function = new Function1<TrPoint, Boolean>() { - @Override - public Boolean apply(final TrPoint t) { - return Boolean.valueOf(((t instanceof TransitionPoint) && ((TransitionPoint) t).isHandler())); - } + final Function1<TrPoint, Boolean> _function = (TrPoint t) -> { + return Boolean.valueOf(((t instanceof TransitionPoint) && ((TransitionPoint) t).isHandler())); }; Iterable<TrPoint> _filter = IterableExtensions.<TrPoint>filter(_allTrPointsRecursive, _function); boolean _isEmpty_1 = IterableExtensions.isEmpty(_filter); diff --git a/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/FSMExtensions.java b/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/FSMExtensions.java index c4c8c242e..6273eba1d 100644 --- a/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/FSMExtensions.java +++ b/plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/FSMExtensions.java @@ -114,19 +114,13 @@ public class FSMExtensions { public List<State> getLeafStatesLast(final List<State> states) { List<State> _xblockexpression = null; { - final Function1<State, Boolean> _function = new Function1<State, Boolean>() { - @Override - public Boolean apply(final State s) { - return Boolean.valueOf(FSMExtensions.this._fSMHelpers.isLeaf(s)); - } + final Function1<State, Boolean> _function = (State s) -> { + return Boolean.valueOf(this._fSMHelpers.isLeaf(s)); }; final Iterable<State> leaf = IterableExtensions.<State>filter(states, _function); - final Function1<State, Boolean> _function_1 = new Function1<State, Boolean>() { - @Override - public Boolean apply(final State s) { - boolean _isLeaf = FSMExtensions.this._fSMHelpers.isLeaf(s); - return Boolean.valueOf((!_isLeaf)); - } + final Function1<State, Boolean> _function_1 = (State s) -> { + boolean _isLeaf = this._fSMHelpers.isLeaf(s); + return Boolean.valueOf((!_isLeaf)); }; final Iterable<State> nonLeaf = IterableExtensions.<State>filter(states, _function_1); _xblockexpression = this.<State>union(nonLeaf, leaf); diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/.classpath b/plugins/org.eclipse.etrice.generator.fsmtest.ui/.classpath index 6c8f56046..7785d7be7 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/.classpath +++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/.classpath @@ -7,6 +7,6 @@ <accessrule kind="accessible" pattern="org/eclipse/xtext/ui/codetemplates/ui/partialEditing/IPartialContentAssistParser"/> </accessrules> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.fsmtest.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF index 3501c5075..3488486d6 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.etrice.generator.fsmtest;visibility:=reexport, org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0", org.eclipse.compare Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.ui.contentassist, org.eclipse.etrice.generator.ui.contentassist.antlr, org.eclipse.etrice.generator.ui.internal diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/.classpath b/plugins/org.eclipse.etrice.generator.fsmtest/.classpath index ff7256004..b8f18c26b 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/.classpath +++ b/plugins/org.eclipse.etrice.generator.fsmtest/.classpath @@ -4,6 +4,6 @@ <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="xtend-gen"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.fsmtest/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.generator.fsmtest/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF index f7b48330c..2889332a9 100644 --- a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.common.types;bundle-version="2.6.0" Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator, org.eclipse.etrice.generator.services, org.eclipse.etrice.generator.fsmtest, diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/.classpath b/plugins/org.eclipse.etrice.generator.gnuplot/.classpath index 5cef82c24..3e8f94782 100644 --- a/plugins/org.eclipse.etrice.generator.gnuplot/.classpath +++ b/plugins/org.eclipse.etrice.generator.gnuplot/.classpath @@ -3,6 +3,6 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="xtend-gen"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.gnuplot/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.generator.gnuplot/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF index f166e8630..438c6c882 100644 --- a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.core.runtime;bundle-version="3.10.0", org.eclipse.etrice.generator.doc;bundle-version="1.1.1", org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/xtend-gen/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.java b/plugins/org.eclipse.etrice.generator.gnuplot/xtend-gen/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.java index 62b144c05..f6275baa0 100644 --- a/plugins/org.eclipse.etrice.generator.gnuplot/xtend-gen/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.java +++ b/plugins/org.eclipse.etrice.generator.gnuplot/xtend-gen/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.java @@ -54,13 +54,10 @@ public class GnuplotScriptGenerator { final SubSystemInstance ssi = IterableExtensions.<SubSystemInstance>head(_subSystemInstances_1); SubSystemClass _subSystemClass = ssi.getSubSystemClass(); EList<Annotation> _annotations = _subSystemClass.getAnnotations(); - final Function1<Annotation, Boolean> _function = new Function1<Annotation, Boolean>() { - @Override - public Boolean apply(final Annotation a) { - AnnotationType _type = a.getType(); - String _name = _type.getName(); - return Boolean.valueOf(Objects.equal(_name, "Gnuplot")); - } + final Function1<Annotation, Boolean> _function = (Annotation a) -> { + AnnotationType _type = a.getType(); + String _name = _type.getName(); + return Boolean.valueOf(Objects.equal(_name, "Gnuplot")); }; boolean _exists = IterableExtensions.<Annotation>exists(_annotations, _function); boolean _not = (!_exists); @@ -111,12 +108,9 @@ public class GnuplotScriptGenerator { protected KeyValue getAttribute(final Annotation anno, final String name) { EList<KeyValue> _attributes = anno.getAttributes(); - final Function1<KeyValue, Boolean> _function = new Function1<KeyValue, Boolean>() { - @Override - public Boolean apply(final KeyValue attr) { - String _key = attr.getKey(); - return Boolean.valueOf(Objects.equal(_key, name)); - } + final Function1<KeyValue, Boolean> _function = (KeyValue attr) -> { + String _key = attr.getKey(); + return Boolean.valueOf(Objects.equal(_key, name)); }; return IterableExtensions.<KeyValue>findFirst(_attributes, _function); } @@ -171,13 +165,10 @@ public class GnuplotScriptGenerator { { SubSystemClass _subSystemClass = ssi.getSubSystemClass(); EList<Annotation> _annotations = _subSystemClass.getAnnotations(); - final Function1<Annotation, Boolean> _function = new Function1<Annotation, Boolean>() { - @Override - public Boolean apply(final Annotation a) { - AnnotationType _type = a.getType(); - String _name = _type.getName(); - return Boolean.valueOf(Objects.equal(_name, "Gnuplot")); - } + final Function1<Annotation, Boolean> _function = (Annotation a) -> { + AnnotationType _type = a.getType(); + String _name = _type.getName(); + return Boolean.valueOf(Objects.equal(_name, "Gnuplot")); }; Iterable<Annotation> _filter = IterableExtensions.<Annotation>filter(_annotations, _function); final Annotation plotAnnotation = IterableExtensions.<Annotation>head(_filter); @@ -235,13 +226,10 @@ public class GnuplotScriptGenerator { final Number fontsize = ((Number)_elvis); SubSystemClass _subSystemClass_1 = ssi.getSubSystemClass(); EList<Annotation> _annotations_1 = _subSystemClass_1.getAnnotations(); - final Function1<Annotation, Boolean> _function_1 = new Function1<Annotation, Boolean>() { - @Override - public Boolean apply(final Annotation a) { - AnnotationType _type = a.getType(); - String _name = _type.getName(); - return Boolean.valueOf(Objects.equal(_name, "GnuplotGraph")); - } + final Function1<Annotation, Boolean> _function_1 = (Annotation a) -> { + AnnotationType _type = a.getType(); + String _name = _type.getName(); + return Boolean.valueOf(Objects.equal(_name, "GnuplotGraph")); }; Iterable<Annotation> _filter_1 = IterableExtensions.<Annotation>filter(_annotations_1, _function_1); final List<Annotation> graphAnnotations = IterableExtensions.<Annotation>toList(_filter_1); diff --git a/plugins/org.eclipse.etrice.generator.java.mvn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.java.mvn/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd49..000000000 --- a/plugins/org.eclipse.etrice.generator.java.mvn/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.java/.classpath b/plugins/org.eclipse.etrice.generator.java/.classpath index c31ca403f..13a6c6528 100644 --- a/plugins/org.eclipse.etrice.generator.java/.classpath +++ b/plugins/org.eclipse.etrice.generator.java/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="xtend-gen"/> diff --git a/plugins/org.eclipse.etrice.generator.java/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.java/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 956262663..000000000 --- a/plugins/org.eclipse.etrice.generator.java/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Dec 06 13:36:04 CET 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF index e6c07cddd..6efbb9b3d 100644 --- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.java, org.eclipse.etrice.generator.java.gen, org.eclipse.etrice.generator.java.setup diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java index 953079288..e4e78ba9a 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java @@ -14,6 +14,7 @@ import com.google.common.base.Objects; import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.HashMap; +import java.util.function.Consumer; import org.eclipse.emf.common.util.EList; import org.eclipse.etrice.core.fsm.fSM.ModelComponent; import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass; @@ -32,7 +33,6 @@ import org.eclipse.xtend2.lib.StringConcatenation; 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.Procedures.Procedure1; @Singleton @SuppressWarnings("all") @@ -59,28 +59,19 @@ public class ActorClassDataGen { public void doGenerate(final Root root) { final HashMap<ActorClass, WiredActorClass> ac2wired = new HashMap<ActorClass, WiredActorClass>(); EList<WiredStructureClass> _wiredInstances = root.getWiredInstances(); - final Function1<WiredStructureClass, Boolean> _function = new Function1<WiredStructureClass, Boolean>() { - @Override - public Boolean apply(final WiredStructureClass w) { - return Boolean.valueOf((w instanceof WiredActorClass)); - } + final Function1<WiredStructureClass, Boolean> _function = (WiredStructureClass w) -> { + return Boolean.valueOf((w instanceof WiredActorClass)); }; Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function); - final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() { - @Override - public void apply(final WiredStructureClass w) { - ActorClass _actorClass = ((WiredActorClass) w).getActorClass(); - ac2wired.put(_actorClass, ((WiredActorClass) w)); - } + final Consumer<WiredStructureClass> _function_1 = (WiredStructureClass w) -> { + ActorClass _actorClass = ((WiredActorClass) w).getActorClass(); + ac2wired.put(_actorClass, ((WiredActorClass) w)); }; - IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1); + _filter.forEach(_function_1); EList<ExpandedActorClass> _xpActorClasses = root.getXpActorClasses(); - final Function1<ExpandedActorClass, Boolean> _function_2 = new Function1<ExpandedActorClass, Boolean>() { - @Override - public Boolean apply(final ExpandedActorClass cl) { - ActorClass _actorClass = cl.getActorClass(); - return Boolean.valueOf(ActorClassDataGen.this._fileSystemHelpers.isValidGenerationLocation(_actorClass)); - } + final Function1<ExpandedActorClass, Boolean> _function_2 = (ExpandedActorClass cl) -> { + ActorClass _actorClass = cl.getActorClass(); + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(_actorClass)); }; Iterable<ExpandedActorClass> _filter_1 = IterableExtensions.<ExpandedActorClass>filter(_xpActorClasses, _function_2); for (final ExpandedActorClass xpac : _filter_1) { 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 5da68973e..a94b81219 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 @@ -15,6 +15,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.HashMap; import java.util.List; +import java.util.function.Consumer; import org.eclipse.emf.common.util.EList; import org.eclipse.etrice.core.fsm.fSM.ComponentCommunicationType; import org.eclipse.etrice.core.fsm.fSM.StateGraph; @@ -58,7 +59,6 @@ import org.eclipse.xtend2.lib.StringConcatenation; 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.Procedures.Procedure1; import org.eclipse.xtext.xbase.lib.StringExtensions; @Singleton @@ -108,28 +108,19 @@ public class ActorClassGen extends GenericActorClassGenerator { public void doGenerate(final Root root) { final HashMap<ActorClass, WiredActorClass> ac2wired = new HashMap<ActorClass, WiredActorClass>(); EList<WiredStructureClass> _wiredInstances = root.getWiredInstances(); - final Function1<WiredStructureClass, Boolean> _function = new Function1<WiredStructureClass, Boolean>() { - @Override - public Boolean apply(final WiredStructureClass w) { - return Boolean.valueOf((w instanceof WiredActorClass)); - } + final Function1<WiredStructureClass, Boolean> _function = (WiredStructureClass w) -> { + return Boolean.valueOf((w instanceof WiredActorClass)); }; Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function); - final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() { - @Override - public void apply(final WiredStructureClass w) { - ActorClass _actorClass = ((WiredActorClass) w).getActorClass(); - ac2wired.put(_actorClass, ((WiredActorClass) w)); - } + final Consumer<WiredStructureClass> _function_1 = (WiredStructureClass w) -> { + ActorClass _actorClass = ((WiredActorClass) w).getActorClass(); + ac2wired.put(_actorClass, ((WiredActorClass) w)); }; - IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1); + _filter.forEach(_function_1); EList<ExpandedActorClass> _xpActorClasses = root.getXpActorClasses(); - final Function1<ExpandedActorClass, Boolean> _function_2 = new Function1<ExpandedActorClass, Boolean>() { - @Override - public Boolean apply(final ExpandedActorClass cl) { - ActorClass _actorClass = cl.getActorClass(); - return Boolean.valueOf(ActorClassGen.this._fileSystemHelpers.isValidGenerationLocation(_actorClass)); - } + final Function1<ExpandedActorClass, Boolean> _function_2 = (ExpandedActorClass cl) -> { + ActorClass _actorClass = cl.getActorClass(); + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(_actorClass)); }; Iterable<ExpandedActorClass> _filter_1 = IterableExtensions.<ExpandedActorClass>filter(_xpActorClasses, _function_2); for (final ExpandedActorClass xpac : _filter_1) { @@ -282,12 +273,9 @@ public class ActorClassGen extends GenericActorClassGenerator { } { EList<ActorRef> _actorRefs = ac.getActorRefs(); - final Function1<ActorRef, Boolean> _function = new Function1<ActorRef, Boolean>() { - @Override - public Boolean apply(final ActorRef r) { - ReferenceType _refType = r.getRefType(); - return Boolean.valueOf(Objects.equal(_refType, ReferenceType.OPTIONAL)); - } + final Function1<ActorRef, Boolean> _function = (ActorRef r) -> { + ReferenceType _refType = r.getRefType(); + return Boolean.valueOf(Objects.equal(_refType, ReferenceType.OPTIONAL)); }; Iterable<ActorRef> _filter = IterableExtensions.<ActorRef>filter(_actorRefs, _function); for(final ActorRef sub : _filter) { @@ -389,12 +377,9 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.newLine(); { EList<ActorRef> _actorRefs_1 = ac.getActorRefs(); - final Function1<ActorRef, Boolean> _function_1 = new Function1<ActorRef, Boolean>() { - @Override - public Boolean apply(final ActorRef r) { - ReferenceType _refType = r.getRefType(); - return Boolean.valueOf(Objects.equal(_refType, ReferenceType.OPTIONAL)); - } + final Function1<ActorRef, Boolean> _function_1 = (ActorRef r) -> { + ReferenceType _refType = r.getRefType(); + return Boolean.valueOf(Objects.equal(_refType, ReferenceType.OPTIONAL)); }; Iterable<ActorRef> _filter_1 = IterableExtensions.<ActorRef>filter(_actorRefs_1, _function_1); for(final ActorRef sub_1 : _filter_1) { @@ -1684,58 +1669,34 @@ public class ActorClassGen extends GenericActorClassGenerator { private String getSaveMethod(final String type) { String _switchResult = null; - boolean _matched = false; - if (Objects.equal(type, "boolean")) { - _matched=true; - _switchResult = "writeBoolean"; - } - if (!_matched) { - if (Objects.equal(type, "char")) { - _matched=true; + switch (type) { + case "boolean": + _switchResult = "writeBoolean"; + break; + case "char": _switchResult = "writeChar"; - } - } - if (!_matched) { - if (Objects.equal(type, "byte")) { - _matched=true; + break; + case "byte": _switchResult = "writeByte"; - } - } - if (!_matched) { - if (Objects.equal(type, "short")) { - _matched=true; + break; + case "short": _switchResult = "writeShort"; - } - } - if (!_matched) { - if (Objects.equal(type, "int")) { - _matched=true; + break; + case "int": _switchResult = "write"; - } - } - if (!_matched) { - if (Objects.equal(type, "long")) { - _matched=true; + break; + case "long": _switchResult = "writeLong"; - } - } - if (!_matched) { - if (Objects.equal(type, "float")) { - _matched=true; + break; + case "float": _switchResult = "writeFloat"; - } - } - if (!_matched) { - if (Objects.equal(type, "double")) { - _matched=true; + break; + case "double": _switchResult = "writeDouble"; - } - } - if (!_matched) { - if (Objects.equal(type, "String")) { - _matched=true; + break; + case "String": _switchResult = "writeUTF"; - } + break; } return _switchResult; } @@ -1778,58 +1739,34 @@ public class ActorClassGen extends GenericActorClassGenerator { private String getLoadMethod(final String type) { String _switchResult = null; - boolean _matched = false; - if (Objects.equal(type, "boolean")) { - _matched=true; - _switchResult = "readBoolean"; - } - if (!_matched) { - if (Objects.equal(type, "char")) { - _matched=true; + switch (type) { + case "boolean": + _switchResult = "readBoolean"; + break; + case "char": _switchResult = "readChar"; - } - } - if (!_matched) { - if (Objects.equal(type, "byte")) { - _matched=true; + break; + case "byte": _switchResult = "readByte"; - } - } - if (!_matched) { - if (Objects.equal(type, "short")) { - _matched=true; + break; + case "short": _switchResult = "readShort"; - } - } - if (!_matched) { - if (Objects.equal(type, "int")) { - _matched=true; + break; + case "int": _switchResult = "read"; - } - } - if (!_matched) { - if (Objects.equal(type, "long")) { - _matched=true; + break; + case "long": _switchResult = "readLong"; - } - } - if (!_matched) { - if (Objects.equal(type, "float")) { - _matched=true; + break; + case "float": _switchResult = "readFloat"; - } - } - if (!_matched) { - if (Objects.equal(type, "double")) { - _matched=true; + break; + case "double": _switchResult = "readDouble"; - } - } - if (!_matched) { - if (Objects.equal(type, "String")) { - _matched=true; + break; + case "String": _switchResult = "readUTF"; - } + break; } return _switchResult; } 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 882669fd4..6f2960ad2 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 @@ -459,25 +459,19 @@ public class ConfigGenAddon { private String getMinMaxType(final PrimitiveType type) { String _switchResult = null; String _typeName = this.typeHelpers.typeName(type); - boolean _matched = false; - if (Objects.equal(_typeName, "byte")) { - _matched=true; - _switchResult = "int"; - } - if (!_matched) { - if (Objects.equal(_typeName, "short")) { - _matched=true; + switch (_typeName) { + case "byte": _switchResult = "int"; - } - } - if (!_matched) { - if (Objects.equal(_typeName, "float")) { - _matched=true; + break; + case "short": + _switchResult = "int"; + break; + case "float": _switchResult = "double"; - } - } - if (!_matched) { - _switchResult = this.typeHelpers.typeName(type); + break; + default: + _switchResult = this.typeHelpers.typeName(type); + break; } return _switchResult; } 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 d2451a8db..c0497456a 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 @@ -66,11 +66,8 @@ public class DataClassGen { public void doGenerate(final Root root) { EList<DataClass> _usedDataClasses = root.getUsedDataClasses(); - final Function1<DataClass, Boolean> _function = new Function1<DataClass, Boolean>() { - @Override - public Boolean apply(final DataClass cl) { - return Boolean.valueOf(DataClassGen.this._fileSystemHelpers.isValidGenerationLocation(cl)); - } + final Function1<DataClass, Boolean> _function = (DataClass cl) -> { + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(cl)); }; Iterable<DataClass> _filter = IterableExtensions.<DataClass>filter(_usedDataClasses, _function); for (final DataClass dc : _filter) { diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.java index 83928974c..932972f8a 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.java @@ -46,11 +46,8 @@ public class EnumerationTypeGen { public void doGenerate(final Root root) { EList<EnumerationType> _usedEnumClasses = root.getUsedEnumClasses(); - final Function1<EnumerationType, Boolean> _function = new Function1<EnumerationType, Boolean>() { - @Override - public Boolean apply(final EnumerationType cl) { - return Boolean.valueOf(EnumerationTypeGen.this._fileSystemHelpers.isValidGenerationLocation(cl)); - } + final Function1<EnumerationType, Boolean> _function = (EnumerationType cl) -> { + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(cl)); }; Iterable<EnumerationType> _filter = IterableExtensions.<EnumerationType>filter(_usedEnumClasses, _function); for (final EnumerationType et : _filter) { 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 cf0adcc41..5dd7d5d04 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 @@ -126,19 +126,16 @@ public class JavaExtensions implements ILanguageExtension { public String toWrapper(final String type) { String _switchResult = null; - boolean _matched = false; - if (Objects.equal(type, "int")) { - _matched=true; - _switchResult = "Integer"; - } - if (!_matched) { - if (Objects.equal(type, "char")) { - _matched=true; + switch (type) { + case "int": + _switchResult = "Integer"; + break; + case "char": _switchResult = "Character"; - } - } - if (!_matched) { - _switchResult = StringExtensions.toFirstUpper(type); + break; + default: + _switchResult = StringExtensions.toFirstUpper(type); + break; } return _switchResult; } @@ -358,50 +355,29 @@ public class JavaExtensions implements ILanguageExtension { private String castValue(final PrimitiveType type, final String value) { String _switchResult = null; String _targetName = type.getTargetName(); - boolean _matched = false; - if (Objects.equal(_targetName, "boolean")) { - _matched=true; - _switchResult = value.toLowerCase(); - } - if (!_matched) { - if (Objects.equal(_targetName, "byte")) { - _matched=true; + switch (_targetName) { + case "boolean": + _switchResult = value.toLowerCase(); + break; + case "byte": _switchResult = ("(byte)" + value); - } - } - if (!_matched) { - if (Objects.equal(_targetName, "short")) { - _matched=true; + break; + case "short": _switchResult = ("(short)" + value); - } - } - if (!_matched) { - if (Objects.equal(_targetName, "int")) { - _matched=true; + break; + case "int": _switchResult = value; - } - } - if (!_matched) { - if (Objects.equal(_targetName, "long")) { - _matched=true; + break; + case "long": _switchResult = (value + "L"); - } - } - if (!_matched) { - if (Objects.equal(_targetName, "float")) { - _matched=true; + break; + case "float": _switchResult = (value + "f"); - } - } - if (!_matched) { - if (Objects.equal(_targetName, "double")) { - _matched=true; + break; + case "double": _switchResult = (value + "d"); - } - } - if (!_matched) { - if (Objects.equal(_targetName, "char")) { - _matched=true; + break; + case "char": String _xifexpression = null; boolean _isEmpty = value.isEmpty(); if (_isEmpty) { @@ -423,20 +399,16 @@ public class JavaExtensions implements ILanguageExtension { _xifexpression = _xifexpression_1; } _switchResult = _xifexpression; - } - } - if (!_matched) { - if (Objects.equal(_targetName, "String")) { - _matched=true; + break; + case "String": String _replace_2 = value.replace("\\", "\\\\"); String _replace_3 = _replace_2.replace("\"", "\\\""); String _plus_2 = ("\"" + _replace_3); _switchResult = (_plus_2 + "\""); - } - } - if (!_matched) { - String _targetName_1 = type.getTargetName(); - throw new UnsupportedOperationException(_targetName_1); + break; + default: + String _targetName_1 = type.getTargetName(); + throw new UnsupportedOperationException(_targetName_1); } return _switchResult; } diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java index d1eba88ce..97e91558c 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java @@ -22,6 +22,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.function.Consumer; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.TreeIterator; @@ -72,7 +73,6 @@ import org.eclipse.xtext.xbase.lib.Functions.Function1; import org.eclipse.xtext.xbase.lib.IterableExtensions; import org.eclipse.xtext.xbase.lib.IteratorExtensions; import org.eclipse.xtext.xbase.lib.ListExtensions; -import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; @Singleton @SuppressWarnings("all") @@ -111,21 +111,15 @@ public class NodeGen { public void doGenerate(final Root root) { final HashMap<SubSystemClass, WiredSubSystemClass> sscc2wired = new HashMap<SubSystemClass, WiredSubSystemClass>(); EList<WiredStructureClass> _wiredInstances = root.getWiredInstances(); - final Function1<WiredStructureClass, Boolean> _function = new Function1<WiredStructureClass, Boolean>() { - @Override - public Boolean apply(final WiredStructureClass w) { - return Boolean.valueOf((w instanceof WiredSubSystemClass)); - } + final Function1<WiredStructureClass, Boolean> _function = (WiredStructureClass w) -> { + return Boolean.valueOf((w instanceof WiredSubSystemClass)); }; Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function); - final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() { - @Override - public void apply(final WiredStructureClass w) { - SubSystemClass _subSystemClass = ((WiredSubSystemClass) w).getSubSystemClass(); - sscc2wired.put(_subSystemClass, ((WiredSubSystemClass) w)); - } + final Consumer<WiredStructureClass> _function_1 = (WiredStructureClass w) -> { + SubSystemClass _subSystemClass = ((WiredSubSystemClass) w).getSubSystemClass(); + sscc2wired.put(_subSystemClass, ((WiredSubSystemClass) w)); }; - IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1); + _filter.forEach(_function_1); Collection<NodeRef> _nodeRefs = ETMapUtil.getNodeRefs(); for (final NodeRef nr : _nodeRefs) { List<String> _subSystemInstancePaths = ETMapUtil.getSubSystemInstancePaths(nr); @@ -166,26 +160,17 @@ public class NodeGen { */ private HashSet<ActorClass> getOptionalActorClasses(final Root root, final StructureInstance si) { TreeIterator<EObject> _eAllContents = si.eAllContents(); - final Function1<EObject, Boolean> _function = new Function1<EObject, Boolean>() { - @Override - public Boolean apply(final EObject i) { - return Boolean.valueOf((i instanceof ActorInterfaceInstance)); - } + final Function1<EObject, Boolean> _function = (EObject i) -> { + return Boolean.valueOf((i instanceof ActorInterfaceInstance)); }; Iterator<EObject> _filter = IteratorExtensions.<EObject>filter(_eAllContents, _function); - final Function1<EObject, ActorInterfaceInstance> _function_1 = new Function1<EObject, ActorInterfaceInstance>() { - @Override - public ActorInterfaceInstance apply(final EObject aii) { - return ((ActorInterfaceInstance) aii); - } + final Function1<EObject, ActorInterfaceInstance> _function_1 = (EObject aii) -> { + return ((ActorInterfaceInstance) aii); }; Iterator<ActorInterfaceInstance> _map = IteratorExtensions.<EObject, ActorInterfaceInstance>map(_filter, _function_1); final ArrayList<ActorInterfaceInstance> aifs = Lists.<ActorInterfaceInstance>newArrayList(_map); - final Function1<ActorInterfaceInstance, ActorClass> _function_2 = new Function1<ActorInterfaceInstance, ActorClass>() { - @Override - public ActorClass apply(final ActorInterfaceInstance aii) { - return ((ActorInterfaceInstance) aii).getActorClass(); - } + final Function1<ActorInterfaceInstance, ActorClass> _function_2 = (ActorInterfaceInstance aii) -> { + return ((ActorInterfaceInstance) aii).getActorClass(); }; List<ActorClass> _map_1 = ListExtensions.<ActorInterfaceInstance, ActorClass>map(aifs, _function_2); final HashSet<ActorClass> result = Sets.<ActorClass>newHashSet(_map_1); @@ -208,11 +193,8 @@ public class NodeGen { final String clsname = this._javaExtensions.getJavaClassName(nr, comp); NodeClass _type = nr.getType(); EList<PhysicalThread> _threads = _type.getThreads(); - final Function1<PhysicalThread, Boolean> _function = new Function1<PhysicalThread, Boolean>() { - @Override - public Boolean apply(final PhysicalThread t) { - return Boolean.valueOf(usedThreads.contains(t)); - } + final Function1<PhysicalThread, Boolean> _function = (PhysicalThread t) -> { + return Boolean.valueOf(usedThreads.contains(t)); }; final Iterable<PhysicalThread> threads = IterableExtensions.<PhysicalThread>filter(_threads, _function); final HashSet<ActorClass> opt = this.getOptionalActorClasses(root, comp); @@ -331,12 +313,9 @@ public class NodeGen { _builder.append("IMessageService msgService;"); _builder.newLine(); { - final Function1<PhysicalThread, Long> _function_1 = new Function1<PhysicalThread, Long>() { - @Override - public Long apply(final PhysicalThread it) { - long _prio = it.getPrio(); - return Long.valueOf((-_prio)); - } + final Function1<PhysicalThread, Long> _function_1 = (PhysicalThread it) -> { + long _prio = it.getPrio(); + return Long.valueOf((-_prio)); }; List<PhysicalThread> _sortBy = IterableExtensions.<PhysicalThread, Long>sortBy(threads, _function_1); for(final PhysicalThread thread_1 : _sortBy) { @@ -495,18 +474,12 @@ public class NodeGen { _builder.newLine(); { BasicEList<AbstractInstance> _allSubInstances = this._roomExtensions.getAllSubInstances(comp); - final Function1<AbstractInstance, Boolean> _function_2 = new Function1<AbstractInstance, Boolean>() { - @Override - public Boolean apply(final AbstractInstance inst) { - return Boolean.valueOf((inst instanceof ActorInterfaceInstance)); - } + final Function1<AbstractInstance, Boolean> _function_2 = (AbstractInstance inst) -> { + return Boolean.valueOf((inst instanceof ActorInterfaceInstance)); }; Iterable<AbstractInstance> _filter = IterableExtensions.<AbstractInstance>filter(_allSubInstances, _function_2); - final Function1<AbstractInstance, ActorInterfaceInstance> _function_3 = new Function1<AbstractInstance, ActorInterfaceInstance>() { - @Override - public ActorInterfaceInstance apply(final AbstractInstance inst) { - return ((ActorInterfaceInstance) inst); - } + final Function1<AbstractInstance, ActorInterfaceInstance> _function_3 = (AbstractInstance inst) -> { + return ((ActorInterfaceInstance) inst); }; Iterable<ActorInterfaceInstance> _map = IterableExtensions.<AbstractInstance, ActorInterfaceInstance>map(_filter, _function_3); for(final ActorInterfaceInstance aii : _map) { @@ -768,12 +741,9 @@ public class NodeGen { { EList<ActorClass> _subClasses = root.getSubClasses(oa); List<ActorClass> _union = this._roomExtensions.<ActorClass>union(_subClasses, oa); - final Function1<ActorClass, Boolean> _function_4 = new Function1<ActorClass, Boolean>() { - @Override - public Boolean apply(final ActorClass s) { - boolean _isAbstract = s.isAbstract(); - return Boolean.valueOf((!_isAbstract)); - } + final Function1<ActorClass, Boolean> _function_4 = (ActorClass s) -> { + boolean _isAbstract = s.isAbstract(); + return Boolean.valueOf((!_isAbstract)); }; Iterable<ActorClass> _filter_1 = IterableExtensions.<ActorClass>filter(_union, _function_4); for(final ActorClass subcls : _filter_1) { diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java index b8cab302d..751ba4211 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java @@ -4,6 +4,7 @@ import com.google.common.base.Objects; import com.google.inject.Inject; import java.util.HashMap; import java.util.List; +import java.util.function.Consumer; import org.eclipse.emf.common.util.EList; import org.eclipse.etrice.core.genmodel.etricegen.OpenBinding; import org.eclipse.etrice.core.genmodel.etricegen.OpenServiceConnection; @@ -24,7 +25,6 @@ import org.eclipse.xtend2.lib.StringConcatenation; 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.Procedures.Procedure1; @SuppressWarnings("all") public class OptionalActorFactoryGen { @@ -50,28 +50,19 @@ public class OptionalActorFactoryGen { public void doGenerate(final Root root) { final HashMap<ActorClass, WiredActorClass> ac2wired = new HashMap<ActorClass, WiredActorClass>(); EList<WiredStructureClass> _wiredInstances = root.getWiredInstances(); - final Function1<WiredStructureClass, Boolean> _function = new Function1<WiredStructureClass, Boolean>() { - @Override - public Boolean apply(final WiredStructureClass w) { - return Boolean.valueOf((w instanceof WiredActorClass)); - } + final Function1<WiredStructureClass, Boolean> _function = (WiredStructureClass w) -> { + return Boolean.valueOf((w instanceof WiredActorClass)); }; Iterable<WiredStructureClass> _filter = IterableExtensions.<WiredStructureClass>filter(_wiredInstances, _function); - final Procedure1<WiredStructureClass> _function_1 = new Procedure1<WiredStructureClass>() { - @Override - public void apply(final WiredStructureClass w) { - ActorClass _actorClass = ((WiredActorClass) w).getActorClass(); - ac2wired.put(_actorClass, ((WiredActorClass) w)); - } + final Consumer<WiredStructureClass> _function_1 = (WiredStructureClass w) -> { + ActorClass _actorClass = ((WiredActorClass) w).getActorClass(); + ac2wired.put(_actorClass, ((WiredActorClass) w)); }; - IterableExtensions.<WiredStructureClass>forEach(_filter, _function_1); + _filter.forEach(_function_1); EList<OptionalActorInstance> _optionalInstances = root.getOptionalInstances(); - final Function1<OptionalActorInstance, Boolean> _function_2 = new Function1<OptionalActorInstance, Boolean>() { - @Override - public Boolean apply(final OptionalActorInstance cl) { - ActorClass _actorClass = cl.getActorClass(); - return Boolean.valueOf(OptionalActorFactoryGen.this._fileSystemHelpers.isValidGenerationLocation(_actorClass)); - } + final Function1<OptionalActorInstance, Boolean> _function_2 = (OptionalActorInstance cl) -> { + ActorClass _actorClass = cl.getActorClass(); + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(_actorClass)); }; Iterable<OptionalActorInstance> _filter_1 = IterableExtensions.<OptionalActorInstance>filter(_optionalInstances, _function_2); for (final OptionalActorInstance oi : _filter_1) { @@ -148,11 +139,8 @@ public class OptionalActorFactoryGen { _builder.newLine(); { List<Port> _allEndPorts = this._roomHelpers.getAllEndPorts(ac); - final Function1<Port, Boolean> _function = new Function1<Port, Boolean>() { - @Override - public Boolean apply(final Port p) { - return Boolean.valueOf(OptionalActorFactoryGen.this._roomHelpers.isExternal(p)); - } + final Function1<Port, Boolean> _function = (Port p) -> { + return Boolean.valueOf(this._roomHelpers.isExternal(p)); }; Iterable<Port> _filter = IterableExtensions.<Port>filter(_allEndPorts, _function); for(final Port port : _filter) { diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.java index c8f833f60..26ed3bf43 100644 --- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.java +++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.java @@ -49,11 +49,8 @@ public class OptionalActorInterfaceGen extends GenericActorClassGenerator { public void doGenerate(final Root root) { EList<ActorClass> _optionalActorClasses = root.getOptionalActorClasses(); - final Function1<ActorClass, Boolean> _function = new Function1<ActorClass, Boolean>() { - @Override - public Boolean apply(final ActorClass cl) { - return Boolean.valueOf(OptionalActorInterfaceGen.this._fileSystemHelpers.isValidGenerationLocation(cl)); - } + final Function1<ActorClass, Boolean> _function = (ActorClass cl) -> { + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(cl)); }; Iterable<ActorClass> _filter = IterableExtensions.<ActorClass>filter(_optionalActorClasses, _function); for (final ActorClass ac : _filter) { 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 8fa0e63ce..aee53016d 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 @@ -85,11 +85,8 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { public void doGenerate(final Root root) { EList<ProtocolClass> _usedProtocolClasses = root.getUsedProtocolClasses(); - final Function1<ProtocolClass, Boolean> _function = new Function1<ProtocolClass, Boolean>() { - @Override - public Boolean apply(final ProtocolClass cl) { - return Boolean.valueOf(ProtocolClassGen.this._fileSystemHelpers.isValidGenerationLocation(cl)); - } + final Function1<ProtocolClass, Boolean> _function = (ProtocolClass cl) -> { + return Boolean.valueOf(this._fileSystemHelpers.isValidGenerationLocation(cl)); }; Iterable<ProtocolClass> _filter = IterableExtensions.<ProtocolClass>filter(_usedProtocolClasses, _function); for (final ProtocolClass pc : _filter) { @@ -826,12 +823,9 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator { CharSequence _xblockexpression = null; { List<Message> _allIncomingMessages = this._roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, Boolean> _function = new Function1<Message, Boolean>() { - @Override - public Boolean apply(final Message m) { - VarDecl _data = m.getData(); - return Boolean.valueOf((!Objects.equal(_data, null))); - } + final Function1<Message, Boolean> _function = (Message m) -> { + VarDecl _data = m.getData(); + return Boolean.valueOf((!Objects.equal(_data, null))); }; final Iterable<Message> sentMsgs = IterableExtensions.<Message>filter(_allIncomingMessages, _function); final EList<RoomModel> models = root.getReferencedModels(pc); 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 91d7954e7..7609e782b 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 @@ -21,6 +21,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; +import java.util.function.Consumer; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.etrice.core.common.converter.TimeConverter; @@ -47,7 +48,6 @@ 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.Procedures.Procedure1; import org.eclipse.xtext.xbase.lib.StringExtensions; @Singleton @@ -104,19 +104,16 @@ public class VariableServiceGen { final String clsname = this.stdExt.getJavaClassName(nr, comp); final HashMap<ActorInstance, List<Attribute>> aisAttrMap = new HashMap<ActorInstance, List<Attribute>>(); EList<ActorInstance> _allContainedInstances = comp.getAllContainedInstances(); - final Procedure1<ActorInstance> _function = new Procedure1<ActorInstance>() { - @Override - public void apply(final ActorInstance ai) { - List<Attribute> _dynConfigReadAttributes = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai); - boolean _isEmpty = _dynConfigReadAttributes.isEmpty(); - boolean _not = (!_isEmpty); - if (_not) { - List<Attribute> _dynConfigReadAttributes_1 = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai); - aisAttrMap.put(ai, _dynConfigReadAttributes_1); - } + final Consumer<ActorInstance> _function = (ActorInstance ai) -> { + List<Attribute> _dynConfigReadAttributes = this.configExt.getDynConfigReadAttributes(ai); + boolean _isEmpty = _dynConfigReadAttributes.isEmpty(); + boolean _not = (!_isEmpty); + if (_not) { + List<Attribute> _dynConfigReadAttributes_1 = this.configExt.getDynConfigReadAttributes(ai); + aisAttrMap.put(ai, _dynConfigReadAttributes_1); } }; - IterableExtensions.<ActorInstance>forEach(_allContainedInstances, _function); + _allContainedInstances.forEach(_function); StringConcatenation _builder = new StringConcatenation(); _builder.newLine(); _builder.append("package "); @@ -563,27 +560,21 @@ public class VariableServiceGen { private HashSet<DataClass> getDynConfigDataClasses(final Iterable<ActorInstance> ais) { final HashSet<DataClass> result = new HashSet<DataClass>(); - final Procedure1<ActorInstance> _function = new Procedure1<ActorInstance>() { - @Override - public void apply(final ActorInstance ai) { - List<Attribute> _dynConfigReadAttributes = VariableServiceGen.this.configExt.getDynConfigReadAttributes(ai); - final Procedure1<Attribute> _function = new Procedure1<Attribute>() { - @Override - public void apply(final Attribute a) { - RefableType _type = a.getType(); - DataType _type_1 = _type.getType(); - boolean _isDataClass = VariableServiceGen.this._typeHelpers.isDataClass(_type_1); - if (_isDataClass) { - RefableType _type_2 = a.getType(); - DataType _type_3 = _type_2.getType(); - result.add(((DataClass) _type_3)); - } - } - }; - IterableExtensions.<Attribute>forEach(_dynConfigReadAttributes, _function); - } + final Consumer<ActorInstance> _function = (ActorInstance ai) -> { + List<Attribute> _dynConfigReadAttributes = this.configExt.getDynConfigReadAttributes(ai); + final Consumer<Attribute> _function_1 = (Attribute a) -> { + RefableType _type = a.getType(); + DataType _type_1 = _type.getType(); + boolean _isDataClass = this._typeHelpers.isDataClass(_type_1); + if (_isDataClass) { + RefableType _type_2 = a.getType(); + DataType _type_3 = _type_2.getType(); + result.add(((DataClass) _type_3)); + } + }; + _dynConfigReadAttributes.forEach(_function_1); }; - IterableExtensions.<ActorInstance>forEach(ais, _function); + ais.forEach(_function); return result; } @@ -596,20 +587,17 @@ public class VariableServiceGen { { DataClass dc = visit.pop(); List<Attribute> _allAttributes = this._roomHelpers.getAllAttributes(dc); - final Procedure1<Attribute> _function = new Procedure1<Attribute>() { - @Override - public void apply(final Attribute a) { - RefableType _type = a.getType(); - DataType _type_1 = _type.getType(); - boolean _isDataClass = VariableServiceGen.this._typeHelpers.isDataClass(_type_1); - if (_isDataClass) { - RefableType _type_2 = a.getType(); - DataType _type_3 = _type_2.getType(); - visit.add(((DataClass) _type_3)); - } + final Consumer<Attribute> _function = (Attribute a) -> { + RefableType _type = a.getType(); + DataType _type_1 = _type.getType(); + boolean _isDataClass = this._typeHelpers.isDataClass(_type_1); + if (_isDataClass) { + RefableType _type_2 = a.getType(); + DataType _type_3 = _type_2.getType(); + visit.add(((DataClass) _type_3)); } }; - IterableExtensions.<Attribute>forEach(_allAttributes, _function); + _allAttributes.forEach(_function); } } return result; @@ -617,15 +605,12 @@ public class VariableServiceGen { private HashSet<RoomModel> getRoomModels(final Collection<ActorInstance> ais) { final HashSet<RoomModel> models = new HashSet<RoomModel>(); - final Procedure1<ActorInstance> _function = new Procedure1<ActorInstance>() { - @Override - public void apply(final ActorInstance ai) { - ActorClass _actorClass = ai.getActorClass(); - EObject _eContainer = _actorClass.eContainer(); - models.add(((RoomModel) _eContainer)); - } + final Consumer<ActorInstance> _function = (ActorInstance ai) -> { + ActorClass _actorClass = ai.getActorClass(); + EObject _eContainer = _actorClass.eContainer(); + models.add(((RoomModel) _eContainer)); }; - IterableExtensions.<ActorInstance>forEach(ais, _function); + ais.forEach(_function); return models; } diff --git a/plugins/org.eclipse.etrice.generator.launch.c/.classpath b/plugins/org.eclipse.etrice.generator.launch.c/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.generator.launch.c/.classpath +++ b/plugins/org.eclipse.etrice.generator.launch.c/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.launch.c/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.launch.c/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c6c26402c..000000000 --- a/plugins/org.eclipse.etrice.generator.launch.c/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Tue Aug 30 16:50:14 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF index 540ecfb46..52edbfecf 100644 --- a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.core.variables;bundle-version="3.2.500", org.eclipse.etrice.generator.ui;bundle-version="1.1.1" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, org.eclipse.ui.dialogs Bundle-Vendor: Eclipse eTrice diff --git a/plugins/org.eclipse.etrice.generator.launch.cpp/.classpath b/plugins/org.eclipse.etrice.generator.launch.cpp/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.generator.launch.cpp/.classpath +++ b/plugins/org.eclipse.etrice.generator.launch.cpp/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.launch.cpp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.launch.cpp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c6c26402c..000000000 --- a/plugins/org.eclipse.etrice.generator.launch.cpp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Tue Aug 30 16:50:14 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF index 796f80a3f..47c0ec3c6 100644 --- a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.core.variables;bundle-version="3.2.500", org.eclipse.etrice.core.genmodel;bundle-version="1.1.1" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, org.eclipse.ui.dialogs Bundle-Vendor: Eclipse eTrice diff --git a/plugins/org.eclipse.etrice.generator.launch.java/.classpath b/plugins/org.eclipse.etrice.generator.launch.java/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.generator.launch.java/.classpath +++ b/plugins/org.eclipse.etrice.generator.launch.java/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.launch.java/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.launch.java/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c6c26402c..000000000 --- a/plugins/org.eclipse.etrice.generator.launch.java/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Tue Aug 30 16:50:14 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF index 939e4a9e0..ba0d656db 100644 --- a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.core.variables;bundle-version="3.2.500", org.eclipse.etrice.generator.ui;bundle-version="1.1.1" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, org.eclipse.ui.dialogs Bundle-Vendor: Eclipse eTrice diff --git a/plugins/org.eclipse.etrice.generator.launch/.classpath b/plugins/org.eclipse.etrice.generator.launch/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.generator.launch/.classpath +++ b/plugins/org.eclipse.etrice.generator.launch/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.launch/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.launch/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c6c26402c..000000000 --- a/plugins/org.eclipse.etrice.generator.launch/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Tue Aug 30 16:50:14 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF index 8313fc010..6d365789b 100644 --- a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.jdt.launching, org.eclipse.ui.ide Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Export-Package: org.eclipse.etrice.generator.launch diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/.classpath b/plugins/org.eclipse.etrice.generator.ui.cdt/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.generator.ui.cdt/.classpath +++ b/plugins/org.eclipse.etrice.generator.ui.cdt/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.ui.cdt/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.generator.ui.cdt/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF index f97fd5e9b..730341885 100644 --- a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: CDT integration of eTrice Bundle-SymbolicName: org.eclipse.etrice.generator.ui.cdt;singleton:=true Bundle-Version: 1.1.1.qualifier Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="1.1.1", org.eclipse.cdt.core;bundle-version="5.5.0", org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.0", diff --git a/plugins/org.eclipse.etrice.generator.ui/.classpath b/plugins/org.eclipse.etrice.generator.ui/.classpath index 358df1bc1..ef5811bf8 100644 --- a/plugins/org.eclipse.etrice.generator.ui/.classpath +++ b/plugins/org.eclipse.etrice.generator.ui/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.generator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.generator.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.generator.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF index ce678650d..fe072c7a7 100644 --- a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Generator UI Bundle-SymbolicName: org.eclipse.etrice.generator.ui;singleton:=true Bundle-Version: 1.1.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.1", org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.1", diff --git a/plugins/org.eclipse.etrice.generator/.classpath b/plugins/org.eclipse.etrice.generator/.classpath index 6f1310fc4..3906c3b82 100644 --- a/plugins/org.eclipse.etrice.generator/.classpath +++ b/plugins/org.eclipse.etrice.generator/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF index 7430c0344..34933a83b 100644 --- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.etrice.generator;singleton:=true Bundle-Version: 1.1.1.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.base, org.eclipse.etrice.generator.generic Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", 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 554c06303..d31d8c586 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 @@ -122,11 +122,8 @@ public class GenericStateMachineGenerator extends AbstractStateMachineGenerator String _xblockexpression = null; { EList<Trigger> _triggers = tt.getTriggers(); - final Function1<Trigger, Boolean> _function = new Function1<Trigger, Boolean>() { - @Override - public Boolean apply(final Trigger e) { - return Boolean.valueOf(mc.isMatching(e, trigger)); - } + final Function1<Trigger, Boolean> _function = (Trigger e) -> { + return Boolean.valueOf(mc.isMatching(e, trigger)); }; final Trigger tr = IterableExtensions.<Trigger>findFirst(_triggers, _function); StringConcatenation _builder = new StringConcatenation(); @@ -162,12 +159,9 @@ public class GenericStateMachineGenerator extends AbstractStateMachineGenerator String _xblockexpression = null; { EList<TransitionChain> chain = xpmc.getChains(tr); - boolean hasArgs = ((!chain.isEmpty()) && IterableExtensions.<TransitionChain>forall(chain, new Function1<TransitionChain, Boolean>() { - @Override - public Boolean apply(final TransitionChain it) { - return Boolean.valueOf(((it.getTransition() instanceof NonInitialTransition) && (!(it.getTransition() instanceof GuardedTransition)))); - } - })); + boolean hasArgs = ((!chain.isEmpty()) && IterableExtensions.<TransitionChain>forall(chain, ((Function1<TransitionChain, Boolean>) (TransitionChain it) -> { + return Boolean.valueOf(((it.getTransition() instanceof NonInitialTransition) && (!(it.getTransition() instanceof GuardedTransition)))); + }))); String _className = this.getClassName(xpmc); final String opScope = this.langExt.operationScope(_className, false); String _xifexpression = null; 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 c0ee94e10..4c6cebeb3 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 @@ -388,14 +388,11 @@ public class ProcedureHelpers { * @return an argument list for the attributes */ public String argList(final Iterable<Attribute> attributes) { - final Function1<Attribute, String> _function = new Function1<Attribute, String>() { - @Override - public String apply(final Attribute it) { - String _signatureString = ProcedureHelpers.this.signatureString(it); - String _plus = (_signatureString + " "); - String _name = it.getName(); - return (_plus + _name); - } + final Function1<Attribute, String> _function = (Attribute it) -> { + String _signatureString = this.signatureString(it); + String _plus = (_signatureString + " "); + String _name = it.getName(); + return (_plus + _name); }; Iterable<String> _map = IterableExtensions.<Attribute, String>map(attributes, _function); return IterableExtensions.join(_map, ", "); @@ -561,12 +558,9 @@ public class ProcedureHelpers { boolean _usesInheritance = this.languageExt.usesInheritance(); boolean _not = (!_usesInheritance); List<ClassStructor> _structors = this.getStructors(cls, _not); - final Function1<ClassStructor, Boolean> _function = new Function1<ClassStructor, Boolean>() { - @Override - public Boolean apply(final ClassStructor it) { - boolean _isConstructor = it.isConstructor(); - return Boolean.valueOf((_isConstructor == ctor)); - } + final Function1<ClassStructor, Boolean> _function = (ClassStructor it) -> { + boolean _isConstructor = it.isConstructor(); + return Boolean.valueOf((_isConstructor == ctor)); }; boolean _exists = IterableExtensions.<ClassStructor>exists(_structors, _function); if (_exists) { @@ -603,11 +597,8 @@ public class ProcedureHelpers { boolean _usesInheritance = this.languageExt.usesInheritance(); boolean _not = (!_usesInheritance); List<ClassStructor> _structors = this.getStructors(cls, _not); - final Function1<ClassStructor, Boolean> _function = new Function1<ClassStructor, Boolean>() { - @Override - public Boolean apply(final ClassStructor it) { - return Boolean.valueOf(it.isConstructor()); - } + final Function1<ClassStructor, Boolean> _function = (ClassStructor it) -> { + return Boolean.valueOf(it.isConstructor()); }; boolean _exists = IterableExtensions.<ClassStructor>exists(_structors, _function); if (_exists) { @@ -619,12 +610,9 @@ public class ProcedureHelpers { boolean _usesInheritance_1 = this.languageExt.usesInheritance(); boolean _not_1 = (!_usesInheritance_1); List<ClassStructor> _structors_1 = this.getStructors(cls, _not_1); - final Function1<ClassStructor, Boolean> _function_1 = new Function1<ClassStructor, Boolean>() { - @Override - public Boolean apply(final ClassStructor it) { - boolean _isConstructor = it.isConstructor(); - return Boolean.valueOf((!_isConstructor)); - } + final Function1<ClassStructor, Boolean> _function_1 = (ClassStructor it) -> { + boolean _isConstructor = it.isConstructor(); + return Boolean.valueOf((!_isConstructor)); }; boolean _exists_1 = IterableExtensions.<ClassStructor>exists(_structors_1, _function_1); if (_exists_1) { @@ -666,12 +654,9 @@ public class ProcedureHelpers { boolean _usesInheritance = this.languageExt.usesInheritance(); boolean _not = (!_usesInheritance); List<ClassStructor> _structors = this.getStructors(cls, _not); - final Function1<ClassStructor, Boolean> _function = new Function1<ClassStructor, Boolean>() { - @Override - public Boolean apply(final ClassStructor it) { - boolean _isConstructor = it.isConstructor(); - return Boolean.valueOf((_isConstructor == ctor)); - } + final Function1<ClassStructor, Boolean> _function = (ClassStructor it) -> { + boolean _isConstructor = it.isConstructor(); + return Boolean.valueOf((_isConstructor == ctor)); }; boolean _exists = IterableExtensions.<ClassStructor>exists(_structors, _function); boolean _not_1 = (!_exists); @@ -720,42 +705,30 @@ public class ProcedureHelpers { boolean _usesInheritance = this.languageExt.usesInheritance(); boolean _not = (!_usesInheritance); List<ClassStructor> _structors = this.getStructors(cls, _not); - final Function1<ClassStructor, Boolean> _function = new Function1<ClassStructor, Boolean>() { - @Override - public Boolean apply(final ClassStructor it) { - boolean _isConstructor = it.isConstructor(); - return Boolean.valueOf((_isConstructor == ctor)); - } + final Function1<ClassStructor, Boolean> _function = (ClassStructor it) -> { + boolean _isConstructor = it.isConstructor(); + return Boolean.valueOf((_isConstructor == ctor)); }; final Iterable<ClassStructor> implementedStructors = IterableExtensions.<ClassStructor>filter(_structors, _function); - final Function1<ClassStructor, DetailCode> _function_1 = new Function1<ClassStructor, DetailCode>() { - @Override - public DetailCode apply(final ClassStructor it) { - return it.getDetailCode(); - } + final Function1<ClassStructor, DetailCode> _function_1 = (ClassStructor it) -> { + return it.getDetailCode(); }; Iterable<DetailCode> _map = IterableExtensions.<ClassStructor, DetailCode>map(implementedStructors, _function_1); - final Function1<DetailCode, String> _function_2 = new Function1<DetailCode, String>() { - @Override - public String apply(final DetailCode it) { - AbstractGenerator _instance = AbstractGenerator.getInstance(); - return _instance.getTranslatedCode(it); - } + final Function1<DetailCode, String> _function_2 = (DetailCode it) -> { + AbstractGenerator _instance = AbstractGenerator.getInstance(); + return _instance.getTranslatedCode(it); }; final Iterable<String> translatedCodes = IterableExtensions.<DetailCode, String>map(_map, _function_2); - final Function1<String, CharSequence> _function_3 = new Function1<String, CharSequence>() { - @Override - public CharSequence apply(final String it) { - CharSequence _xifexpression = null; - int _size = IterableExtensions.size(translatedCodes); - boolean _greaterThan = (_size > 1); - if (_greaterThan) { - _xifexpression = ProcedureHelpers.this.asBlock(it); - } else { - _xifexpression = it; - } - return _xifexpression; + final Function1<String, CharSequence> _function_3 = (String it) -> { + CharSequence _xifexpression = null; + int _size = IterableExtensions.size(translatedCodes); + boolean _greaterThan = (_size > 1); + if (_greaterThan) { + _xifexpression = this.asBlock(it); + } else { + _xifexpression = it; } + return _xifexpression; }; Iterable<CharSequence> _map_1 = IterableExtensions.<String, CharSequence>map(translatedCodes, _function_3); String _join = IterableExtensions.join(_map_1); 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 1095bc38b..730f7758f 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 @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.function.Consumer; import javax.inject.Inject; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; @@ -51,7 +52,6 @@ import org.eclipse.xtext.xbase.lib.CollectionLiterals; 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.Procedures.Procedure1; /** * collection of convenience functions for code generation @@ -103,14 +103,11 @@ public class RoomExtensions extends FSMExtensions { */ public List<Port> punion(final Iterable<Port> in1, final Iterable<ExternalPort> in2) { final ArrayList<Port> ret = new ArrayList<Port>(); - final Procedure1<ExternalPort> _function = new Procedure1<ExternalPort>() { - @Override - public void apply(final ExternalPort e) { - Port _interfacePort = e.getInterfacePort(); - ret.add(_interfacePort); - } + final Consumer<ExternalPort> _function = (ExternalPort e) -> { + Port _interfacePort = e.getInterfacePort(); + ret.add(_interfacePort); }; - IterableExtensions.<ExternalPort>forEach(in2, _function); + in2.forEach(_function); Iterables.<Port>addAll(ret, in1); return ret; } @@ -561,12 +558,9 @@ public class RoomExtensions extends FSMExtensions { public MessageHandler getSendHandler(final Message m, final boolean conj) { EObject _eContainer = m.eContainer(); List<MessageHandler> _sendHandlers = this.getSendHandlers(((ProtocolClass) _eContainer), conj); - final Function1<MessageHandler, Boolean> _function = new Function1<MessageHandler, Boolean>() { - @Override - public Boolean apply(final MessageHandler e) { - Message _msg = e.getMsg(); - return Boolean.valueOf(Objects.equal(_msg, m)); - } + final Function1<MessageHandler, Boolean> _function = (MessageHandler e) -> { + Message _msg = e.getMsg(); + return Boolean.valueOf(Objects.equal(_msg, m)); }; return IterableExtensions.<MessageHandler>findFirst(_sendHandlers, _function); } @@ -603,12 +597,9 @@ public class RoomExtensions extends FSMExtensions { * void return type */ public boolean overridesStop(final ActorClass ac) { - return (IterableExtensions.<StandardOperation>exists(ac.getOperations(), new Function1<StandardOperation, Boolean>() { - @Override - public Boolean apply(final StandardOperation e) { - return Boolean.valueOf(((Objects.equal(e.getName(), "stop") && e.getArguments().isEmpty()) && Objects.equal(e.getReturnType(), null))); - } - }) || ((!Objects.equal(ac.getActorBase(), null)) && this.overridesStop(ac.getActorBase()))); + return (IterableExtensions.<StandardOperation>exists(ac.getOperations(), ((Function1<StandardOperation, Boolean>) (StandardOperation e) -> { + return Boolean.valueOf(((Objects.equal(e.getName(), "stop") && e.getArguments().isEmpty()) && Objects.equal(e.getReturnType(), null))); + })) || ((!Objects.equal(ac.getActorBase(), null)) && this.overridesStop(ac.getActorBase()))); } public BasicEList<AbstractInstance> getAllSubInstances(final StructureInstance ssi) { diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TestInstanceCreator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TestInstanceCreator.java index 892084209..aa46cc204 100644 --- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TestInstanceCreator.java +++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TestInstanceCreator.java @@ -7,10 +7,12 @@ import java.util.List; import java.util.function.Consumer; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.etrice.core.common.base.Annotation; +import org.eclipse.etrice.core.common.base.AnnotationType; import org.eclipse.etrice.core.etmap.eTMap.ETMapFactory; import org.eclipse.etrice.core.etmap.eTMap.Mapping; import org.eclipse.etrice.core.etmap.eTMap.MappingModel; @@ -71,93 +73,73 @@ public class TestInstanceCreator { { final ArrayList<RoomModel> roomModels = CollectionLiterals.<RoomModel>newArrayList(); final ArrayList<PhysicalModel> physModels = CollectionLiterals.<PhysicalModel>newArrayList(); - final Consumer<Resource> _function = new Consumer<Resource>() { - @Override - public void accept(final Resource it) { - final Function1<EObject, Boolean> _function = new Function1<EObject, Boolean>() { - @Override - public Boolean apply(final EObject it) { - boolean _switchResult = false; - boolean _matched = false; - if (it instanceof RoomModel) { - _matched=true; - _switchResult = roomModels.add(((RoomModel)it)); - } - if (!_matched) { - if (it instanceof PhysicalModel) { - _matched=true; - _switchResult = physModels.add(((PhysicalModel)it)); - } - } - return Boolean.valueOf(_switchResult); + EList<Resource> _resources = rs.getResources(); + final Consumer<Resource> _function = (Resource it) -> { + EList<EObject> _contents = it.getContents(); + final Function1<EObject, Boolean> _function_1 = (EObject it_1) -> { + boolean _switchResult = false; + boolean _matched = false; + if (it_1 instanceof RoomModel) { + _matched=true; + _switchResult = roomModels.add(((RoomModel)it_1)); + } + if (!_matched) { + if (it_1 instanceof PhysicalModel) { + _matched=true; + _switchResult = physModels.add(((PhysicalModel)it_1)); } - }; - IterableExtensions.<EObject>forall(it.getContents(), _function); - } + } + return Boolean.valueOf(_switchResult); + }; + IterableExtensions.<EObject>forall(_contents, _function_1); }; - rs.getResources().forEach(_function); - final Function2<ArrayList<SubSystemClass>, RoomModel, ArrayList<SubSystemClass>> _function_1 = new Function2<ArrayList<SubSystemClass>, RoomModel, ArrayList<SubSystemClass>>() { - @Override - public ArrayList<SubSystemClass> apply(final ArrayList<SubSystemClass> list, final RoomModel model) { - final Function1<SubSystemClass, Boolean> _function = new Function1<SubSystemClass, Boolean>() { - @Override - public Boolean apply(final SubSystemClass it) { - return Boolean.valueOf(TestInstanceCreator.this.hasTestAnnotation(it)); - } - }; - Iterable<SubSystemClass> _filter = IterableExtensions.<SubSystemClass>filter(model.getSubSystemClasses(), _function); - Iterables.<SubSystemClass>addAll(list, _filter); - return list; - } + _resources.forEach(_function); + ArrayList<SubSystemClass> _newArrayList = CollectionLiterals.<SubSystemClass>newArrayList(); + final Function2<ArrayList<SubSystemClass>, RoomModel, ArrayList<SubSystemClass>> _function_1 = (ArrayList<SubSystemClass> list, RoomModel model) -> { + EList<SubSystemClass> _subSystemClasses = model.getSubSystemClasses(); + final Function1<SubSystemClass, Boolean> _function_2 = (SubSystemClass it) -> { + return Boolean.valueOf(this.hasTestAnnotation(it)); + }; + Iterable<SubSystemClass> _filter = IterableExtensions.<SubSystemClass>filter(_subSystemClasses, _function_2); + Iterables.<SubSystemClass>addAll(list, _filter); + return list; }; - final ArrayList<SubSystemClass> allTestSubSystems = IterableExtensions.<RoomModel, ArrayList<SubSystemClass>>fold(roomModels, CollectionLiterals.<SubSystemClass>newArrayList(), _function_1); + final ArrayList<SubSystemClass> allTestSubSystems = IterableExtensions.<RoomModel, ArrayList<SubSystemClass>>fold(roomModels, _newArrayList, _function_1); final List<StructureClass> allAnnotatedClasses = CollectionLiterals.<StructureClass>newArrayList(((StructureClass[])Conversions.unwrapArray(allTestSubSystems, StructureClass.class))); { SubSystemClass _createSubSystemClass = this._roomFactory.createSubSystemClass(); - final Procedure1<SubSystemClass> _function_2 = new Procedure1<SubSystemClass>() { - @Override - public void apply(final SubSystemClass it) { - it.setName("DerivedTestSubSystem"); - } + final Procedure1<SubSystemClass> _function_2 = (SubSystemClass it) -> { + it.setName("DerivedTestSubSystem"); }; final SubSystemClass derivedSubSystem = ObjectExtensions.<SubSystemClass>operator_doubleArrow(_createSubSystemClass, _function_2); - final Consumer<RoomModel> _function_3 = new Consumer<RoomModel>() { - @Override - public void accept(final RoomModel model) { - EList<ActorRef> _actorRefs = derivedSubSystem.getActorRefs(); - final Function1<ActorClass, Boolean> _function = new Function1<ActorClass, Boolean>() { - @Override - public Boolean apply(final ActorClass it) { - return Boolean.valueOf(TestInstanceCreator.this.hasTestAnnotation(it)); - } - }; - final Function1<ActorClass, ActorRef> _function_1 = new Function1<ActorClass, ActorRef>() { - @Override - public ActorRef apply(final ActorClass ac) { - ActorRef _xblockexpression = null; - { - allAnnotatedClasses.add(ac); - ActorRef _createActorRef = TestInstanceCreator.this._roomFactory.createActorRef(); - final Procedure1<ActorRef> _function = new Procedure1<ActorRef>() { - @Override - public void apply(final ActorRef it) { - String _name = ac.getName(); - String _plus = ("ref_" + _name); - it.setName(_plus); - it.setType(ac); - } - }; - _xblockexpression = ObjectExtensions.<ActorRef>operator_doubleArrow(_createActorRef, _function); - } - return _xblockexpression; - } - }; - Iterable<ActorRef> _map = IterableExtensions.<ActorClass, ActorRef>map(IterableExtensions.<ActorClass>filter(model.getActorClasses(), _function), _function_1); - Iterables.<ActorRef>addAll(_actorRefs, _map); - } + final Consumer<RoomModel> _function_3 = (RoomModel model) -> { + EList<ActorRef> _actorRefs = derivedSubSystem.getActorRefs(); + EList<ActorClass> _actorClasses = model.getActorClasses(); + final Function1<ActorClass, Boolean> _function_4 = (ActorClass it) -> { + return Boolean.valueOf(this.hasTestAnnotation(it)); + }; + Iterable<ActorClass> _filter = IterableExtensions.<ActorClass>filter(_actorClasses, _function_4); + final Function1<ActorClass, ActorRef> _function_5 = (ActorClass ac) -> { + ActorRef _xblockexpression_1 = null; + { + allAnnotatedClasses.add(ac); + ActorRef _createActorRef = this._roomFactory.createActorRef(); + final Procedure1<ActorRef> _function_6 = (ActorRef it) -> { + String _name = ac.getName(); + String _plus = ("ref_" + _name); + it.setName(_plus); + it.setType(ac); + }; + _xblockexpression_1 = ObjectExtensions.<ActorRef>operator_doubleArrow(_createActorRef, _function_6); + } + return _xblockexpression_1; + }; + Iterable<ActorRef> _map = IterableExtensions.<ActorClass, ActorRef>map(_filter, _function_5); + Iterables.<ActorRef>addAll(_actorRefs, _map); }; roomModels.forEach(_function_3); - boolean _isEmpty = derivedSubSystem.getActorRefs().isEmpty(); + EList<ActorRef> _actorRefs = derivedSubSystem.getActorRefs(); + boolean _isEmpty = _actorRefs.isEmpty(); boolean _not = (!_isEmpty); if (_not) { allTestSubSystems.add(derivedSubSystem); @@ -170,118 +152,98 @@ public class TestInstanceCreator { int _size = allAnnotatedClasses.size(); boolean _greaterThan = (_size > 1); if (_greaterThan) { - final Consumer<StructureClass> _function_2 = new Consumer<StructureClass>() { - @Override - public void accept(final StructureClass roomCls) { - StringConcatenation _builder = new StringConcatenation(); - _builder.append("TestInstanceCreator: mapping failed, multiple test instances present"); - TestInstanceCreator.this.logger.logError(_builder.toString(), roomCls); - } + final Consumer<StructureClass> _function_2 = (StructureClass roomCls) -> { + StringConcatenation _builder = new StringConcatenation(); + _builder.append("TestInstanceCreator: mapping failed, multiple test instances present"); + this.logger.logError(_builder.toString(), roomCls); }; allAnnotatedClasses.forEach(_function_2); return false; } - final Function2<ArrayList<PhysicalSystem>, PhysicalModel, ArrayList<PhysicalSystem>> _function_3 = new Function2<ArrayList<PhysicalSystem>, PhysicalModel, ArrayList<PhysicalSystem>>() { - @Override - public ArrayList<PhysicalSystem> apply(final ArrayList<PhysicalSystem> list, final PhysicalModel model) { - EList<PhysicalSystem> _systems = model.getSystems(); - Iterables.<PhysicalSystem>addAll(list, _systems); - return list; - } + ArrayList<PhysicalSystem> _newArrayList_1 = CollectionLiterals.<PhysicalSystem>newArrayList(); + final Function2<ArrayList<PhysicalSystem>, PhysicalModel, ArrayList<PhysicalSystem>> _function_3 = (ArrayList<PhysicalSystem> list, PhysicalModel model) -> { + EList<PhysicalSystem> _systems = model.getSystems(); + Iterables.<PhysicalSystem>addAll(list, _systems); + return list; }; - final List<PhysicalSystem> allPhysSystems = IterableExtensions.<PhysicalModel, ArrayList<PhysicalSystem>>fold(physModels, CollectionLiterals.<PhysicalSystem>newArrayList(), _function_3); + final List<PhysicalSystem> allPhysSystems = IterableExtensions.<PhysicalModel, ArrayList<PhysicalSystem>>fold(physModels, _newArrayList_1, _function_3); int _size_1 = allPhysSystems.size(); boolean _notEquals = (_size_1 != 1); if (_notEquals) { StringConcatenation _builder = new StringConcatenation(); _builder.append("TestInstanceCreator: mapping failed, found "); int _size_2 = allPhysSystems.size(); - _builder.append(_size_2); + _builder.append(_size_2, ""); _builder.append(" physical systems"); this.logger.logError(_builder.toString(), null); return false; } StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("TestInstanceCreator: creating instance and mapping for "); - String _name = IterableExtensions.<StructureClass>head(allAnnotatedClasses).getName(); - _builder_1.append(_name); + StructureClass _head = IterableExtensions.<StructureClass>head(allAnnotatedClasses); + String _name = _head.getName(); + _builder_1.append(_name, ""); _builder_1.append(":"); - String _name_1 = IterableExtensions.<StructureClass>head(allAnnotatedClasses).eClass().getName(); - _builder_1.append(_name_1); + StructureClass _head_1 = IterableExtensions.<StructureClass>head(allAnnotatedClasses); + EClass _eClass = _head_1.eClass(); + String _name_1 = _eClass.getName(); + _builder_1.append(_name_1, ""); this.logger.logInfo(_builder_1.toString()); final PhysicalSystem physSystem = IterableExtensions.<PhysicalSystem>head(allPhysSystems); final SubSystemClass testSubSystem = IterableExtensions.<SubSystemClass>head(allTestSubSystems); LogicalSystem _createLogicalSystem = this._roomFactory.createLogicalSystem(); - final Procedure1<LogicalSystem> _function_4 = new Procedure1<LogicalSystem>() { - @Override - public void apply(final LogicalSystem it) { - it.setName("DerivedTestSystem"); - } + final Procedure1<LogicalSystem> _function_4 = (LogicalSystem it) -> { + it.setName("DerivedTestSystem"); }; final LogicalSystem testSystem = ObjectExtensions.<LogicalSystem>operator_doubleArrow(_createLogicalSystem, _function_4); EList<SubSystemRef> _subSystems = testSystem.getSubSystems(); SubSystemRef _createSubSystemRef = this._roomFactory.createSubSystemRef(); - final Procedure1<SubSystemRef> _function_5 = new Procedure1<SubSystemRef>() { - @Override - public void apply(final SubSystemRef it) { - String _name = testSubSystem.getName(); - String _plus = ("ref_" + _name); - it.setName(_plus); - it.setType(testSubSystem); - } + final Procedure1<SubSystemRef> _function_5 = (SubSystemRef it) -> { + String _name_2 = testSubSystem.getName(); + String _plus = ("ref_" + _name_2); + it.setName(_plus); + it.setType(testSubSystem); }; SubSystemRef _doubleArrow = ObjectExtensions.<SubSystemRef>operator_doubleArrow(_createSubSystemRef, _function_5); _subSystems.add(_doubleArrow); RoomModel _createRoomModel = this._roomFactory.createRoomModel(); - final Procedure1<RoomModel> _function_6 = new Procedure1<RoomModel>() { - @Override - public void apply(final RoomModel it) { - it.setName("DerivedTestRoomModel"); - EList<LogicalSystem> _systems = it.getSystems(); - _systems.add(testSystem); - Resource _eResource = testSubSystem.eResource(); - boolean _tripleEquals = (_eResource == null); - if (_tripleEquals) { - EList<SubSystemClass> _subSystemClasses = it.getSubSystemClasses(); - _subSystemClasses.add(testSubSystem); - } + final Procedure1<RoomModel> _function_6 = (RoomModel it) -> { + it.setName("DerivedTestRoomModel"); + EList<LogicalSystem> _systems = it.getSystems(); + _systems.add(testSystem); + Resource _eResource = testSubSystem.eResource(); + boolean _tripleEquals = (_eResource == null); + if (_tripleEquals) { + EList<SubSystemClass> _subSystemClasses = it.getSubSystemClasses(); + _subSystemClasses.add(testSubSystem); } }; final RoomModel testRoomModel = ObjectExtensions.<RoomModel>operator_doubleArrow(_createRoomModel, _function_6); MappingModel _createMappingModel = this._eTMapFactory.createMappingModel(); - final Procedure1<MappingModel> _function_7 = new Procedure1<MappingModel>() { - @Override - public void apply(final MappingModel it) { - it.setName("DerivedTestMappingModel"); - EList<Mapping> _mappings = it.getMappings(); - Mapping _createMapping = TestInstanceCreator.this._eTMapFactory.createMapping(); - final Procedure1<Mapping> _function = new Procedure1<Mapping>() { - @Override - public void apply(final Mapping it) { - it.setLogicalSys(testSystem); - it.setPhysicalSys(physSystem); - EList<SubSystemMapping> _subsysMappings = it.getSubsysMappings(); - final Function1<SubSystemRef, SubSystemMapping> _function = new Function1<SubSystemRef, SubSystemMapping>() { - @Override - public SubSystemMapping apply(final SubSystemRef subSysRef) { - SubSystemMapping _createSubSystemMapping = TestInstanceCreator.this._eTMapFactory.createSubSystemMapping(); - final Procedure1<SubSystemMapping> _function = new Procedure1<SubSystemMapping>() { - @Override - public void apply(final SubSystemMapping it) { - it.setLogicalSubSys(subSysRef); - it.setNode(IterableExtensions.<NodeRef>head(physSystem.getNodeRefs())); - } - }; - return ObjectExtensions.<SubSystemMapping>operator_doubleArrow(_createSubSystemMapping, _function); - } - }; - List<SubSystemMapping> _map = ListExtensions.<SubSystemRef, SubSystemMapping>map(testSystem.getSubSystems(), _function); - Iterables.<SubSystemMapping>addAll(_subsysMappings, _map); - } + final Procedure1<MappingModel> _function_7 = (MappingModel it) -> { + it.setName("DerivedTestMappingModel"); + EList<Mapping> _mappings = it.getMappings(); + Mapping _createMapping = this._eTMapFactory.createMapping(); + final Procedure1<Mapping> _function_8 = (Mapping it_1) -> { + it_1.setLogicalSys(testSystem); + it_1.setPhysicalSys(physSystem); + EList<SubSystemMapping> _subsysMappings = it_1.getSubsysMappings(); + EList<SubSystemRef> _subSystems_1 = testSystem.getSubSystems(); + final Function1<SubSystemRef, SubSystemMapping> _function_9 = (SubSystemRef subSysRef) -> { + SubSystemMapping _createSubSystemMapping = this._eTMapFactory.createSubSystemMapping(); + final Procedure1<SubSystemMapping> _function_10 = (SubSystemMapping it_2) -> { + it_2.setLogicalSubSys(subSysRef); + EList<NodeRef> _nodeRefs = physSystem.getNodeRefs(); + NodeRef _head_2 = IterableExtensions.<NodeRef>head(_nodeRefs); + it_2.setNode(_head_2); + }; + return ObjectExtensions.<SubSystemMapping>operator_doubleArrow(_createSubSystemMapping, _function_10); }; - Mapping _doubleArrow = ObjectExtensions.<Mapping>operator_doubleArrow(_createMapping, _function); - _mappings.add(_doubleArrow); - } + List<SubSystemMapping> _map = ListExtensions.<SubSystemRef, SubSystemMapping>map(_subSystems_1, _function_9); + Iterables.<SubSystemMapping>addAll(_subsysMappings, _map); + }; + Mapping _doubleArrow_1 = ObjectExtensions.<Mapping>operator_doubleArrow(_createMapping, _function_8); + _mappings.add(_doubleArrow_1); }; final MappingModel testMappingModel = ObjectExtensions.<MappingModel>operator_doubleArrow(_createMappingModel, _function_7); Resource _xifexpression = null; @@ -290,27 +252,35 @@ public class TestInstanceCreator { if (_tripleNotEquals) { _xifexpression = testSubSystem.eResource(); } else { - _xifexpression = IterableExtensions.<StructureClass>head(allAnnotatedClasses).eResource(); + StructureClass _head_2 = IterableExtensions.<StructureClass>head(allAnnotatedClasses); + _xifexpression = _head_2.eResource(); } final Resource existingResource = _xifexpression; - final URI uriPath = existingResource.getURI().trimFileExtension().trimSegments(1); - EList<EObject> _contents = rs.createResource(uriPath.appendSegment("DerivedTestMappingModel").appendFileExtension("etmap")).getContents(); + URI _uRI = existingResource.getURI(); + URI _trimFileExtension = _uRI.trimFileExtension(); + final URI uriPath = _trimFileExtension.trimSegments(1); + URI _appendSegment = uriPath.appendSegment("DerivedTestMappingModel"); + URI _appendFileExtension = _appendSegment.appendFileExtension("etmap"); + Resource _createResource = rs.createResource(_appendFileExtension); + EList<EObject> _contents = _createResource.getContents(); _contents.add(testMappingModel); - EList<EObject> _contents_1 = rs.createResource(uriPath.appendSegment("DerivedTestRoomModel").appendFileExtension("room")).getContents(); + URI _appendSegment_1 = uriPath.appendSegment("DerivedTestRoomModel"); + URI _appendFileExtension_1 = _appendSegment_1.appendFileExtension("room"); + Resource _createResource_1 = rs.createResource(_appendFileExtension_1); + EList<EObject> _contents_1 = _createResource_1.getContents(); _xblockexpression = _contents_1.add(testRoomModel); } return _xblockexpression; } protected boolean hasTestAnnotation(final StructureClass cls) { - final Function1<Annotation, Boolean> _function = new Function1<Annotation, Boolean>() { - @Override - public Boolean apply(final Annotation it) { - String _name = it.getType().getName(); - return Boolean.valueOf(Objects.equal(_name, TestInstanceCreator.ANNOTATION_TYPE_NAME)); - } + EList<Annotation> _annotations = cls.getAnnotations(); + final Function1<Annotation, Boolean> _function = (Annotation it) -> { + AnnotationType _type = it.getType(); + String _name = _type.getName(); + return Boolean.valueOf(Objects.equal(_name, TestInstanceCreator.ANNOTATION_TYPE_NAME)); }; - return IterableExtensions.<Annotation>exists(cls.getAnnotations(), _function); + return IterableExtensions.<Annotation>exists(_annotations, _function); } public TestInstanceCreator(final ILogger logger) { diff --git a/plugins/org.eclipse.etrice.logging/.classpath b/plugins/org.eclipse.etrice.logging/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.logging/.classpath +++ b/plugins/org.eclipse.etrice.logging/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.logging/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.logging/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c1390f83a..000000000 --- a/plugins/org.eclipse.etrice.logging/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Wed Jan 04 16:47:33 CET 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF index 549b5c7be..262f93b0e 100644 --- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.etrice.logging Bundle-Version: 1.1.1.qualifier Bundle-Vendor: Eclipse eTrice Fragment-Host: org.apache.log4j;bundle-version="1.2.15" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/.classpath b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/.classpath index 358df1bc1..ef5811bf8 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/.classpath +++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF index 143ea4233..17ec6596f 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.xtext.xbase.lib, org.eclipse.ui.workbench.texteditor, org.eclipse.etrice.core.room.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.behavior.actioneditor, org.eclipse.etrice.ui.behavior.actioneditor.sourceviewer diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java index 75a18e9f7..0b3b29f61 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java +++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java @@ -45,8 +45,8 @@ public class CustomCompletionProposal implements ICompletionProposal { this.selection = selection; } - public void apply(final IDocument arg0) { - this.delegate.apply(arg0); + public void apply(final IDocument document) { + this.delegate.apply(document); } public String getAdditionalProposalInfo() { diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionAssistParser.java b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionAssistParser.java index a82d96e23..be825c235 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionAssistParser.java +++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionAssistParser.java @@ -60,23 +60,20 @@ public class DetailExpressionAssistParser { char closingChar = 0; char _char = this.document.getChar((offset - 1)); String _string = Character.valueOf(_char).toString(); - boolean _matched = false; - if (Objects.equal(_string, ")")) { - _matched=true; - postfixResult = IDetailExpressionProvider.ExpressionPostfix.PARENTHESES; - openingChar = '('; - closingChar = ')'; - } - if (!_matched) { - if (Objects.equal(_string, "]")) { - _matched=true; + switch (_string) { + case ")": + postfixResult = IDetailExpressionProvider.ExpressionPostfix.PARENTHESES; + openingChar = '('; + closingChar = ')'; + break; + case "]": postfixResult = IDetailExpressionProvider.ExpressionPostfix.BRACKETS; openingChar = '['; closingChar = ']'; - } - } - if (!_matched) { - postfixResult = IDetailExpressionProvider.ExpressionPostfix.NONE; + break; + default: + postfixResult = IDetailExpressionProvider.ExpressionPostfix.NONE; + break; } int start = offset; boolean _notEquals = (!Objects.equal(postfixResult, IDetailExpressionProvider.ExpressionPostfix.NONE)); @@ -87,14 +84,14 @@ public class DetailExpressionAssistParser { { start--; char _char_1 = this.document.getChar(start); - boolean _matched_1 = false; + boolean _matched = false; if (Objects.equal(_char_1, openingChar)) { - _matched_1=true; + _matched=true; counter--; } - if (!_matched_1) { + if (!_matched) { if (Objects.equal(_char_1, closingChar)) { - _matched_1=true; + _matched=true; counter++; } } @@ -171,22 +168,16 @@ public class DetailExpressionAssistParser { } final IDetailExpressionProvider.ExpressionFeature firstParseResult = parsedFeatures.pop(); List<IDetailExpressionProvider.ExpressionFeature> _initialFeatures = this.provider.getInitialFeatures(); - final Function1<IDetailExpressionProvider.ExpressionFeature, Boolean> _function = new Function1<IDetailExpressionProvider.ExpressionFeature, Boolean>() { - @Override - public Boolean apply(final IDetailExpressionProvider.ExpressionFeature it) { - return Boolean.valueOf(DetailExpressionAssistParser.this.matches(it, firstParseResult)); - } + final Function1<IDetailExpressionProvider.ExpressionFeature, Boolean> _function = (IDetailExpressionProvider.ExpressionFeature it) -> { + return Boolean.valueOf(this.matches(it, firstParseResult)); }; IDetailExpressionProvider.ExpressionFeature lastMatch = IterableExtensions.<IDetailExpressionProvider.ExpressionFeature>findFirst(_initialFeatures, _function); while (((!Objects.equal(lastMatch, null)) && (!parsedFeatures.isEmpty()))) { { final IDetailExpressionProvider.ExpressionFeature nextParseResult = parsedFeatures.pop(); List<IDetailExpressionProvider.ExpressionFeature> _contextFeatures = this.provider.getContextFeatures(lastMatch); - final Function1<IDetailExpressionProvider.ExpressionFeature, Boolean> _function_1 = new Function1<IDetailExpressionProvider.ExpressionFeature, Boolean>() { - @Override - public Boolean apply(final IDetailExpressionProvider.ExpressionFeature it) { - return Boolean.valueOf(DetailExpressionAssistParser.this.matches(it, nextParseResult)); - } + final Function1<IDetailExpressionProvider.ExpressionFeature, Boolean> _function_1 = (IDetailExpressionProvider.ExpressionFeature it) -> { + return Boolean.valueOf(this.matches(it, nextParseResult)); }; IDetailExpressionProvider.ExpressionFeature _findFirst = IterableExtensions.<IDetailExpressionProvider.ExpressionFeature>findFirst(_contextFeatures, _function_1); lastMatch = _findFirst; diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionUIProvider.java b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionUIProvider.java index d6e852a19..33a89173f 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionUIProvider.java +++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionUIProvider.java @@ -90,11 +90,8 @@ public class DetailExpressionUIProvider implements IDetailExpressionProvider { if (data instanceof Operation) { _matched=true; EList<VarDecl> _arguments = ((Operation)data).getArguments(); - final Function1<VarDecl, String> _function = new Function1<VarDecl, String>() { - @Override - public String apply(final VarDecl it) { - return it.getName(); - } + final Function1<VarDecl, String> _function = (VarDecl it) -> { + return it.getName(); }; List<String> _map = ListExtensions.<VarDecl, String>map(_arguments, _function); _switchResult_1 = IterableExtensions.join(_map, ", "); @@ -332,12 +329,9 @@ public class DetailExpressionUIProvider implements IDetailExpressionProvider { */ public Iterable<IDetailExpressionProvider.ExpressionFeature> getContextFeaturesWithPrefix(final IDetailExpressionProvider.ExpressionFeature ctx, final String prefix) { List<IDetailExpressionProvider.ExpressionFeature> _contextFeatures = this.delegate.getContextFeatures(ctx); - final Function1<IDetailExpressionProvider.ExpressionFeature, Boolean> _function = new Function1<IDetailExpressionProvider.ExpressionFeature, Boolean>() { - @Override - public Boolean apply(final IDetailExpressionProvider.ExpressionFeature it) { - String _id = it.getId(); - return Boolean.valueOf(_id.startsWith(prefix)); - } + final Function1<IDetailExpressionProvider.ExpressionFeature, Boolean> _function = (IDetailExpressionProvider.ExpressionFeature it) -> { + String _id = it.getId(); + return Boolean.valueOf(_id.startsWith(prefix)); }; return IterableExtensions.<IDetailExpressionProvider.ExpressionFeature>filter(_contextFeatures, _function); } @@ -347,12 +341,9 @@ public class DetailExpressionUIProvider implements IDetailExpressionProvider { */ public Iterable<IDetailExpressionProvider.ExpressionFeature> getInitialFeaturesWithPrefix(final String prefix) { List<IDetailExpressionProvider.ExpressionFeature> _initialFeatures = this.delegate.getInitialFeatures(); - final Function1<IDetailExpressionProvider.ExpressionFeature, Boolean> _function = new Function1<IDetailExpressionProvider.ExpressionFeature, Boolean>() { - @Override - public Boolean apply(final IDetailExpressionProvider.ExpressionFeature it) { - String _id = it.getId(); - return Boolean.valueOf(_id.startsWith(prefix)); - } + final Function1<IDetailExpressionProvider.ExpressionFeature, Boolean> _function = (IDetailExpressionProvider.ExpressionFeature it) -> { + String _id = it.getId(); + return Boolean.valueOf(_id.startsWith(prefix)); }; return IterableExtensions.<IDetailExpressionProvider.ExpressionFeature>filter(_initialFeatures, _function); } diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/.classpath b/plugins/org.eclipse.etrice.ui.behavior.fsm/.classpath index 358df1bc1..ef5811bf8 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/.classpath +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.behavior.fsm/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF index 5234eaccb..50458ca2f 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", org.eclipse.xtext.ui;bundle-version="2.7.0", org.eclipse.xtend.lib;bundle-version="2.7.0", org.eclipse.xtext.ui.shared;bundle-version="2.7.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.behavior.fsm.actioneditor, org.eclipse.etrice.ui.behavior.fsm.actioneditor.preferences, diff --git a/plugins/org.eclipse.etrice.ui.behavior/.classpath b/plugins/org.eclipse.etrice.ui.behavior/.classpath index 358df1bc1..ef5811bf8 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/.classpath +++ b/plugins/org.eclipse.etrice.ui.behavior/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.ui.behavior/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.behavior/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index d18196211..000000000 --- a/plugins/org.eclipse.etrice.ui.behavior/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Wed Jan 05 13:25:23 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF index ca6c01454..ed73ff01f 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1", org.eclipse.etrice.core.genmodel;bundle-version="1.1.1" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Export-Package: org.eclipse.etrice.ui.behavior, org.eclipse.etrice.ui.behavior.detailcode, diff --git a/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java b/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java index cd07fc2b3..eed350739 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java +++ b/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/DefaultDetailExpressionProvider.java @@ -13,6 +13,7 @@ package org.eclipse.etrice.ui.behavior.detailcode; import com.google.common.base.Objects; import com.google.common.collect.Iterables; import java.util.List; +import java.util.function.Consumer; import org.eclipse.etrice.core.room.ActorClass; import org.eclipse.etrice.core.room.Attribute; import org.eclipse.etrice.core.room.CommunicationType; @@ -32,9 +33,7 @@ import org.eclipse.etrice.ui.behavior.fsm.detailcode.IDetailExpressionProvider; import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Functions.Function1; -import org.eclipse.xtext.xbase.lib.IterableExtensions; import org.eclipse.xtext.xbase.lib.ListExtensions; -import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; /** * Defines expression for fsm detail code of an ActorClass @@ -51,71 +50,62 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid scope.add(_createExprFeature); } List<StandardOperation> _latestOperations = this.roomHelpers.getLatestOperations(this.actorClass); - final Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature> _function = new Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final StandardOperation it) { - return DefaultDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature> _function = (StandardOperation it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map = ListExtensions.<StandardOperation, IDetailExpressionProvider.ExpressionFeature>map(_latestOperations, _function); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map); List<Attribute> _allAttributes = this.roomHelpers.getAllAttributes(this.actorClass); - final Function1<Attribute, IDetailExpressionProvider.ExpressionFeature> _function_1 = new Function1<Attribute, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final Attribute it) { - return DefaultDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<Attribute, IDetailExpressionProvider.ExpressionFeature> _function_1 = (Attribute it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_1 = ListExtensions.<Attribute, IDetailExpressionProvider.ExpressionFeature>map(_allAttributes, _function_1); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_1); List<InterfaceItem> _allInterfaceItems = this.roomHelpers.getAllInterfaceItems(this.actorClass); - final Procedure1<InterfaceItem> _function_2 = new Procedure1<InterfaceItem>() { - @Override - public void apply(final InterfaceItem it) { - boolean _matched = false; - if (it instanceof SPP) { - boolean _isEventDriven = ((SPP)it).isEventDriven(); - if (_isEventDriven) { + final Consumer<InterfaceItem> _function_2 = (InterfaceItem it) -> { + boolean _matched = false; + if (it instanceof SPP) { + boolean _isEventDriven = ((SPP)it).isEventDriven(); + if (_isEventDriven) { + _matched=true; + } + } + if (!_matched) { + if (it instanceof Port) { + if ((((Port)it).isEventDriven() && ((Port)it).isReplicated())) { _matched=true; } } - if (!_matched) { - if (it instanceof Port) { - if ((((Port)it).isEventDriven() && ((Port)it).isReplicated())) { - _matched=true; - } + } + if (_matched) { + IDetailExpressionProvider.ExpressionFeature _createExprFeature_1 = this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.NONE); + scope.add(_createExprFeature_1); + IDetailExpressionProvider.ExpressionFeature _createExprFeature_2 = this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.BRACKETS); + scope.add(_createExprFeature_2); + } + if (!_matched) { + if (it instanceof Port) { + boolean _isReplicated = ((Port)it).isReplicated(); + if (_isReplicated) { + _matched=true; } } - if (_matched) { - IDetailExpressionProvider.ExpressionFeature _createExprFeature = DefaultDetailExpressionProvider.this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.NONE); - scope.add(_createExprFeature); - IDetailExpressionProvider.ExpressionFeature _createExprFeature_1 = DefaultDetailExpressionProvider.this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.BRACKETS); - scope.add(_createExprFeature_1); - } if (!_matched) { - if (it instanceof Port) { - boolean _isReplicated = ((Port)it).isReplicated(); - if (_isReplicated) { - _matched=true; - } - } - if (!_matched) { - if (it instanceof SPP) { - _matched=true; - } - } - if (_matched) { - IDetailExpressionProvider.ExpressionFeature _createExprFeature_2 = DefaultDetailExpressionProvider.this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.BRACKETS); - scope.add(_createExprFeature_2); + if (it instanceof SPP) { + _matched=true; } } - if (!_matched) { - IDetailExpressionProvider.ExpressionFeature _createExprFeature_3 = DefaultDetailExpressionProvider.this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.NONE); + if (_matched) { + IDetailExpressionProvider.ExpressionFeature _createExprFeature_3 = this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.BRACKETS); scope.add(_createExprFeature_3); } } + if (!_matched) { + IDetailExpressionProvider.ExpressionFeature _createExprFeature_4 = this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.NONE); + scope.add(_createExprFeature_4); + } }; - IterableExtensions.<InterfaceItem>forEach(_allInterfaceItems, _function_2); + _allInterfaceItems.forEach(_function_2); return scope; } @@ -143,11 +133,8 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid boolean _isConjugated = this.roomHelpers.isConjugated(((InterfaceItem)obj)); boolean _not = (!_isConjugated); List<PortOperation> _allOperations = this.roomHelpers.getAllOperations(_protocol, _not); - final Function1<PortOperation, IDetailExpressionProvider.ExpressionFeature> _function = new Function1<PortOperation, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final PortOperation it) { - return DefaultDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<PortOperation, IDetailExpressionProvider.ExpressionFeature> _function = (PortOperation it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map = ListExtensions.<PortOperation, IDetailExpressionProvider.ExpressionFeature>map(_allOperations, _function); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map); @@ -164,11 +151,8 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid case EVENT_DRIVEN: boolean _isConjugated_1 = this.roomHelpers.isConjugated(((InterfaceItem)obj_1)); List<Message> _allMessages = this.roomHelpers.getAllMessages(pc, _isConjugated_1); - final Function1<Message, IDetailExpressionProvider.ExpressionFeature> _function_1 = new Function1<Message, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final Message it) { - return DefaultDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<Message, IDetailExpressionProvider.ExpressionFeature> _function_1 = (Message it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_1 = ListExtensions.<Message, IDetailExpressionProvider.ExpressionFeature>map(_allMessages, _function_1); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_1); @@ -177,21 +161,15 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid boolean _isConjugated_2 = this.roomHelpers.isConjugated(((InterfaceItem)obj_1)); if (_isConjugated_2) { List<Message> _allIncomingMessages = this.roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, IDetailExpressionProvider.ExpressionFeature> _function_2 = new Function1<Message, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final Message it) { - return DefaultDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<Message, IDetailExpressionProvider.ExpressionFeature> _function_2 = (Message it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_2 = ListExtensions.<Message, IDetailExpressionProvider.ExpressionFeature>map(_allIncomingMessages, _function_2); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_2); } else { List<Message> _allIncomingMessages_1 = this.roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, IDetailExpressionProvider.ExpressionFeature> _function_3 = new Function1<Message, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final Message it) { - return DefaultDetailExpressionProvider.this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.NONE); - } + final Function1<Message, IDetailExpressionProvider.ExpressionFeature> _function_3 = (Message it) -> { + return this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.NONE); }; List<IDetailExpressionProvider.ExpressionFeature> _map_3 = ListExtensions.<Message, IDetailExpressionProvider.ExpressionFeature>map(_allIncomingMessages_1, _function_3); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_3); @@ -214,11 +192,8 @@ public class DefaultDetailExpressionProvider extends GuardDetailExpressionProvid DataType _type_3 = _type_2.getType(); final DataClass dc = ((DataClass) _type_3); List<Attribute> _allAttributes = this.roomHelpers.getAllAttributes(dc); - final Function1<Attribute, IDetailExpressionProvider.ExpressionFeature> _function_1 = new Function1<Attribute, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final Attribute it) { - return DefaultDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<Attribute, IDetailExpressionProvider.ExpressionFeature> _function_1 = (Attribute it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_1 = ListExtensions.<Attribute, IDetailExpressionProvider.ExpressionFeature>map(_allAttributes, _function_1); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_1); diff --git a/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/GuardDetailExpressionProvider.java b/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/GuardDetailExpressionProvider.java index 14360cd58..946c33a9b 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/GuardDetailExpressionProvider.java +++ b/plugins/org.eclipse.etrice.ui.behavior/xtend-gen/org/eclipse/etrice/ui/behavior/detailcode/GuardDetailExpressionProvider.java @@ -74,48 +74,36 @@ public class GuardDetailExpressionProvider implements IDetailExpressionProvider scope.add(_createExprFeature); } List<InterfaceItem> _allInterfaceItems = this.roomHelpers.getAllInterfaceItems(this.actorClass); - final Function1<InterfaceItem, Boolean> _function = new Function1<InterfaceItem, Boolean>() { - @Override - public Boolean apply(final InterfaceItem it) { - return Boolean.valueOf((it.isEventDriven() || (!GuardDetailExpressionProvider.this.roomHelpers.isConjugated(it)))); - } + final Function1<InterfaceItem, Boolean> _function = (InterfaceItem it) -> { + return Boolean.valueOf((it.isEventDriven() || (!this.roomHelpers.isConjugated(it)))); }; Iterable<InterfaceItem> _filter = IterableExtensions.<InterfaceItem>filter(_allInterfaceItems, _function); - final Function1<InterfaceItem, IDetailExpressionProvider.ExpressionFeature> _function_1 = new Function1<InterfaceItem, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final InterfaceItem it) { - IDetailExpressionProvider.ExpressionFeature _switchResult = null; - boolean _matched = false; - if (it instanceof Port) { - boolean _isReplicated = ((Port)it).isReplicated(); - if (_isReplicated) { - _matched=true; - _switchResult = GuardDetailExpressionProvider.this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.BRACKETS); - } - } - if (!_matched) { - _switchResult = GuardDetailExpressionProvider.this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.NONE); + final Function1<InterfaceItem, IDetailExpressionProvider.ExpressionFeature> _function_1 = (InterfaceItem it) -> { + IDetailExpressionProvider.ExpressionFeature _switchResult = null; + boolean _matched = false; + if (it instanceof Port) { + boolean _isReplicated = ((Port)it).isReplicated(); + if (_isReplicated) { + _matched=true; + _switchResult = this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.BRACKETS); } - return _switchResult; } + if (!_matched) { + _switchResult = this.createExprFeature(it, IDetailExpressionProvider.ExpressionPostfix.NONE); + } + return _switchResult; }; Iterable<IDetailExpressionProvider.ExpressionFeature> _map = IterableExtensions.<InterfaceItem, IDetailExpressionProvider.ExpressionFeature>map(_filter, _function_1); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map); List<StandardOperation> _latestOperations = this.roomHelpers.getLatestOperations(this.actorClass); - final Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature> _function_2 = new Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final StandardOperation it) { - return GuardDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature> _function_2 = (StandardOperation it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_1 = ListExtensions.<StandardOperation, IDetailExpressionProvider.ExpressionFeature>map(_latestOperations, _function_2); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_1); List<Attribute> _allAttributes = this.roomHelpers.getAllAttributes(this.actorClass); - final Function1<Attribute, IDetailExpressionProvider.ExpressionFeature> _function_3 = new Function1<Attribute, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final Attribute it) { - return GuardDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<Attribute, IDetailExpressionProvider.ExpressionFeature> _function_3 = (Attribute it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_2 = ListExtensions.<Attribute, IDetailExpressionProvider.ExpressionFeature>map(_allAttributes, _function_3); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_2); @@ -146,11 +134,8 @@ public class GuardDetailExpressionProvider implements IDetailExpressionProvider boolean _isConjugated = this.roomHelpers.isConjugated(((InterfaceItem)obj)); boolean _not = (!_isConjugated); List<PortOperation> _allOperations = this.roomHelpers.getAllOperations(_protocol, _not); - final Function1<PortOperation, IDetailExpressionProvider.ExpressionFeature> _function = new Function1<PortOperation, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final PortOperation it) { - return GuardDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<PortOperation, IDetailExpressionProvider.ExpressionFeature> _function = (PortOperation it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map = ListExtensions.<PortOperation, IDetailExpressionProvider.ExpressionFeature>map(_allOperations, _function); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map); @@ -169,11 +154,8 @@ public class GuardDetailExpressionProvider implements IDetailExpressionProvider boolean _not_1 = (!_isConjugated_1); if (_not_1) { List<Message> _allIncomingMessages = this.roomHelpers.getAllIncomingMessages(pc); - final Function1<Message, IDetailExpressionProvider.ExpressionFeature> _function_1 = new Function1<Message, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final Message it) { - return GuardDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<Message, IDetailExpressionProvider.ExpressionFeature> _function_1 = (Message it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_1 = ListExtensions.<Message, IDetailExpressionProvider.ExpressionFeature>map(_allIncomingMessages, _function_1); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_1); @@ -198,20 +180,14 @@ public class GuardDetailExpressionProvider implements IDetailExpressionProvider DataType _type_3 = _type_2.getType(); final DataClass dc = ((DataClass) _type_3); List<Attribute> _allAttributes = this.roomHelpers.getAllAttributes(dc); - final Function1<Attribute, IDetailExpressionProvider.ExpressionFeature> _function_1 = new Function1<Attribute, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final Attribute it) { - return GuardDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<Attribute, IDetailExpressionProvider.ExpressionFeature> _function_1 = (Attribute it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_1 = ListExtensions.<Attribute, IDetailExpressionProvider.ExpressionFeature>map(_allAttributes, _function_1); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_1); List<StandardOperation> _latestOperations = this.roomHelpers.getLatestOperations(dc); - final Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature> _function_2 = new Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature>() { - @Override - public IDetailExpressionProvider.ExpressionFeature apply(final StandardOperation it) { - return GuardDetailExpressionProvider.this.createExprFeature(it); - } + final Function1<StandardOperation, IDetailExpressionProvider.ExpressionFeature> _function_2 = (StandardOperation it) -> { + return this.createExprFeature(it); }; List<IDetailExpressionProvider.ExpressionFeature> _map_2 = ListExtensions.<StandardOperation, IDetailExpressionProvider.ExpressionFeature>map(_latestOperations, _function_2); Iterables.<IDetailExpressionProvider.ExpressionFeature>addAll(scope, _map_2); diff --git a/plugins/org.eclipse.etrice.ui.commands/.classpath b/plugins/org.eclipse.etrice.ui.commands/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.ui.commands/.classpath +++ b/plugins/org.eclipse.etrice.ui.commands/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.ui.commands/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.commands/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bcaf6d5a1..000000000 --- a/plugins/org.eclipse.etrice.ui.commands/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Sun Mar 13 09:32:41 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF index 6771847da..bf86331ff 100644 --- a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.graphiti.ui;bundle-version="0.8.0", org.eclipse.gef;bundle-version="3.7.0", org.eclipse.ui.ide;bundle-version="3.7.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.etrice.ui.common.base/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.common.base/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dc..000000000 --- a/plugins/org.eclipse.etrice.ui.common.base/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/plugins/org.eclipse.etrice.ui.common/.classpath b/plugins/org.eclipse.etrice.ui.common/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.ui.common/.classpath +++ b/plugins/org.eclipse.etrice.ui.common/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.ui.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.common/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 931356b14..000000000 --- a/plugins/org.eclipse.etrice.ui.common/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Sun Jan 16 07:36:52 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF index 6878441e4..7b143ab27 100644 --- a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: UI Common Bundle-SymbolicName: org.eclipse.etrice.ui.common;singleton:=true Bundle-Version: 1.1.1.qualifier Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.etrice.core.room;bundle-version="1.1.1", org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", diff --git a/plugins/org.eclipse.etrice.ui.runtime/.classpath b/plugins/org.eclipse.etrice.ui.runtime/.classpath index 121e527a9..751c8f2e5 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/.classpath +++ b/plugins/org.eclipse.etrice.ui.runtime/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.etrice.ui.runtime/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.runtime/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c6f498177..000000000 --- a/plugins/org.eclipse.etrice.ui.runtime/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Oct 07 11:53:16 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF index 314713ce5..3f33378ba 100644 --- a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.common, org.eclipse.core.resources, org.eclipse.ui.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.runtime diff --git a/plugins/org.eclipse.etrice.ui.structure/.classpath b/plugins/org.eclipse.etrice.ui.structure/.classpath index ad32c83a7..1fa3e6803 100644 --- a/plugins/org.eclipse.etrice.ui.structure/.classpath +++ b/plugins/org.eclipse.etrice.ui.structure/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.etrice.ui.structure/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.structure/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 1e3f3dd1f..000000000 --- a/plugins/org.eclipse.etrice.ui.structure/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Thu Oct 14 15:48:59 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF index 0ccd915f2..3e888c31e 100644 --- a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.xtext.ui.shared;bundle-version="2.6.0", org.eclipse.jface.databinding, org.eclipse.core.databinding.beans;bundle-version="1.2.200" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.structure, org.eclipse.etrice.ui.structure.editor, diff --git a/releng/org.eclipse.etrice.releng/buckminster.script b/releng/org.eclipse.etrice.releng/buckminster.script index ebe390059..521339f40 100644 --- a/releng/org.eclipse.etrice.releng/buckminster.script +++ b/releng/org.eclipse.etrice.releng/buckminster.script @@ -3,7 +3,7 @@ # Run Buckminster script (nightly) # -setpref complianceLevel=1.6 +setpref complianceLevel=1.8 setpref targetPlatformPath="${WORKSPACE}/buildroot/target.platform" diff --git a/team/ETrice.setup b/team/ETrice.setup index 9527b371e..c5ddf381f 100644 --- a/team/ETrice.setup +++ b/team/ETrice.setup @@ -63,6 +63,10 @@ optional="true"/> <requirement name="org.eclipse.egit.feature.group"/> + <requirement + name="org.apache.commons.io.feature.group"/> + <repository + url="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/> <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description> </setupTask> <setupTask @@ -158,15 +162,15 @@ <setupTask xsi:type="setup:PreferenceTask" key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform" - value="1.7"/> + value="1.8"/> <setupTask xsi:type="setup:PreferenceTask" key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance" - value="1.7"/> + value="1.8"/> <setupTask xsi:type="setup:PreferenceTask" key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source" - value="1.7"/> + value="1.8"/> </setupTask> <setupTask xsi:type="setup:CompoundTask" diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/.classpath b/tests/org.eclipse.etrice.abstractexec.behavior.tests/.classpath index ad32c83a7..1fa3e6803 100644 --- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/.classpath +++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.abstractexec.behavior.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c0fd1680a..000000000 --- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Thu Aug 16 23:39:06 CEST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF index fb7b64556..9df90ecd8 100644 --- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.xtext;bundle-version="2.6.0", org.junit;bundle-version="4.10.0", org.eclipse.etrice.core.room -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.etrice.abstractexec.behavior diff --git a/tests/org.eclipse.etrice.core.common.tests/.classpath b/tests/org.eclipse.etrice.core.common.tests/.classpath index 4ab762f09..1cf555d1b 100644 --- a/tests/org.eclipse.etrice.core.common.tests/.classpath +++ b/tests/org.eclipse.etrice.core.common.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="models"/> diff --git a/tests/org.eclipse.etrice.core.common.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.core.common.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/tests/org.eclipse.etrice.core.common.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF index 84a2dac9c..f9f2bcc31 100644 --- a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Import-Package: org.apache.log4j, org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.common.tests, org.eclipse.etrice.core.common diff --git a/tests/org.eclipse.etrice.core.common.tests/xtend-gen/org/eclipse/etrice/core/common/tests/RelativeFileURITest.java b/tests/org.eclipse.etrice.core.common.tests/xtend-gen/org/eclipse/etrice/core/common/tests/RelativeFileURITest.java index 0ad8a3bd0..85d976dd0 100644 --- a/tests/org.eclipse.etrice.core.common.tests/xtend-gen/org/eclipse/etrice/core/common/tests/RelativeFileURITest.java +++ b/tests/org.eclipse.etrice.core.common.tests/xtend-gen/org/eclipse/etrice/core/common/tests/RelativeFileURITest.java @@ -45,32 +45,20 @@ public class RelativeFileURITest { Iterable<String> _plus = Iterables.<String>concat(RelativeFileURITest.ABSOLUTE_URLS, RelativeFileURITest.RESOLVED_PRESERVE_ABOVE_ROOT_URIS); Iterable<String> _plus_1 = Iterables.<String>concat(_plus, RelativeFileURITest.RESOLVED_NO_PRESERVE_ABOVE_ROOT_URIS); Iterable<String> _plus_2 = Iterables.<String>concat(_plus_1, RelativeFileURITest.ENCODED_URIS); - final Function1<String, List<List<String>>> _function = new Function1<String, List<List<String>>>() { - @Override - public List<List<String>> apply(final String uri) { - final Function1<String, List<String>> _function = new Function1<String, List<String>>() { - @Override - public List<String> apply(final String query) { - final Function1<String, String> _function = new Function1<String, String>() { - @Override - public String apply(final String fragment) { - return ((uri + query) + fragment); - } - }; - return ListExtensions.<String, String>map(RelativeFileURITest.FRAGMENTS, _function); - } + final Function1<String, List<List<String>>> _function = (String uri) -> { + final Function1<String, List<String>> _function_1 = (String query) -> { + final Function1<String, String> _function_2 = (String fragment) -> { + return ((uri + query) + fragment); }; - return ListExtensions.<String, List<String>>map(RelativeFileURITest.QUERIES, _function); - } + return ListExtensions.<String, String>map(RelativeFileURITest.FRAGMENTS, _function_2); + }; + return ListExtensions.<String, List<String>>map(RelativeFileURITest.QUERIES, _function_1); }; Iterable<List<List<String>>> _map = IterableExtensions.<String, List<List<String>>>map(_plus_2, _function); Iterable<List<String>> _flatten = Iterables.<List<String>>concat(_map); Iterable<String> _flatten_1 = Iterables.<String>concat(_flatten); - final Function1<String, URI> _function_1 = new Function1<String, URI>() { - @Override - public URI apply(final String it) { - return URI.createURI(it); - } + final Function1<String, URI> _function_1 = (String it) -> { + return URI.createURI(it); }; return IterableExtensions.<String, URI>map(_flatten_1, _function_1); } @@ -80,13 +68,10 @@ public class RelativeFileURITest { @Test public void resolveSelf() { Iterable<URI> _allURIs = this.allURIs(); - final Consumer<URI> _function = new Consumer<URI>() { - @Override - public void accept(final URI uri) { - RelativeFileURITest.this.handler.setBaseURI(RelativeFileURITest.TEST_URI); - URI _resolve = RelativeFileURITest.this.handler.resolve(uri); - Assert.assertEquals(uri, _resolve); - } + final Consumer<URI> _function = (URI uri) -> { + this.handler.setBaseURI(RelativeFileURITest.TEST_URI); + URI _resolve = this.handler.resolve(uri); + Assert.assertEquals(uri, _resolve); }; _allURIs.forEach(_function); } @@ -94,15 +79,12 @@ public class RelativeFileURITest { @Test public void roundtripResolve() { Iterable<URI> _allURIs = this.allURIs(); - final Consumer<URI> _function = new Consumer<URI>() { - @Override - public void accept(final URI uri) { - URI _createURI = URI.createURI("file:/a/b/c/d"); - RelativeFileURITest.this.handler.setBaseURI(_createURI); - URI _deresolve = RelativeFileURITest.this.handler.deresolve(uri); - URI _resolve = RelativeFileURITest.this.handler.resolve(_deresolve); - Assert.assertEquals(uri, _resolve); - } + final Consumer<URI> _function = (URI uri) -> { + URI _createURI = URI.createURI("file:/a/b/c/d"); + this.handler.setBaseURI(_createURI); + URI _deresolve = this.handler.deresolve(uri); + URI _resolve = this.handler.resolve(_deresolve); + Assert.assertEquals(uri, _resolve); }; _allURIs.forEach(_function); } diff --git a/tests/org.eclipse.etrice.core.config.tests/.classpath b/tests/org.eclipse.etrice.core.config.tests/.classpath index dcc478748..d2fd5c857 100644 --- a/tests/org.eclipse.etrice.core.config.tests/.classpath +++ b/tests/org.eclipse.etrice.core.config.tests/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.etrice.core.config.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.core.config.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/tests/org.eclipse.etrice.core.config.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF index a453abb49..084f11a02 100644 --- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Import-Package: org.apache.log4j, org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core diff --git a/tests/org.eclipse.etrice.core.etmap.tests/.classpath b/tests/org.eclipse.etrice.core.etmap.tests/.classpath index 0c22b5d7e..fe30bcbba 100644 --- a/tests/org.eclipse.etrice.core.etmap.tests/.classpath +++ b/tests/org.eclipse.etrice.core.etmap.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF index fb0ff786b..f086a87d4 100644 --- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Import-Package: org.apache.log4j, org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etmap diff --git a/tests/org.eclipse.etrice.core.etphys.tests/.classpath b/tests/org.eclipse.etrice.core.etphys.tests/.classpath index 0c22b5d7e..fe30bcbba 100644 --- a/tests/org.eclipse.etrice.core.etphys.tests/.classpath +++ b/tests/org.eclipse.etrice.core.etphys.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF index 74fd17a91..4bc3f4084 100644 --- a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Import-Package: org.apache.log4j, org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etphys diff --git a/tests/org.eclipse.etrice.core.fsm.tests/.classpath b/tests/org.eclipse.etrice.core.fsm.tests/.classpath index e4dad7e73..8e001f780 100644 --- a/tests/org.eclipse.etrice.core.fsm.tests/.classpath +++ b/tests/org.eclipse.etrice.core.fsm.tests/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.etrice.core.fsm.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.core.fsm.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/tests/org.eclipse.etrice.core.fsm.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF index c4cefcdc8..41b0bf1af 100644 --- a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Import-Package: org.apache.log4j, org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.fsm diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/.classpath b/tests/org.eclipse.etrice.core.genmodel.tests/.classpath index ad32c83a7..1fa3e6803 100644 --- a/tests/org.eclipse.etrice.core.genmodel.tests/.classpath +++ b/tests/org.eclipse.etrice.core.genmodel.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.core.genmodel.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 58a8efbec..000000000 --- a/tests/org.eclipse.etrice.core.genmodel.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Tue May 22 09:38:05 CEST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF index 1de54d1d0..15be3c948 100644 --- a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Tests Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests Bundle-Version: 1.1.1.qualifier Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", org.junit;bundle-version="4.8.1", diff --git a/tests/org.eclipse.etrice.core.room.tests/.classpath b/tests/org.eclipse.etrice.core.room.tests/.classpath index f45eb6cb4..b9247ca72 100644 --- a/tests/org.eclipse.etrice.core.room.tests/.classpath +++ b/tests/org.eclipse.etrice.core.room.tests/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.modellib.java"/> diff --git a/tests/org.eclipse.etrice.core.room.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.core.room.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 5994f08d7..000000000 --- a/tests/org.eclipse.etrice.core.room.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Thu Feb 17 23:11:30 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF index 8accc1229..81b087191 100644 --- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eTrice Room Core Tests Bundle-SymbolicName: org.eclipse.etrice.core.room.tests Bundle-Version: 1.1.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", org.eclipse.etrice.core.common;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.core.room.tests/xtend-gen/org/eclipse/etrice/core/TestNames.java b/tests/org.eclipse.etrice.core.room.tests/xtend-gen/org/eclipse/etrice/core/TestNames.java index 645b5a78a..ce3f618d7 100644 --- a/tests/org.eclipse.etrice.core.room.tests/xtend-gen/org/eclipse/etrice/core/TestNames.java +++ b/tests/org.eclipse.etrice.core.room.tests/xtend-gen/org/eclipse/etrice/core/TestNames.java @@ -16,6 +16,7 @@ import com.google.common.collect.Maps; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.Consumer; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -26,7 +27,6 @@ import org.eclipse.xtext.validation.AbstractValidationDiagnostic; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Functions.Function1; import org.eclipse.xtext.xbase.lib.IterableExtensions; -import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -46,21 +46,18 @@ public class TestNames extends TestBase { final EObject model = IterableExtensions.<EObject>head(_contents); final Diagnostic diag = this.getDiag(model); List<Diagnostic> _children = diag.getChildren(); - final Procedure1<Diagnostic> _function = new Procedure1<Diagnostic>() { - @Override - public void apply(final Diagnostic it) { - if ((it instanceof AbstractValidationDiagnostic)) { - final EObject obj = ((AbstractValidationDiagnostic)it).getSourceEObject(); - Boolean nameError = TestNames.this.nameErrorMap.get(obj); - boolean _equals = Objects.equal(nameError, null); - if (_equals) { - nameError = Boolean.valueOf(false); - } - TestNames.this.nameErrorMap.put(obj, Boolean.valueOf(((nameError).booleanValue() || TestNames.this.isNameErrorMessage(it)))); + final Consumer<Diagnostic> _function = (Diagnostic it) -> { + if ((it instanceof AbstractValidationDiagnostic)) { + final EObject obj = ((AbstractValidationDiagnostic)it).getSourceEObject(); + Boolean nameError = this.nameErrorMap.get(obj); + boolean _equals = Objects.equal(nameError, null); + if (_equals) { + nameError = Boolean.valueOf(false); } + this.nameErrorMap.put(obj, Boolean.valueOf(((nameError).booleanValue() || this.isNameErrorMessage(it)))); } }; - IterableExtensions.<Diagnostic>forEach(_children, _function); + _children.forEach(_function); } @Test @@ -93,14 +90,11 @@ public class TestNames extends TestBase { Iterables.<EObject>addAll(items, _eContents_1); int _size = items.size(); Assert.assertEquals("Unexpected item count", 15, _size); - final Procedure1<EObject> _function = new Procedure1<EObject>() { - @Override - public void apply(final EObject it) { - boolean _hasNameErrorMessage = TestNames.this.hasNameErrorMessage(it); - Assert.assertFalse(("expected no name error: " + it), _hasNameErrorMessage); - } + final Consumer<EObject> _function = (EObject it) -> { + boolean _hasNameErrorMessage = this.hasNameErrorMessage(it); + Assert.assertFalse(("expected no name error: " + it), _hasNameErrorMessage); }; - IterableExtensions.<EObject>forEach(items, _function); + items.forEach(_function); } @Test @@ -114,14 +108,11 @@ public class TestNames extends TestBase { Iterables.<EObject>addAll(items, _eContents_1); int _size = items.size(); Assert.assertEquals("Unexpected item count", 9, _size); - final Procedure1<EObject> _function = new Procedure1<EObject>() { - @Override - public void apply(final EObject it) { - boolean _hasNameErrorMessage = TestNames.this.hasNameErrorMessage(it); - Assert.assertFalse(("expected no name error: " + it), _hasNameErrorMessage); - } + final Consumer<EObject> _function = (EObject it) -> { + boolean _hasNameErrorMessage = this.hasNameErrorMessage(it); + Assert.assertFalse(("expected no name error: " + it), _hasNameErrorMessage); }; - IterableExtensions.<EObject>forEach(items, _function); + items.forEach(_function); } @Test @@ -130,11 +121,8 @@ public class TestNames extends TestBase { final EObject dc = this.res.getEObject("DataClass:DSub"); final ArrayList<EObject> items = CollectionLiterals.<EObject>newArrayList(); EList<EObject> _eContents = ac.eContents(); - final Function1<EObject, Boolean> _function = new Function1<EObject, Boolean>() { - @Override - public Boolean apply(final EObject it) { - return Boolean.valueOf((!(it instanceof ExternalPort))); - } + final Function1<EObject, Boolean> _function = (EObject it) -> { + return Boolean.valueOf((!(it instanceof ExternalPort))); }; Iterable<EObject> _filter = IterableExtensions.<EObject>filter(_eContents, _function); Iterables.<EObject>addAll(items, _filter); @@ -142,14 +130,11 @@ public class TestNames extends TestBase { Iterables.<EObject>addAll(items, _eContents_1); int _size = items.size(); Assert.assertEquals("Unexpected item count", 13, _size); - final Procedure1<EObject> _function_1 = new Procedure1<EObject>() { - @Override - public void apply(final EObject it) { - boolean _hasNameErrorMessage = TestNames.this.hasNameErrorMessage(it); - Assert.assertTrue(("expected name error: " + it), _hasNameErrorMessage); - } + final Consumer<EObject> _function_1 = (EObject it) -> { + boolean _hasNameErrorMessage = this.hasNameErrorMessage(it); + Assert.assertTrue(("expected name error: " + it), _hasNameErrorMessage); }; - IterableExtensions.<EObject>forEach(items, _function_1); + items.forEach(_function_1); } @Test @@ -161,11 +146,8 @@ public class TestNames extends TestBase { final EObject enum_ = this.res.getEObject("DataClass:EnumFlat"); final ArrayList<EObject> items = CollectionLiterals.<EObject>newArrayList(); EList<EObject> _eContents = ac.eContents(); - final Function1<EObject, Boolean> _function = new Function1<EObject, Boolean>() { - @Override - public Boolean apply(final EObject it) { - return Boolean.valueOf((!(it instanceof ExternalPort))); - } + final Function1<EObject, Boolean> _function = (EObject it) -> { + return Boolean.valueOf((!(it instanceof ExternalPort))); }; Iterable<EObject> _filter = IterableExtensions.<EObject>filter(_eContents, _function); Iterables.<EObject>addAll(items, _filter); @@ -179,14 +161,11 @@ public class TestNames extends TestBase { Iterables.<EObject>addAll(items, _eContents_4); int _size = items.size(); Assert.assertEquals("Unexpected item count", 16, _size); - final Procedure1<EObject> _function_1 = new Procedure1<EObject>() { - @Override - public void apply(final EObject it) { - boolean _hasNameErrorMessage = TestNames.this.hasNameErrorMessage(it); - Assert.assertTrue(("expected name error: " + it), _hasNameErrorMessage); - } + final Consumer<EObject> _function_1 = (EObject it) -> { + boolean _hasNameErrorMessage = this.hasNameErrorMessage(it); + Assert.assertTrue(("expected name error: " + it), _hasNameErrorMessage); }; - IterableExtensions.<EObject>forEach(items, _function_1); + items.forEach(_function_1); } private boolean hasNameErrorMessage(final EObject obj) { diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/.classpath b/tests/org.eclipse.etrice.etunit.converter.tests/.classpath index ad32c83a7..1fa3e6803 100644 --- a/tests/org.eclipse.etrice.etunit.converter.tests/.classpath +++ b/tests/org.eclipse.etrice.etunit.converter.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.etunit.converter.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 133cce0f7..000000000 --- a/tests/org.eclipse.etrice.etunit.converter.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon May 14 12:14:34 CEST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF index 54fee1a61..ca57051da 100644 --- a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF @@ -8,5 +8,5 @@ Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.1", org.eclipse.core.runtime, org.junit;bundle-version="4.8.2" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/tests/org.eclipse.etrice.generator.c.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.generator.c.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8000cd6ca..000000000 --- a/tests/org.eclipse.etrice.generator.c.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.generator.cpp.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8000cd6ca..000000000 --- a/tests/org.eclipse.etrice.generator.cpp.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/.classpath b/tests/org.eclipse.etrice.generator.fsmtest.tests/.classpath index dcc478748..d2fd5c857 100644 --- a/tests/org.eclipse.etrice.generator.fsmtest.tests/.classpath +++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.generator.fsmtest.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b6306..000000000 --- a/tests/org.eclipse.etrice.generator.fsmtest.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF index 18e599ae6..ca35ad64f 100644 --- a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Import-Package: org.apache.log4j, org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0", org.hamcrest.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator diff --git a/tests/org.eclipse.etrice.generator.java.tests/.classpath b/tests/org.eclipse.etrice.generator.java.tests/.classpath index a2e404af1..e536cf5fa 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/.classpath +++ b/tests/org.eclipse.etrice.generator.java.tests/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.modellib.java"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.runtime.java"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.generator.java.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.generator.java.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8000cd6ca..000000000 --- a/tests/org.eclipse.etrice.generator.java.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.generator.tests/.classpath b/tests/org.eclipse.etrice.generator.tests/.classpath index 8927412c7..1bd67c35b 100644 --- a/tests/org.eclipse.etrice.generator.tests/.classpath +++ b/tests/org.eclipse.etrice.generator.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="models"/> diff --git a/tests/org.eclipse.etrice.generator.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.generator.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 642f72c80..000000000 --- a/tests/org.eclipse.etrice.generator.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Oct 04 11:14:17 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF index 9f76c6d9a..745edf6b5 100644 --- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eTrice Generator Model Tests Bundle-SymbolicName: org.eclipse.etrice.generator.tests Bundle-Version: 1.1.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", org.eclipse.etrice.core.fsm;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.runtime.java.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.runtime.java.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 709e4b091..000000000 --- a/tests/org.eclipse.etrice.runtime.java.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Fri Dec 03 09:11:14 CET 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.test.common/.classpath b/tests/org.eclipse.etrice.test.common/.classpath index 8778ddd58..ac37fb2e4 100644 --- a/tests/org.eclipse.etrice.test.common/.classpath +++ b/tests/org.eclipse.etrice.test.common/.classpath @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/tests/org.eclipse.etrice.test.common/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.test.common/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6cddd3ba4..000000000 --- a/tests/org.eclipse.etrice.test.common/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Mon Feb 06 15:15:37 CET 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/.classpath b/tests/org.eclipse.etrice.ui.behavior.tests/.classpath index ad32c83a7..1fa3e6803 100644 --- a/tests/org.eclipse.etrice.ui.behavior.tests/.classpath +++ b/tests/org.eclipse.etrice.ui.behavior.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.ui.behavior.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index eeaec2b96..000000000 --- a/tests/org.eclipse.etrice.ui.behavior.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Thu Feb 10 11:58:16 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF index dbe4db5b7..b82c1517a 100644 --- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.junit;bundle-version="4.8.1", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.graphiti;bundle-version="0.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/tests/org.eclipse.etrice.ui.structure.tests/.classpath b/tests/org.eclipse.etrice.ui.structure.tests/.classpath index ad32c83a7..1fa3e6803 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/.classpath +++ b/tests/org.eclipse.etrice.ui.structure.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.ui.structure.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.ui.structure.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b5619aabb..000000000 --- a/tests/org.eclipse.etrice.ui.structure.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Jan 28 15:16:58 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF index 198c69a56..64de37617 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.junit;bundle-version="4.8.1", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.graphiti;bundle-version="0.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.etrice.ui.structure.StructureTestActivator diff --git a/tests/org.eclipse.etrice.ui.tests.base/.classpath b/tests/org.eclipse.etrice.ui.tests.base/.classpath index ad32c83a7..1fa3e6803 100644 --- a/tests/org.eclipse.etrice.ui.tests.base/.classpath +++ b/tests/org.eclipse.etrice.ui.tests.base/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/org.eclipse.etrice.ui.tests.base/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.ui.tests.base/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 00cf6ec9e..000000000 --- a/tests/org.eclipse.etrice.ui.tests.base/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Thu Feb 10 12:03:48 CET 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF index 3a1d4f91a..20e03aaaa 100644 --- a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Require-Bundle: org.junit;bundle-version="4.8.1", org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro Bundle-Vendor: Eclipse eTrice -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.tests.base |