Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2014-10-09 14:51:59 +0000
committerHenrik Rentz-Reichert2014-10-09 14:51:59 +0000
commit50ac0a23ad00bf6ff30f43eb0a9232e686df7070 (patch)
tree5ecb852ea4661ab2e1a0d47faf2ecc651a8e317a
parent8ffd4f0c6fc486a912d500ba520d88402578ee14 (diff)
downloadorg.eclipse.etrice-50ac0a23ad00bf6ff30f43eb0a9232e686df7070.tar.gz
org.eclipse.etrice-50ac0a23ad00bf6ff30f43eb0a9232e686df7070.tar.xz
org.eclipse.etrice-50ac0a23ad00bf6ff30f43eb0a9232e686df7070.zip
[core.fsm] bug fix for inherited detail code
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/util/FSMHelpers.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/util/FSMHelpers.java b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/util/FSMHelpers.java
index 9af8fbeb5..6bb8d82e6 100644
--- a/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/util/FSMHelpers.java
+++ b/plugins/org.eclipse.etrice.core.fsm/src/org/eclipse/etrice/core/fsm/util/FSMHelpers.java
@@ -466,7 +466,7 @@ public class FSMHelpers extends BaseHelpers {
*/
private DetailCode getInheritedCode(RefinedState rs, EReference code, boolean addFront) {
DetailCode result = FSMFactory.eINSTANCE.createDetailCode();
- result.setUsed(true);
+ boolean used = false;
State s = rs.getTarget();
while (s!=null) {
DetailCode dc = (DetailCode) s.eGet(code);
@@ -477,11 +477,14 @@ public class FSMHelpers extends BaseHelpers {
result.getLines().addAll(dc.getLines());
}
+ used = hasDetailCode(dc);
+
if (s instanceof RefinedState)
s = ((RefinedState) s).getTarget();
else
break;
}
+ result.setUsed(used);
return result;
}

Back to the top