diff options
author | Céline Janssens | 2017-04-26 08:37:09 +0000 |
---|---|---|
committer | ptessier | 2017-05-08 14:57:22 +0000 |
commit | 0427aa9a377af28389896d4723e53a75193ee95c (patch) | |
tree | 2277b229b0c2c2c840e0a5420297f1beffeefdc1 /plugins/developer | |
parent | e180f7d703f0eb77f857c023e81da0cac21411b8 (diff) | |
download | org.eclipse.papyrus-0427aa9a377af28389896d4723e53a75193ee95c.tar.gz org.eclipse.papyrus-0427aa9a377af28389896d4723e53a75193ee95c.tar.xz org.eclipse.papyrus-0427aa9a377af28389896d4723e53a75193ee95c.zip |
Bug 489116: [Sequence Diagram] Interaction Use and other fix
- Fix Null exception
- Update InteractionUseRectangle Figure
- Make the Label dimensions protected in RoundedCompartmentFigure
- Update CSS to display the interaction Header with margin
Change-Id: I73725f0432340d88af7b7cd1eb01d9296cf418a8
Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>
Diffstat (limited to 'plugins/developer')
-rw-r--r-- | plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java index a87338e7953..263333f60c5 100644 --- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java +++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/src/org/eclipse/papyrus/gmf/editpartview/view/EditPartLabelProvider.java @@ -60,18 +60,20 @@ public class EditPartLabelProvider implements ITableLabelProvider, ITableColorPr GraphicalEditPart editPart = (GraphicalEditPart) element; IFigure figure = editPart.getContentPane(); Object model = editPart.getAdapter(EObject.class); - switch (columnIndex) { - case 0: - return editPart.getClass().getSimpleName(); - case 1: - if (model instanceof NamedElement) { - return UMLLabelInternationalization.getInstance().getLabel((NamedElement) model); + if (null != figure) { + switch (columnIndex) { + case 0: + return editPart.getClass().getSimpleName(); + case 1: + if (model instanceof NamedElement) { + return UMLLabelInternationalization.getInstance().getLabel((NamedElement) model); + } + return "not a named element"; + case 2: + return figure.getClass().getSimpleName(); + case 3: + return figure.getBounds().toString(); } - return "not a named element"; - case 2: - return figure.getClass().getSimpleName(); - case 3: - return figure.getBounds().toString(); } } return "cannot display it: " + element; |