Bug 435197 - [Model Explorer] Copy/paste generates NPE on SysML::Blocks

  - patch the NullPointer in PartPasteStrategy 
  - migrate sysml.modelexplorer.test from fragment to plugin in order to
use the new AbstractEditorTest of junit.utils 
  - add test for non regression
  
Change-Id: I73e824848f39ac09475c9e95932822fed2136fd4
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

1 files changed, 4 insertions, 2 deletions

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java
index ccc8fbaa5ed..d58723a50da 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/strategy/paste/PartPasteStrategy.java
@@ -170,8 +170,10 @@ public class PartPasteStrategy implements IPasteStrategy {
 						PartBlockAdditionalData partBlockAdditionalData = (PartBlockAdditionalData)additionnalData;
 						for(Property property : allAttributes) {
 							Association duplicatedAssociation = partBlockAdditionalData.getDuplicatedAssociationByPropertyName(property.getName());
-							restoreAssociationPartContext(classifier, property, duplicatedAssociation);
-							listDuplicatedAssociation.add(duplicatedAssociation);
+							if (duplicatedAssociation != null){
+								restoreAssociationPartContext(classifier, property, duplicatedAssociation);
+								listDuplicatedAssociation.add(duplicatedAssociation);								
+							}
 						}
 						associationContainer = targetOwner;
 					}