diff options
| author | Benoit Maggi | 2016-08-05 13:44:43 +0000 |
|---|---|---|
| committer | Benoit Maggi | 2016-08-05 13:45:15 +0000 |
| commit | c285430cda9b82150288176f2237db5d637a14af (patch) | |
| tree | 436111983f82371d34a8df6002add194ef775fb4 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common | |
| parent | cf5b92d130ca2d62db195d89f144161d8201a7cd (diff) | |
| download | org.eclipse.papyrus-c285430cda9b82150288176f2237db5d637a14af.tar.gz org.eclipse.papyrus-c285430cda9b82150288176f2237db5d637a14af.tar.xz org.eclipse.papyrus-c285430cda9b82150288176f2237db5d637a14af.zip | |
Bug 497678 - [SysML][Requirements] NPE while opening requirements
diagram
- change condition to fix the failing tests
Change-Id: I0196f294bbf72bc8caf397f49cabfa1d499f4e12
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common')
| -rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java index 6a8f87a0d2f..185207d770e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java @@ -323,7 +323,7 @@ public abstract class CommonDiagramDragDropEditPolicy extends AbstractDiagramDra return cc; } - if (linkVISUALID == null && nodeVISUALID != null) { + if ((linkVISUALID == null || linkVISUALID.isEmpty()) && nodeVISUALID != null) { // The element to drop is a node // Retrieve it's expected graphical parent EObject graphicalParent = ((GraphicalEditPart) getHost()).resolveSemanticElement(); @@ -339,7 +339,7 @@ public abstract class CommonDiagramDragDropEditPolicy extends AbstractDiagramDra return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE; } - if (linkVISUALID != null) { + if (linkVISUALID != null && !linkVISUALID.isEmpty()) { Collection<?> sources = linkmappingHelper.getSource((Element) droppedObject); Collection<?> targets = linkmappingHelper.getTarget((Element) droppedObject); if (sources.size() == 0 || targets.size() == 0) { @@ -560,7 +560,7 @@ public abstract class CommonDiagramDragDropEditPolicy extends AbstractDiagramDra * @return the creation node command */ protected ICommand getDefaultDropNodeCommand(EditPart hostEP, String semanticHint, Point absoluteLocation, EObject droppedObject, DropObjectsRequest request) { - List<View> existingViews = DiagramEditPartsUtil.findViews(droppedObject, getViewer()); + DiagramEditPartsUtil.findViews(droppedObject, getViewer()); // only allow one view instance of a single element by diagram // if(existingViews.isEmpty()) { |