diff options
author | Juergen Haug | 2017-07-17 16:00:00 +0000 |
---|---|---|
committer | Juergen Haug | 2017-07-17 16:00:00 +0000 |
commit | e4dec8f093de150cbba61b3b329b111b58c9fb64 (patch) | |
tree | a26f2238c7c97c63846c56581aaff6c72a6890e2 /plugins/org.eclipse.etrice.generator.gnuplot | |
parent | ecc96202d41f697201ee7ba49cbf85faf74a62b9 (diff) | |
download | org.eclipse.etrice-e4dec8f093de150cbba61b3b329b111b58c9fb64.tar.gz org.eclipse.etrice-e4dec8f093de150cbba61b3b329b111b58c9fb64.tar.xz org.eclipse.etrice-e4dec8f093de150cbba61b3b329b111b58c9fb64.zip |
switched to Java 8, deleted jdt prefs
Change-Id: Icee7ff00c57b7be439a4f37d9fb4621fd1776aa7
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.gnuplot')
4 files changed, 17 insertions, 36 deletions
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); |