Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-05-06 09:09:32 +0000
committerptessier2014-05-06 09:09:32 +0000
commit0d214e3c57655df33884aec5fa5220407742a2d1 (patch)
tree67e2e304f786993148024d3244ef07822b7960e9
parent7f14df266a69b5a465eb71b816009c2824c21f4c (diff)
downloadorg.eclipse.papyrus-0d214e3c57655df33884aec5fa5220407742a2d1.tar.gz
org.eclipse.papyrus-0d214e3c57655df33884aec5fa5220407742a2d1.tar.xz
org.eclipse.papyrus-0d214e3c57655df33884aec5fa5220407742a2d1.zip
433566: Multi-line names for NWA surfboards suddenly stopped working
https://bugs.eclipse.org/bugs/show_bug.cgi?id=433566 Change-Id: Ie27f30eb2f065ce61b149e27dad113e27c857c7b
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java
index 3bc925321e9..ceafff3cd40 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/NamedElementEditPart.java
@@ -82,7 +82,7 @@ public abstract class NamedElementEditPart extends UMLNodeEditPart implements IU
refreshFontColor();
refreshLabelDisplay();
}
-
+
}
@Override
@@ -92,11 +92,14 @@ public abstract class NamedElementEditPart extends UMLNodeEditPart implements IU
protected void refreshLabelDisplay() {
View view = getNotationView();
- if(svgNodePlate.hasLabelBounds()){
- getNodeNamedElementFigure().getNameLabel().setTextWrap(true);
- }
- else{
- getNodeNamedElementFigure().getNameLabel().setTextWrap(false);
+ //SVGNodePlate can be null!
+ if( svgNodePlate!=null){
+ if(svgNodePlate.hasLabelBounds()){
+ getNodeNamedElementFigure().getNameLabel().setTextWrap(true);
+ }
+ else{
+ getNodeNamedElementFigure().getNameLabel().setTextWrap(false);
+ }
}
BooleanValueStyle displayNameStyle = (BooleanValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getBooleanValueStyle(), NameDisplayEditPolicy.DISPLAY_NAME);
BooleanValueStyle displayStereotypes = (BooleanValueStyle) view.getNamedStyle(NotationPackage.eINSTANCE.getBooleanValueStyle(), DISPLAY_STEREOTYPES);

Back to the top