Attachment #53317 for bug #152706




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;

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;

        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
     */

Lines 26-31 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteFromModelAction.java (-1 / +23 lines)
26	import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;	26	import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
27	import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;	27	import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
28	import org.eclipse.jface.preference.IPreferenceStore;	28	import org.eclipse.jface.preference.IPreferenceStore;
		29	import org.eclipse.jface.viewers.ISelection;
		30	import org.eclipse.jface.viewers.IStructuredSelection;
		31	import org.eclipse.jface.viewers.StructuredSelection;
29	import org.eclipse.ui.IWorkbenchPage;	32	import org.eclipse.ui.IWorkbenchPage;
30	import org.eclipse.ui.IWorkbenchPart;	33	import org.eclipse.ui.IWorkbenchPart;
31		34
Lines 107-112 Link Here
107	execute(command, progressMonitor);	110	execute(command, progressMonitor);
108	}	111	}
109		112
110		113	/* (non-Javadoc)
		114	* @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#getSelection()
		115	*/
		116	protected ISelection getSelection() {
		117	ISelection selection = getWorkbenchPart().getSite()
		118	.getWorkbenchWindow().getSelectionService().getSelection();
		119
		120	return (selection != null) ? selection
		121	: StructuredSelection.EMPTY;
		122	}
		123
		124	/* (non-Javadoc)
		125	* @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#getStructuredSelection()
		126	*/
		127	protected IStructuredSelection getStructuredSelection() {
		128	ISelection selection = getWorkbenchPart().getSite()
		129	.getWorkbenchWindow().getSelectionService().getSelection();
		130	return (selection instanceof StructuredSelection) ? (StructuredSelection) selection
		131	: StructuredSelection.EMPTY;
		132	}
111		133
112	}	134	}

Return to bug 152706

Lines 18-24 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeEditPart.java (-9 lines)
18	import org.eclipse.emf.edit.domain.IEditingDomainProvider;	18	import org.eclipse.emf.edit.domain.IEditingDomainProvider;
19	import org.eclipse.emf.transaction.TransactionalEditingDomain;	19	import org.eclipse.emf.transaction.TransactionalEditingDomain;
20	import org.eclipse.emf.transaction.util.TransactionUtil;	20	import org.eclipse.emf.transaction.util.TransactionUtil;
21	import org.eclipse.gef.EditPolicy;
22	import org.eclipse.gef.editparts.AbstractTreeEditPart;	21	import org.eclipse.gef.editparts.AbstractTreeEditPart;
23	import org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService;	22	import org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService;
24	import org.eclipse.gmf.runtime.common.ui.services.icon.IconOptions;	23	import org.eclipse.gmf.runtime.common.ui.services.icon.IconOptions;
Lines 29-35 Link Here
29	import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;	28	import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
30	import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;	29	import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
31	import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;	30	import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
32	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;
33	import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;	31	import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
34	import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;	32	import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
35	import org.eclipse.gmf.runtime.notation.NotationPackage;	33	import org.eclipse.gmf.runtime.notation.NotationPackage;
Lines 104-116 Link Here
104	super.deactivate();	102	super.deactivate();
105	}	103	}
106		104
107	/**
108	* @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
109	*/
110	protected void createEditPolicies() {
111	installEditPolicy(EditPolicy.COMPONENT_ROLE, new ComponentEditPolicy());
112	}
113
114	/** gets the model as a <code>View</code>	105	/** gets the model as a <code>View</code>
115	* @return View	106	* @return View
116	*/	107	*/