diff options
| author | skovalsky | 2015-04-14 12:31:18 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2015-04-21 16:14:30 +0000 |
| commit | 1d52aeadc927fa8e283ee13b30861aacced6ee35 (patch) | |
| tree | a171f1f64435508dce45f0b4db5d12d1663a2e58 | |
| parent | 0960cd7664d32e4035e15d3698db048335780d73 (diff) | |
| download | org.eclipse.papyrus-1d52aeadc927fa8e283ee13b30861aacced6ee35.tar.gz org.eclipse.papyrus-1d52aeadc927fa8e283ee13b30861aacced6ee35.tar.xz org.eclipse.papyrus-1d52aeadc927fa8e283ee13b30861aacced6ee35.zip | |
Bug 464027 - [Activity Diagram] Empty pin names shown as null in the
diagram
Change-Id: I17c7aa8ec45485f09490d0099f91be5fd141906f
Signed-off-by: skovalsky <kovalsky@montages.com>
Reviewed-on: https://git.eclipse.org/r/45799
Reviewed-by: Michael Golubev <golubev@montages.com>
Tested-by: Hudson CI
Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>
| -rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinLabelHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinLabelHelper.java index f4190a8e127..3067cc6e2c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinLabelHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/PinLabelHelper.java @@ -65,7 +65,7 @@ public class PinLabelHelper extends StereotypedElementLabelHelper { StringBuffer buffer = new StringBuffer(); if (maskValues.contains(ICustomAppearance.DISP_NAME)) { buffer.append(" "); - buffer.append(namedElement.getName()); + buffer.append(namedElement.getName()== null ? "" : namedElement.getName()); } if (namedElement instanceof TypedElement) { if (maskValues.contains(ICustomAppearance.DISP_TYPE)) { @@ -76,7 +76,7 @@ public class PinLabelHelper extends StereotypedElementLabelHelper { } } } - return buffer.toString(); + return buffer.toString().trim(); } /** |