Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-02-12 06:18:11 +0000
committerHenrik Rentz-Reichert2011-02-12 06:18:11 +0000
commit84aa6406ab882f9500f4168b55b75ca84af65ba8 (patch)
tree89f2e7360567c40362f11294224c749124d2260e
parent7d166c98ddd26505ddceda77a9b5d3773002c449 (diff)
downloadorg.eclipse.etrice-84aa6406ab882f9500f4168b55b75ca84af65ba8.tar.gz
org.eclipse.etrice-84aa6406ab882f9500f4168b55b75ca84af65ba8.tar.xz
org.eclipse.etrice-84aa6406ab882f9500f4168b55b75ca84af65ba8.zip
core.room: bug fix in validation - ExitPoint can be multiply connected
inside a state
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java13
1 files changed, 2 insertions, 11 deletions
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
index 55feb9fdd..f68599cd7 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
@@ -481,16 +481,7 @@ public class ValidationUtil {
if (((TrPointTerminal) tgt).getTrPoint() instanceof EntryPoint)
return Result.error("entry point can not be transition target");
// TransitionPoint and ExitPoint are valid destinations
- for (Transition t : sg.getTransitions()) {
- if (t==trans)
- continue;
-
- if (t.getTo() instanceof TrPointTerminal) {
- TrPointTerminal tpt = (TrPointTerminal)t.getTo();
- if (tpt.getTrPoint()==((TrPointTerminal) tgt).getTrPoint())
- return Result.error("target transition point already is connected");
- }
- }
+ // ExitPoint can be multiply connected inside a state
}
else if (tgt instanceof SubStateTrPointTerminal) {
if (((SubStateTrPointTerminal) tgt).getTrPoint() instanceof ExitPoint)
@@ -528,7 +519,7 @@ public class ValidationUtil {
else if (src instanceof TrPointTerminal) {
TrPoint srcTP = ((TrPointTerminal) src).getTrPoint();
if (srcTP instanceof ExitPoint)
- return Result.error("exit point can not be transition sources");
+ return Result.error("exit point can not be transition source");
// TransitionPoint and EntryPoint are valid
if (srcTP instanceof EntryPoint) {
for (Transition t : sg.getTransitions()) {

Back to the top