Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2016-10-04 07:02:02 +0000
committerHenrik Rentz-Reichert2016-10-17 12:28:00 +0000
commit1c2b5f9d2204ce3c033e4f2a4be08713bfebff66 (patch)
treee5d7a014c9feb606736f8c6df7b26b3c7881045f /plugins/org.eclipse.etrice.core.fsm
parent0723a9ccc971b0be4c108447ecb02f9842b49ac5 (diff)
parent43cd5f4a5f5babb1d48b8c65cd161171f18c1cdd (diff)
downloadorg.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.tar.gz
org.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.tar.xz
org.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.zip
transition to Neon
* resource map uses Neon update site * removed KIELER and layout features from Buckminster cspec (cannot be installed into Neon) * removed kieler and layout feature projects * upgraded BREE to Java 1.8 where necessary * eTrice-rt launch config with Java 1.8 * updated JUnit launch configs to Java 1.8 Change-Id: I35f8ac2819480dec7f5fe739ed2445af137a445f
Diffstat (limited to 'plugins/org.eclipse.etrice.core.fsm')
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting/FSMFormatter.java1
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java1
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java44
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java14
4 files changed, 14 insertions, 46 deletions
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting/FSMFormatter.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting/FSMFormatter.java
index afd952bbe..f2ff9c355 100644
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting/FSMFormatter.java
+++ b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting/FSMFormatter.java
@@ -16,6 +16,7 @@ import org.eclipse.xtext.formatting.impl.FormattingConfig;
*/
@SuppressWarnings("all")
public class FSMFormatter extends AbstractDeclarativeFormatter {
+ @Override
protected void configureFormatting(final FormattingConfig c) {
}
}
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java
index a1d9f2f2d..5c2dbb93f 100644
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java
+++ b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java
@@ -14,6 +14,7 @@ import org.eclipse.xtext.generator.IGenerator;
*/
@SuppressWarnings("all")
public class FSMGenerator implements IGenerator {
+ @Override
public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
}
}
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
index ea1e9d6de..fe823650a 100644
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
+++ b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
@@ -160,27 +160,17 @@ public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
if ((_eContainer instanceof ModelComponent)) {
EObject _eContainer_1 = sg.eContainer();
ModelComponent comp = ((ModelComponent) _eContainer_1);
- boolean _and = false;
- ModelComponent _base = comp.getBase();
- boolean _notEquals = (!Objects.equal(_base, null));
- if (!_notEquals) {
- _and = false;
- } else {
- boolean _isCircularClassHierarchy = this._fSMHelpers.isCircularClassHierarchy(comp);
- boolean _not = (!_isCircularClassHierarchy);
- _and = _not;
- }
- if (_and) {
- ModelComponent _base_1 = comp.getBase();
- comp = _base_1;
+ if (((!Objects.equal(comp.getBase(), null)) && (!this._fSMHelpers.isCircularClassHierarchy(comp)))) {
+ ModelComponent _base = comp.getBase();
+ comp = _base;
final HashSet<State> covered = CollectionLiterals.<State>newHashSet();
final ArrayList<State> states = CollectionLiterals.<State>newArrayList();
while ((!Objects.equal(comp, null))) {
{
StateGraph _stateMachine = comp.getStateMachine();
this.recursivelyAddStates(_stateMachine, covered, states);
- ModelComponent _base_2 = comp.getBase();
- comp = _base_2;
+ ModelComponent _base_1 = comp.getBase();
+ comp = _base_1;
}
}
for (final State s : states) {
@@ -196,8 +186,8 @@ public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
State _target = ((RefinedState) _eContainer_3).getTarget();
StateGraph _subgraph = _target.getSubgraph();
sg = _subgraph;
- boolean _notEquals_1 = (!Objects.equal(sg, null));
- if (_notEquals_1) {
+ boolean _notEquals = (!Objects.equal(sg, null));
+ if (_notEquals) {
EList<State> _states = sg.getStates();
for (final State s_1 : _states) {
String _name = s_1.getName();
@@ -263,26 +253,10 @@ public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
private void recursivelyAddStates(final StateGraph sg, final HashSet<State> covered, final ArrayList<State> states) {
EList<State> _states = sg.getStates();
for (final State s : _states) {
- boolean _and = false;
- if (!(s instanceof SimpleState)) {
- _and = false;
- } else {
- boolean _contains = covered.contains(s);
- boolean _not = (!_contains);
- _and = _not;
- }
- if (_and) {
+ if (((s instanceof SimpleState) && (!covered.contains(s)))) {
states.add(s);
} else {
- boolean _and_1 = false;
- if (!(s instanceof RefinedState)) {
- _and_1 = false;
- } else {
- boolean _contains_1 = covered.contains(s);
- boolean _not_1 = (!_contains_1);
- _and_1 = _not_1;
- }
- if (_and_1) {
+ if (((s instanceof RefinedState) && (!covered.contains(s)))) {
states.add(s);
State _target = ((RefinedState) s).getTarget();
covered.add(_target);
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 58ffe981e..aff4dbc9e 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
@@ -25,7 +25,6 @@ import org.eclipse.etrice.core.fsm.fSM.State;
import org.eclipse.etrice.core.fsm.fSM.StateGraph;
import org.eclipse.etrice.core.fsm.fSM.StateTerminal;
import org.eclipse.etrice.core.fsm.fSM.Transition;
-import org.eclipse.etrice.core.fsm.fSM.TransitionTerminal;
import org.eclipse.etrice.core.fsm.fSM.Trigger;
import org.eclipse.etrice.core.fsm.fSM.TriggeredTransition;
import org.eclipse.etrice.core.fsm.naming.FSMNameProvider;
@@ -102,23 +101,16 @@ public class FSMValidationUtilXtend {
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) {
- boolean _and = false;
- if (!((t instanceof TriggeredTransition) && (((TriggeredTransition) t).getFrom() instanceof StateTerminal))) {
- _and = false;
- } else {
- TransitionTerminal _from = ((TriggeredTransition) t).getFrom();
- State _state = ((StateTerminal) _from).getState();
- boolean _equals = Objects.equal(myState, _state);
- _and = _equals;
- }
- return Boolean.valueOf(_and);
+ 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));

Back to the top