NEW - bug 320299: [All diagram] semantic deletion from the editor can involves problem to save

https://bugs.eclipse.org/bugs/show_bug.cgi?id=320299

117 files changed, 3177 insertions, 7818 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
index 85add092c78..5fefb588c6f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
index 909f6a51368..3d4c1b2f730 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
index 26ad3c5dba3..e32de207fb7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityItemSemanticEditPolicyCLN.java
index 53ad9746cba..bd89eed82c7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActivityItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class ActivityItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPo
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
index 25db8237048..a1982ed456a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
index f1c2fb63abf..ea905cca3ff 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
index 214c9ab6840..c8f036ad162 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
index 8e9a35f6632..f005eb81ec7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
index 55eaf765731..cacaef1ac8e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
index 9fa180927ac..1df29212bf3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
index f07effd13de..9f03a087d47 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java
index 9cd391b8a29..371056e7b0c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassClassifierItemSemanticEditPolicy.java
@@ -15,20 +15,19 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

@@ -123,73 +122,20 @@ public class ClassClassifierItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
index 6c3199e1c73..561c3e0c8d1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
index 667b532403a..9bd3b8cb323 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassItemSemanticEditPolicyCLN.java
index 47519576ccd..569fab7c179 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ClassItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class ClassItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
index 2c8d7d1cd54..ca9f65838e0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -115,73 +117,20 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -210,7 +159,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -225,7 +174,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -246,7 +195,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -266,7 +215,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -281,7 +230,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -302,7 +251,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -320,7 +269,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -331,7 +280,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -351,7 +300,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -366,7 +315,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -387,7 +336,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -407,7 +356,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -422,7 +371,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -433,7 +382,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -448,7 +397,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -468,7 +417,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -483,7 +432,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -494,7 +443,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -509,7 +458,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -555,7 +504,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -570,7 +519,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -590,7 +539,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -605,7 +554,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -616,7 +565,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -631,7 +580,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -651,7 +600,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -666,7 +615,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -677,7 +626,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -692,7 +641,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
index 01f1c31e40b..57eadd38a40 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -115,73 +117,20 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -210,7 +159,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -225,7 +174,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -246,7 +195,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -266,7 +215,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -281,7 +230,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -302,7 +251,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -320,7 +269,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -331,7 +280,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -351,7 +300,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -366,7 +315,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -387,7 +336,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -407,7 +356,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -422,7 +371,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -433,7 +382,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -448,7 +397,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -468,7 +417,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -483,7 +432,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -494,7 +443,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -509,7 +458,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -555,7 +504,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -570,7 +519,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -590,7 +539,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -605,7 +554,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -616,7 +565,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -631,7 +580,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -651,7 +600,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -666,7 +615,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -677,7 +626,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -692,7 +641,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationItemSemanticEditPolicyCLN.java
index f5def40f73e..53e00a61ee0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class CollaborationItemSemanticEditPolicyCLN extends UMLBaseItemSemanticE
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
index 45e3967b7c4..f7f61c05f4a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
index 293df55d06e..a448eb736d7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
index ef8b7c6f237..f67a7fed57e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
@@ -14,18 +14,16 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -34,7 +32,6 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrained
 import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -56,42 +53,19 @@ public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
index 8295322da17..edb5f9e76ed 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -14,18 +14,16 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -34,7 +32,6 @@ import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrained
 import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -56,42 +53,19 @@ public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
index 0dd5774f663..294a1ef4e16 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
index 70168858df0..f215a0b3669 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
index 2b3e9a36941..a78117385d9 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
index a928b16e77b..85bbd108b42 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
index 021373e7d18..9af06249335 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
index 213f7b4ed83..6482fbbae61 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java
index 85630eb245d..ce159482a5c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/CreationEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class CreationEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
index cd4a673bd9b..c37a97d0db8 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
@@ -15,20 +15,19 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

@@ -109,73 +108,20 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: true

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCLN.java
index 45cc890c5f3..33f834faa61 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class DataTypeItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPo
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
index 8ad184c1bbf..5be24dcf712 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
@@ -15,20 +15,19 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

@@ -109,73 +108,20 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: true

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
index b074b93717f..c7957e60293 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
index c7dea63e8a7..9783b9b9528 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
index 20590bc521e..c1fa3e51a88 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
index 44a2b35f58e..83811698b60 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java
index 14d0681544f..f22bf01676a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DestructionEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class DestructionEventItemSemanticEditPolicy extends UMLBaseItemSemanticE
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
index 76ac2cf0477..9834806afd0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
index 1807cf0ae70..2fd0419c5f1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
index 762d5bc4a8c..bea9d3152b6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
index 2a31d69c2a3..215dc2690fe 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
index 2579961aa16..de62abfcd71 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
index 54ba14e0ab2..801a76f5ea8 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
index 0636d35edee..4778fc9aabe 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
index 7c3fb97240a..b0be81ce692 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
@@ -15,21 +15,20 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

@@ -119,73 +118,20 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCLN.java
index 72ffef02b92..c88bff3263d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class EnumerationItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
index 2421e75b650..d1ad92b2695 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
@@ -15,21 +15,20 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

@@ -119,73 +118,20 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
index 9bc83328f5b..2440750a9c1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class EnumerationLiteralItemSemanticEditPolicyCLN extends UMLBaseItemSema
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
index a2d274af752..4228190eea2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
index 65f21194e50..11084985486 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java
index 015230a3d18..bb1974c64a1 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExecutionEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class ExecutionEventItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
index ddef26fda61..53dd355e5d3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
index 9ececd8e047..e8bc67e67dc 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
index 273558fa784..04284c76051 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorItemSemanticEditPolicyCLN.java
index 7c102e10a1f..fd7dd56976b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/FunctionBehaviorItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class FunctionBehaviorItemSemanticEditPolicyCLN extends UMLBaseItemSemant
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
index 48fb73e443a..72df44ae805 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
@@ -14,13 +14,16 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -45,9 +48,13 @@ public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
index 0bf1a72b9f6..a43d7601bc0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
index 3537a56b884..c2148306706 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,77 +99,19 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
index cb0f8f212bc..1a00fd79657 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,77 +99,19 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
index 599977b54c6..88e1758fd04 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
index cb2a7bb5142..66a40e2ad24 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
index ae637c8f225..7ac5558b687 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
index 84095492599..8f7604cc0f4 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
index c896b955d2f..318734d7384 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSe
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionItemSemanticEditPolicyCLN.java
index 754ad0bb6a5..0a14cf6eed8 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InteractionItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class InteractionItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
index 10b28ee732a..2e176efb3e4 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
@@ -15,20 +15,18 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

@@ -106,73 +104,20 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCLN.java
index 45a81f44235..899b9cd19a4 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class InterfaceItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditP
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
index e73284b5665..a60c2016a86 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
@@ -15,20 +15,18 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

@@ -106,73 +104,20 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
index cb0105b6d07..1226af69fe8 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
index 37de14ea0b9..477453126d6 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
index 1944c898c76..e5b5429540d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
index 9f064f050b5..cb708f01677 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
index e5ca509b627..59fd5f1f01f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
index 84c614b27c8..1bb5da4357f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
index 56ee9b28db3..0cdd25ae42d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
index c13deff817d..84d73f0f611 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
index c828ce978a2..a294dcc4092 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
index b6c0140adb2..9bc25465765 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
index 5d9a5472237..0617dcb51aa 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
index dc1c54d62df..f293af44873 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -149,73 +151,20 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -240,7 +189,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -255,7 +204,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -276,7 +225,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -300,7 +249,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -315,7 +264,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -336,7 +285,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -356,7 +305,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -371,7 +320,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -392,7 +341,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -412,7 +361,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -427,7 +376,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -448,7 +397,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -469,7 +418,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -485,7 +434,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -507,7 +456,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -528,7 +477,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -566,7 +515,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -587,7 +536,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -603,7 +552,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -625,7 +574,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -646,7 +595,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -662,7 +611,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -684,7 +633,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -705,7 +654,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -721,7 +670,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -743,7 +692,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -764,7 +713,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -780,7 +729,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -802,7 +751,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -823,7 +772,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -839,7 +788,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -861,7 +810,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -882,7 +831,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -898,7 +847,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -920,7 +869,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -941,7 +890,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -957,7 +906,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -979,7 +928,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1000,7 +949,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1016,7 +965,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1038,7 +987,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1059,7 +1008,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1075,7 +1024,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1097,7 +1046,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1118,7 +1067,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1134,7 +1083,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1156,7 +1105,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1177,7 +1126,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1193,7 +1142,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1215,7 +1164,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1236,7 +1185,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1252,7 +1201,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1274,7 +1223,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1295,7 +1244,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1311,7 +1260,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1333,7 +1282,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1354,7 +1303,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1370,7 +1319,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1392,7 +1341,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1413,7 +1362,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1429,7 +1378,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1451,7 +1400,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1472,7 +1421,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1488,7 +1437,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1510,7 +1459,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1531,7 +1480,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1547,7 +1496,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1569,7 +1518,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1590,7 +1539,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1606,7 +1555,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1617,7 +1566,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1633,7 +1582,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1654,7 +1603,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1670,7 +1619,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1692,7 +1641,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1713,7 +1662,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1729,7 +1678,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1751,7 +1700,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1769,7 +1718,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1780,7 +1729,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1800,7 +1749,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1815,7 +1764,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1826,7 +1775,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1841,7 +1790,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1861,7 +1810,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1876,7 +1825,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1887,7 +1836,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1902,7 +1851,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1922,7 +1871,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1937,7 +1886,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1948,7 +1897,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1963,7 +1912,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1983,7 +1932,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1998,7 +1947,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2009,7 +1958,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2024,7 +1973,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2044,7 +1993,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2059,7 +2008,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2070,7 +2019,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2085,7 +2034,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
index 3b286768e3f..f5aec51be40 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
index f093169722d..aaf7d2b5961 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorItemSemanticEditPolicyCLN.java
index 6d1bb48811f..9b5f7962a23 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueBehaviorItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class OpaqueBehaviorItemSemanticEditPolicyCLN extends UMLBaseItemSemantic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
index 95f78b83b21..72b0985c7e2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
index 67ab989f178..14eba57a355 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class OperationItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditP
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
index bb26c7142e7..3dfe894e156 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
index 0b013bd142c..b92e7489c4f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
index ca1ab002354..529809a8e35 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCLN.java
index 2b861613ff2..2426fc00a5b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class PrimitiveTypeItemSemanticEditPolicyCLN extends UMLBaseItemSemanticE
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
index 1f5a756296a..00925f1fde2 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
index 3b6f8dea131..27edfeed9ca 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class PropertyItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPo
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
index 6a97e2dd920..d5b3ae31bda 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -115,70 +117,20 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: true

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -203,7 +155,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -218,7 +170,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -239,7 +191,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -263,7 +215,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -278,7 +230,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -299,7 +251,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -319,7 +271,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -334,7 +286,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -355,7 +307,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -373,7 +325,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -384,7 +336,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
index 02c65bca464..43b51772062 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
index dccdfe42af7..ce7c01d41b7 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineItemSemanticEditPolicyCLN.java
index d1f26bf3c6f..1bf95c09d51 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ProtocolStateMachineItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class ProtocolStateMachineItemSemanticEditPolicyCLN extends UMLBaseItemSe
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
index ed829a3f428..777f5f4b5ec 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ReceptionItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ReceptionItemSemanticEditPolicyCLN.java
index 90901906758..1b6a242ce8a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ReceptionItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/ReceptionItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class ReceptionItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditP
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
index 7c9a2cc6a2e..bdd67d3a41b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java
index 8e2672a1ef3..26bec081d9f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendOperationEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class SendOperationEventItemSemanticEditPolicy extends UMLBaseItemSemanti
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java
index 1a5f4a2d5fa..84ae6b6e560 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SendSignalEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class SendSignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
index f6e6da084d1..059451e7287 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
index 95b33cd1cdd..553d89bf435 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
index 34a0ffaee9e..30e89c20f98 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
index d49a49d37bf..80530c4594c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
index 99caec3faae..2f81f6a0c03 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
@@ -15,11 +15,13 @@ package org.eclipse.papyrus.diagram.composite.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

@@ -154,73 +156,20 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

+		cmd.setTransactionNestingEnabled(true);

 

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyChildNodesCommand(cmd);

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

@@ -245,7 +194,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -260,7 +209,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -281,7 +230,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -301,7 +250,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 					case ConnectorDurationObservationEditPart.VISUAL_ID:

 						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 						cmd.add(new DestroyReferenceCommand(destroyRefReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					case ComponentRealizationEditPart.VISUAL_ID:

 					case InterfaceRealizationEditPart.VISUAL_ID:

@@ -316,7 +265,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 						break;

 					}

 				}

@@ -337,7 +286,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 					case InformationFlowEditPart.VISUAL_ID:

 						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 						cmd.add(new DestroyElementCommand(destroyEltReq));

-						cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 						break;

 					}

 				}

@@ -361,7 +310,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -376,7 +325,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -397,7 +346,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -417,7 +366,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -432,7 +381,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -453,7 +402,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -473,7 +422,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -488,7 +437,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -509,7 +458,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -529,7 +478,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -544,7 +493,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -565,7 +514,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -586,7 +535,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -602,7 +551,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -624,7 +573,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -645,7 +594,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -661,7 +610,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -683,7 +632,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -704,7 +653,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -720,7 +669,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -742,7 +691,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -763,7 +712,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -779,7 +728,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -801,7 +750,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -822,7 +771,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -838,7 +787,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -860,7 +809,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -881,7 +830,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -897,7 +846,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -919,7 +868,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -940,7 +889,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -956,7 +905,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -978,7 +927,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -999,7 +948,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1015,7 +964,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1037,7 +986,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1058,7 +1007,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1074,7 +1023,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1096,7 +1045,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1117,7 +1066,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1133,7 +1082,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1155,7 +1104,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1176,7 +1125,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1192,7 +1141,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1214,7 +1163,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1235,7 +1184,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1251,7 +1200,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1273,7 +1222,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1294,7 +1243,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1310,7 +1259,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1332,7 +1281,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1353,7 +1302,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1369,7 +1318,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1391,7 +1340,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1412,7 +1361,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1428,7 +1377,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1450,7 +1399,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1471,7 +1420,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1487,7 +1436,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1509,7 +1458,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1530,7 +1479,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1546,7 +1495,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1568,7 +1517,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1589,7 +1538,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1605,7 +1554,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1627,7 +1576,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1648,7 +1597,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1664,7 +1613,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1686,7 +1635,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1707,7 +1656,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1723,7 +1672,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1734,7 +1683,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1750,7 +1699,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1771,7 +1720,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1787,7 +1736,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1809,7 +1758,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1830,7 +1779,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case RepresentationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1846,7 +1795,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1868,7 +1817,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1886,7 +1835,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1897,7 +1846,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case CommentAnnotatedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1917,7 +1866,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1932,7 +1881,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -1943,7 +1892,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1958,7 +1907,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -1978,7 +1927,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -1993,7 +1942,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2004,7 +1953,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2019,7 +1968,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2039,7 +1988,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2054,7 +2003,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2065,7 +2014,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2080,7 +2029,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2100,7 +2049,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2115,7 +2064,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2126,7 +2075,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2141,7 +2090,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

@@ -2161,7 +2110,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConnectorDurationObservationEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2176,7 +2125,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

 								break;

 							}

 						}

@@ -2187,7 +2136,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case ConstraintConstrainedElementEditPart.VISUAL_ID:

 								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

 								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							case ComponentRealizationEditPart.VISUAL_ID:

 							case InterfaceRealizationEditPart.VISUAL_ID:

@@ -2202,7 +2151,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 							case InformationFlowEditPart.VISUAL_ID:

 								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

 								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

+								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

 								break;

 							}

 						}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineItemSemanticEditPolicyCLN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineItemSemanticEditPolicyCLN.java
index cef8d5bc08f..86c89d134ff 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StateMachineItemSemanticEditPolicyCLN.java
@@ -14,8 +14,10 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

@@ -43,16 +45,14 @@ public class StateMachineItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

-

-

+		cmd.setTransactionNestingEnabled(true);

 

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
index a8585a6e315..e23254e3772 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
index 45b01f6efa6..df8158bac1d 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
index 0430668ba24..6d5d1568b9e 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
index 529aea8121e..2fca9ed2d33 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
index 3c0d237e77b..da8f3e23ba0 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
index e9943e4df4f..1b66ca948c3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
index 0e1a55dc449..86612bd26bb 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,69 +93,19 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
index d9944d45430..81c9c3a14ac 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -75,7 +72,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RealizationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -97,74 +93,19 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
index 209abdda2c1..f4cbc0ace99 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
@@ -14,14 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

+import java.util.List;

 

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGEFCommandWrapper;

+import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionReorientCommand;

 import org.eclipse.papyrus.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -85,9 +88,13 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 	 * @generated

 	 */

 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		ArrayList todestroy = new ArrayList();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		List<EObject> todestroy = new ArrayList<EObject>();

 		todestroy.add(req.getElementToDestroy());

-		return new EMFtoGEFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy));

+		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+		cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		return getGEFWrapper(cmd.reduce());

 		//return getGEFWrapper(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
index c6e13c5f67c..4507c4d2735 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
index b6af816db93..84785ed319b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.composite/src/org/eclipse/papyrus/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
@@ -14,20 +14,17 @@
 package org.eclipse.papyrus.diagram.composite.edit.policies;

 

 import java.util.ArrayList;

-import java.util.Iterator;

+import java.util.List;

 

 import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

 import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.common.command.wrappers.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.diagram.composite.edit.commands.AbstractionCreateCommand;

@@ -81,7 +78,6 @@ import org.eclipse.papyrus.diagram.composite.edit.parts.RepresentationEditPart;
 import org.eclipse.papyrus.diagram.composite.edit.parts.RoleBindingEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.SubstitutionEditPart;

 import org.eclipse.papyrus.diagram.composite.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.composite.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.diagram.composite.providers.UMLElementTypes;

 

 /**

@@ -103,72 +99,19 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {

 		View view = (View)getHost().getModel();

 		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(false);

+		cmd.setTransactionNestingEnabled(true);

 

-

-		for(Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) {

-			Edge incomingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-			case CommentAnnotatedElementEditPart.VISUAL_ID:

-			case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			case ConnectorTimeObservationEditPart.VISUAL_ID:

-			case ConnectorDurationObservationEditPart.VISUAL_ID:

-			case RepresentationEditPart.VISUAL_ID:

-				DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-				cmd.add(new DestroyReferenceCommand(destroyRefReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), incomingLink));

-				break;

-			}

-		}

-

-		for(Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) {

-			Edge outgoingLink = (Edge)it.next();

-			switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-			case ComponentRealizationEditPart.VISUAL_ID:

-			case InterfaceRealizationEditPart.VISUAL_ID:

-			case SubstitutionEditPart.VISUAL_ID:

-			case RealizationEditPart.VISUAL_ID:

-			case ManifestationEditPart.VISUAL_ID:

-			case AbstractionEditPart.VISUAL_ID:

-			case UsageEditPart.VISUAL_ID:

-			case DeploymentEditPart.VISUAL_ID:

-			case RoleBindingEditPart.VISUAL_ID:

-			case DependencyEditPart.VISUAL_ID:

-			case GeneralizationEditPart.VISUAL_ID:

-			case InformationFlowEditPart.VISUAL_ID:

-				DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-				cmd.add(new DestroyElementCommand(destroyEltReq));

-				cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink));

-				break;

-			}

-		}

 		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

 		if(annotation == null) {

 			// there are indirectly referenced children, need extra commands: false

 			addDestroyShortcutsCommand(cmd, view);

 			// delete host element

-			ArrayList todestroy = new ArrayList();

+			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

 			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(), todestroy)));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

-			cmd.add(new DeleteCommand(getEditingDomain(), view));

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 		}

 		return getGEFWrapper(cmd.reduce());

 	}