summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2013-03-19 14:14:29 (EDT)
committerJuergen Haug2013-03-19 14:14:29 (EDT)
commite61c380b5daf0eaeced1e6cd60877d02606fce4c (patch)
treef88731475085ec44651cd9ec2eadb13c4ae5c0d5
parentc070cb2691d07961f1c195a6e27c374d4ecc915b (diff)
downloadorg.eclipse.etrice-e61c380b5daf0eaeced1e6cd60877d02606fce4c.zip
org.eclipse.etrice-e61c380b5daf0eaeced1e6cd60877d02606fce4c.tar.gz
org.eclipse.etrice-e61c380b5daf0eaeced1e6cd60877d02606fce4c.tar.bz2
[ui.behavior] minor fixes for inherited bendpoints and initial staterefs/changes/18/11318/1
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/InitialPointSupport.java2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/SupportUtil.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/InitialPointSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/InitialPointSupport.java
index 9c55a10..0f1e13a 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/InitialPointSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/InitialPointSupport.java
@@ -220,7 +220,7 @@ public class InitialPointSupport {
if (canMove) {
Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
if (bo instanceof StateGraph) {
- return true;
+ return !SupportUtil.isInherited(getDiagram(), (StateGraph)bo);
}
return false;
}
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/SupportUtil.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/SupportUtil.java
index c8e9baf..3c3d6c4 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/SupportUtil.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/SupportUtil.java
@@ -566,6 +566,9 @@ public class SupportUtil {
if (pe instanceof FreeFormConnection) {
FreeFormConnection conn = (FreeFormConnection) pe;
+ // JH: workaround for correct bend points of inherited self transition
+ conn.getBendpoints().clear();
+
List<Pos> points = positionProvider.getPoints(trans);
if (points!=null && !points.isEmpty()) {
Iterator<Pos> it = points.iterator();