diff options
| author | adaussy | 2012-07-04 09:02:01 +0000 |
|---|---|---|
| committer | adaussy | 2012-07-04 09:02:01 +0000 |
| commit | 786cd2199be303cc33d4ca109bc480d4125c1d81 (patch) | |
| tree | b23eb1858eacf35fe71553aea245964b4faac969 | |
| parent | 767e6c7387784a4500692ab93f0dc9d3ea77c5e5 (diff) | |
| download | org.eclipse.papyrus-786cd2199be303cc33d4ca109bc480d4125c1d81.tar.gz org.eclipse.papyrus-786cd2199be303cc33d4ca109bc480d4125c1d81.tar.xz org.eclipse.papyrus-786cd2199be303cc33d4ca109bc480d4125c1d81.zip | |
[Backport EYY]
NEW - bug 372745: [ActivityDiagram] Major refactoring group framework https://bugs.eclipse.org/bugs/show_bug.cgi?id=372745
Correction of an NPE
| -rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java index 420b6d3d521..f22a38f0a66 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java @@ -664,7 +664,10 @@ public class GroupRequestAdvisor implements IGroupRequestAdvisor { if(targetEditPart instanceof IGroupCompartmentEditPart) {
compartementEditPart = ((IGraphicalEditPart)targetEditPart);
} else if(targetEditPart instanceof IGraphicalEditPart) {
- compartementEditPart = request.getNodeDescpitor().getCompartmentPartFromView((IGraphicalEditPart)targetEditPart);
+ IContainerNodeDescriptor nodeDescpitor = request.getNodeDescpitor();
+ if (nodeDescpitor != null){
+ compartementEditPart = nodeDescpitor.getCompartmentPartFromView((IGraphicalEditPart)targetEditPart);
+ }
}
if(compartementEditPart != null) {
/*
|