Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael ADAM2014-10-15 12:10:00 +0000
committerMickael ADAM2014-10-16 07:37:21 +0000
commit7ef719b2b9420b6df2ed9f8b94a96c8dacb8c181 (patch)
tree14070e2091455b548f02cee5ca26fcfb8fa31077 /plugins/infra
parent0f7d71b15b872974c1042d28b0aa3ef8908073b4 (diff)
downloadorg.eclipse.papyrus-7ef719b2b9420b6df2ed9f8b94a96c8dacb8c181.tar.gz
org.eclipse.papyrus-7ef719b2b9420b6df2ed9f8b94a96c8dacb8c181.tar.xz
org.eclipse.papyrus-7ef719b2b9420b6df2ed9f8b94a96c8dacb8c181.zip
446415: [All Diagram] when labelConstraint==true, streotype label and
port label overlap https://bugs.eclipse.org/bugs/show_bug.cgi?id=446415 Patch set 1: -Bug fix in relocate method Patch set 2: -void patch to rerun compilation which have failed Patch set 3: -Gray text alignment action when Label is constrained Change-Id: I24dce5e3eb2957b486bc44b633c980c537305639 Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
index 0fb482deddb..7ce1087c4d8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusLabelEditPart.java
@@ -290,13 +290,22 @@ public abstract class PapyrusLabelEditPart extends LabelEditPart {
// get the value of the CSS property
Object model = getModel();
if (model instanceof View) {
- boolean labelConstrained = NotationUtils.getBooleanValue((View) getModel(), LABEL_CONSTRAINED, getDefaultLabelConstrained());
// set the value on the locator
- ((IPapyrusBorderItemLocator) getBorderItemLocator()).setConstrained(labelConstrained);
+ ((IPapyrusBorderItemLocator) getBorderItemLocator()).setConstrained(isLabelConstrained());
}
}
/**
+ * Checks if is label constrained.
+ *
+ * @return true, if the label is constrained
+ */
+ public boolean isLabelConstrained() {
+ boolean labelConstrained = NotationUtils.getBooleanValue((View) getModel(), LABEL_CONSTRAINED, getDefaultLabelConstrained());
+ return labelConstrained;
+ }
+
+ /**
* Gets the default label offset y.
*
* @return the default label offset y

Back to the top