Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2017-07-17 16:00:00 +0000
committerJuergen Haug2017-07-17 16:00:00 +0000
commite4dec8f093de150cbba61b3b329b111b58c9fb64 (patch)
treea26f2238c7c97c63846c56581aaff6c72a6890e2 /plugins/org.eclipse.etrice.core.fsm
parentecc96202d41f697201ee7ba49cbf85faf74a62b9 (diff)
downloadorg.eclipse.etrice-e4dec8f093de150cbba61b3b329b111b58c9fb64.tar.gz
org.eclipse.etrice-e4dec8f093de150cbba61b3b329b111b58c9fb64.tar.xz
org.eclipse.etrice-e4dec8f093de150cbba61b3b329b111b58c9fb64.zip
switched to Java 8, deleted jdt prefs
Diffstat (limited to 'plugins/org.eclipse.etrice.core.fsm')
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/.classpath2
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java16
4 files changed, 7 insertions, 20 deletions
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) {

Back to the top