### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.runtime.diagram.ui
Index: src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeEditPart.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeEditPart.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 TreeEditPart.java
--- src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeEditPart.java	14 Sep 2006 19:50:46 -0000	1.1.2.1
+++ src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeEditPart.java	6 Nov 2006 19:02:36 -0000
@@ -18,7 +18,6 @@
 import org.eclipse.emf.edit.domain.IEditingDomainProvider;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.editparts.AbstractTreeEditPart;
 import org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService;
 import org.eclipse.gmf.runtime.common.ui.services.icon.IconOptions;
@@ -29,7 +28,6 @@
 import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
 import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;
 import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
@@ -104,13 +102,6 @@
         super.deactivate();
     }
 
-    /**
-     * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
-     */
-    protected void createEditPolicies() {
-        installEditPolicy(EditPolicy.COMPONENT_ROLE, new ComponentEditPolicy());
-    }
-
     /** gets the model as a <code>View</code>
      * @return View
      */
Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteFromModelAction.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteFromModelAction.java,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 PromptingDeleteFromModelAction.java
--- src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteFromModelAction.java	13 Sep 2006 16:43:40 -0000	1.6.2.1
+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteFromModelAction.java	6 Nov 2006 19:02:36 -0000
@@ -26,6 +26,9 @@
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 
@@ -107,6 +110,25 @@
 			execute(command, progressMonitor);
 	}
 	
-
+    /* (non-Javadoc)
+     * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#getSelection()
+     */
+    protected ISelection getSelection() {
+        ISelection selection = getWorkbenchPart().getSite()
+            .getWorkbenchWindow().getSelectionService().getSelection();
+
+        return (selection != null) ? selection
+            : StructuredSelection.EMPTY;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#getStructuredSelection()
+     */
+    protected IStructuredSelection getStructuredSelection() {
+        ISelection selection = getWorkbenchPart().getSite()
+            .getWorkbenchWindow().getSelectionService().getSelection();
+        return (selection instanceof StructuredSelection) ? (StructuredSelection) selection
+            : StructuredSelection.EMPTY;
+    }
 
 }