414785: [General] Improve performances of common operations for

large-scale models
https://bugs.eclipse.org/bugs/show_bug.cgi?id=414785

Fix regression on Delete action from the previous commit. The "enabled"
state of the handler was not properly computed

1 files changed, 8 insertions, 1 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/DeleteFromModelCommandHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/DeleteFromModelCommandHandler.java
index 5fec5833c85..5fe91cae260 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/DeleteFromModelCommandHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/DeleteFromModelCommandHandler.java
@@ -98,11 +98,18 @@ public class DeleteFromModelCommandHandler extends GraphicalCommandHandler imple
 
 		for(IGraphicalEditPart editPart : getSelectedElements()) {
 			EObject semantic = EMFHelper.getEObject(editPart);
+
 			View graphical = NotationHelper.findView(editPart);
 
 			if(readOnly != null) {
 				List<URI> uris = new LinkedList<URI>();
-				if(semantic != null) {
+				if(semantic == null || semantic == graphical) {
+					return false;
+				} else {
+					if(semantic.eContainer() == null) {
+						//Do not delete root semantic element
+						return false;
+					}
 					uris.add(EcoreUtil.getURI(semantic));
 				}