[ui.behavior] bug 403652: [ui.behavior] can't init diagram in special situation with entry point in base class

https://bugs.eclipse.org/bugs/show_bug.cgi?id=403652

1 files changed, 7 insertions, 0 deletions

diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TrPointSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TrPointSupport.java
index 21d7e5e73..3f46b00cd 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TrPointSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TrPointSupport.java
@@ -25,6 +25,7 @@ import org.eclipse.etrice.core.room.State;
 import org.eclipse.etrice.core.room.StateGraph;

 import org.eclipse.etrice.core.room.TrPoint;

 import org.eclipse.etrice.core.room.TransitionPoint;

+import org.eclipse.etrice.core.room.util.RoomHelpers;

 import org.eclipse.etrice.core.validation.ValidationUtil;

 import org.eclipse.etrice.ui.behavior.ImageProvider;

 import org.eclipse.etrice.ui.behavior.dialogs.TrPointPropertyDialog;

@@ -347,6 +348,12 @@ public class TrPointSupport {
 					s = (State) ((StateGraph)bo).eContainer();

 					elements = Graphiti.getLinkService().getPictogramElements(getDiagram(), s);

 				}

+				if (elements.isEmpty()) {

+			        ActorClass ac = SupportUtil.getActorClass(getDiagram());

+					s = RoomHelpers.getTargettingState(s, ac);

+					assert(s!=null): "a refined state should point to our parent state";

+					elements = Graphiti.getLinkService().getPictogramElements(getDiagram(), s);

+				}

 				assert(elements.size()==1): "expected unique pe";

 				assert(elements.get(0) instanceof ContainerShape): "expected state shape";

 				ContainerShape stateShape = (ContainerShape) elements.get(0);