Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2013-10-25 11:51:45 -0400
committerCamille Letavernier2013-10-25 11:51:45 -0400
commit8e3236d82b34f3932c0ea15d525f84b57935be7d (patch)
treee0f9452464f5651eae2c5a0c7370a2bdb61102f1 /plugins
parent4139b8c672d8ebf94ef86c1242b683fd5d320386 (diff)
downloadorg.eclipse.papyrus-8e3236d82b34f3932c0ea15d525f84b57935be7d.tar.gz
org.eclipse.papyrus-8e3236d82b34f3932c0ea15d525f84b57935be7d.tar.xz
org.eclipse.papyrus-8e3236d82b34f3932c0ea15d525f84b57935be7d.zip
419965: Display of the name must be optional
https://bugs.eclipse.org/bugs/show_bug.cgi?id=419965 420173: [All diagrams] Symbol may be displayed without respect ratio https://bugs.eclipse.org/bugs/show_bug.cgi?id=420173
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java
index 4adaae77964..84769c96c65 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ShapeDisplayCompartmentEditPart.java
@@ -391,6 +391,8 @@ public class ShapeDisplayCompartmentEditPart extends ResizableCompartmentEditPar
if(parentView.eContainer() instanceof View) {
parentView = (View)parentView.eContainer();
+ } else {
+ break;
}
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java
index 5aa2c433915..5e22d4fa3af 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/BorderDisplayEditPolicy.java
@@ -197,6 +197,8 @@ public class BorderDisplayEditPolicy extends GraphicalEditPolicyEx implements IC
if(parentView.eContainer() instanceof View) {
parentView = (View)parentView.eContainer();
+ } else {
+ break;
}
}

Back to the top