diff options
author | Bruno Marques | 2015-05-26 09:55:30 +0000 |
---|---|---|
committer | Patrick Tessier | 2015-05-27 07:11:36 +0000 |
commit | 576f39b13f86998615aac65ab6011aa9632ab0dd (patch) | |
tree | 6722831cf2d0dc94f10f43e4cc536d9d63a3ce97 | |
parent | ee4c28ad55277145aa1e56d5d66510e2e9dcd7d7 (diff) | |
download | org.eclipse.papyrus-576f39b13f86998615aac65ab6011aa9632ab0dd.tar.gz org.eclipse.papyrus-576f39b13f86998615aac65ab6011aa9632ab0dd.tar.xz org.eclipse.papyrus-576f39b13f86998615aac65ab6011aa9632ab0dd.zip |
Bug 463290 - Papyrus diagram shall be expanded with new visual graphical
Fix bug about relation between childrens and parents in the Expansion
framework
Change-Id: I6cb51a2ff71c3c69b0c6882695acb12a5dd29f9a
Signed-off-by: Bruno Marques <bruno.marques@cea.fr>
Reviewed-on: https://git.eclipse.org/r/48606
Tested-by: Hudson CI
Reviewed-by: Patrick Tessier <Patrick.Tessier@cea.fr>
-rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java index edad8f3d61d..217df2b72bb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java @@ -226,7 +226,8 @@ public abstract class UMLNodeEditPart extends NodeEditPart implements IUMLEditPa //look for accepted element in compartments to find good compartment for (String compartmentHint : possibleChildreenIDs) { List<String> compartmentChildreenIDs=diagramExpansionRegistry.mapChildreen.get(diagramType).parentChildrenRelation.get(compartmentHint); - if( compartmentChildreenIDs.contains(elementHint)){ + + if( compartmentChildreenIDs!=null &&compartmentChildreenIDs.contains(elementHint)){ //find the edipart that can respond to this accepted hint List<?> subEditParts=getChildren(); for (Object object : subEditParts) { |