Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-05-22 10:09:44 +0000
committerHenrik Rentz-Reichert2012-05-22 10:09:44 +0000
commit52118711f988e8d2016c6e5e2b1d1f529e8c1e03 (patch)
tree1e24ca26fbc30a8cc2886ca11f2651c7cda15dc7
parent1088ab08923daf9ba69bcae2a6f90030bbbb196a (diff)
downloadorg.eclipse.etrice-52118711f988e8d2016c6e5e2b1d1f529e8c1e03.tar.gz
org.eclipse.etrice-52118711f988e8d2016c6e5e2b1d1f529e8c1e03.tar.xz
org.eclipse.etrice-52118711f988e8d2016c6e5e2b1d1f529e8c1e03.zip
[core.room] bug fix in helpers
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend19
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java35
3 files changed, 32 insertions, 24 deletions
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java
index 58c6257df..7705f39bc 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java
@@ -208,7 +208,7 @@ public class RoomHelpers {
}
public static boolean hasNonEmptyStateMachine(ActorClass ac) {
- return isEmpty(ac.getStateMachine());
+ return !isEmpty(ac.getStateMachine());
}
public static boolean isEmpty(StateGraph sg) {
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
index 7ca927d14..56086cf7e 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/RoomExtensions.xtend
@@ -373,11 +373,12 @@ class RoomExtensions {
def List<State> getStateList(StateGraph sg){
var ret = new ArrayList<State>()
- for (e : sg.states){
- ret.add(e)
- var tmp=e.subgraph
- if(tmp!=null){
- ret.addAll(e.subgraph.stateList)
+ if (sg!=null) {
+ for (e : sg.states){
+ ret.add(e)
+ if (e.subgraph!=null){
+ ret.addAll(e.subgraph.stateList)
+ }
}
}
return ret
@@ -385,9 +386,11 @@ class RoomExtensions {
def List<State> getBaseStateList(StateGraph sg) {
var ret = new ArrayList<State>()
- for(e : sg.getStateList()){
- if(e instanceof SimpleState){
- ret.add(e)
+ if (sg!=null) {
+ for (e : sg.getStateList()){
+ if (e instanceof SimpleState){
+ ret.add(e)
+ }
}
}
return ret
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 6deeba570..73843df7e 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
@@ -584,17 +584,19 @@ public class RoomExtensions {
public List<State> getStateList(final StateGraph sg) {
ArrayList<State> _arrayList = new ArrayList<State>();
ArrayList<State> ret = _arrayList;
- EList<State> _states = sg.getStates();
- for (final State e : _states) {
- {
- ret.add(e);
- StateGraph _subgraph = e.getSubgraph();
- StateGraph tmp = _subgraph;
- boolean _operator_notEquals = ObjectExtensions.operator_notEquals(tmp, null);
- if (_operator_notEquals) {
- StateGraph _subgraph_1 = e.getSubgraph();
- List<State> _stateList = this.getStateList(_subgraph_1);
- ret.addAll(_stateList);
+ boolean _operator_notEquals = ObjectExtensions.operator_notEquals(sg, null);
+ if (_operator_notEquals) {
+ EList<State> _states = sg.getStates();
+ for (final State e : _states) {
+ {
+ ret.add(e);
+ StateGraph _subgraph = e.getSubgraph();
+ boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(_subgraph, null);
+ if (_operator_notEquals_1) {
+ StateGraph _subgraph_1 = e.getSubgraph();
+ List<State> _stateList = this.getStateList(_subgraph_1);
+ ret.addAll(_stateList);
+ }
}
}
}
@@ -604,10 +606,13 @@ public class RoomExtensions {
public List<State> getBaseStateList(final StateGraph sg) {
ArrayList<State> _arrayList = new ArrayList<State>();
ArrayList<State> ret = _arrayList;
- List<State> _stateList = this.getStateList(sg);
- for (final State e : _stateList) {
- if ((e instanceof SimpleState)) {
- ret.add(e);
+ boolean _operator_notEquals = ObjectExtensions.operator_notEquals(sg, null);
+ if (_operator_notEquals) {
+ List<State> _stateList = this.getStateList(sg);
+ for (final State e : _stateList) {
+ if ((e instanceof SimpleState)) {
+ ret.add(e);
+ }
}
}
return ret;

Back to the top