diff options
author | Ansgar Radermacher | 2013-10-28 19:13:41 +0000 |
---|---|---|
committer | Ansgar Radermacher | 2013-10-28 19:13:41 +0000 |
commit | d1c3c4259ea1a66ced0b70a43f1907ba2e1cd5bd (patch) | |
tree | 7e29e6bd18731e79002ed1eb71e84379062effce /extraplugins | |
parent | 1e941fe5147264d0e25e1802b568e5de5cf670a8 (diff) | |
download | org.eclipse.papyrus-d1c3c4259ea1a66ced0b70a43f1907ba2e1cd5bd.tar.gz org.eclipse.papyrus-d1c3c4259ea1a66ced0b70a43f1907ba2e1cd5bd.tar.xz org.eclipse.papyrus-d1c3c4259ea1a66ced0b70a43f1907ba2e1cd5bd.zip |
- Moved DialogUtils to org.eclipse.papyrus.infra.widgets.toolbox & simplified CmdHandler. Context: [Bug 420280] [QDesigner] refactoring: separation of user interface and transformation plugin
Diffstat (limited to 'extraplugins')
19 files changed, 107 insertions, 301 deletions
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/AllocationDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/AllocationDialog.java index 0a3b0feba50..6f6c8ad5ac6 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/AllocationDialog.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/AllocationDialog.java @@ -21,6 +21,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.papyrus.FCM.DeploymentPlan; import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; +import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils; import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils; import org.eclipse.papyrus.qompass.designer.core.deployment.BootLoaderGen; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConfigureInstanceDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConfigureInstanceDialog.java index 0f3a67cbe7b..0dd9cb7eb23 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConfigureInstanceDialog.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConfigureInstanceDialog.java @@ -27,6 +27,7 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.papyrus.FCM.ContainerRule; +import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils; import org.eclipse.papyrus.qompass.designer.core.ConfigUtils; import org.eclipse.papyrus.qompass.designer.core.Description; import org.eclipse.papyrus.qompass.designer.core.Utils; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConfigurePortDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConfigurePortDialog.java index dc1d2c661dd..b26d0ff49da 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConfigurePortDialog.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConfigurePortDialog.java @@ -30,6 +30,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.papyrus.FCM.PortKind; import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog; +import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils; import org.eclipse.papyrus.qompass.designer.core.Description; import org.eclipse.papyrus.qompass.designer.core.PortUtils; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConnectorSelectionDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConnectorSelectionDialog.java index 9e84c33dafd..5fbafd34a0a 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConnectorSelectionDialog.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ConnectorSelectionDialog.java @@ -23,6 +23,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.UniqueEList; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.FCM.InteractionComponent; +import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils; import org.eclipse.papyrus.qompass.designer.core.Description; import org.eclipse.papyrus.qompass.designer.core.Log; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ContainerDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ContainerDialog.java index ae643fe146e..517e41f84b3 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ContainerDialog.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/ContainerDialog.java @@ -25,6 +25,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.papyrus.FCM.ContainerRule; import org.eclipse.papyrus.FCM.RuleApplication; +import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils; import org.eclipse.papyrus.qompass.designer.core.Description; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.papyrus.qompass.designer.core.Utils; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/DialogUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/DialogUtils.java deleted file mode 100644 index 44ce663ba96..00000000000 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/dialogs/DialogUtils.java +++ /dev/null @@ -1,103 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2013 CEA LIST. - * - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ansgar Radermacher ansgar.radermacher@cea.fr - * - *****************************************************************************/ - -package org.eclipse.papyrus.qompass.designer.core.dialogs; - -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.dialogs.FilteredList; - - -public class DialogUtils { - - public static FilteredList createFilteredList(Composite parent, ILabelProvider labelProvider, - int width, int height, int style) { - FilteredList list = new FilteredList(parent, style, labelProvider, - true, true, true); - - GridData data = new GridData(); - data.widthHint = width; - // data.heightHint = convertHeightInCharsToPixels(height); - data.heightHint = height; - data.grabExcessVerticalSpace = true; - data.grabExcessHorizontalSpace = true; - data.horizontalAlignment = GridData.FILL; - data.verticalAlignment = GridData.FILL; - list.setLayoutData(data); - list.setFont(parent.getFont()); - return list; - } - - /* - * public static List createList (Composite parent, ILabelProvider labelProvider, - * int width, int height, int style) - * { - * style = SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | style; - * - * List list = new List (parent, style); - * - * GridData data = new GridData(); - * data.widthHint = width; - * // data.heightHint = convertHeightInCharsToPixels(height); - * data.heightHint = height; - * data.grabExcessVerticalSpace = true; - * data.grabExcessHorizontalSpace = true; - * data.horizontalAlignment = GridData.FILL; - * data.verticalAlignment = GridData.FILL; - * list.setLayoutData(data); - * list.setFont (parent.getFont()); - * return list; - * } - */ - - public static Combo createComboWithText(Composite parent, String label, int flags, int compFlags) { - Composite comboComposite = new Composite(parent, compFlags); - comboComposite.setLayout(new GridLayout(2, false)); - Label comboLabel = new Label(comboComposite, SWT.NONE); - comboLabel.setText(label); - Combo combo = new Combo(comboComposite, flags); - comboComposite.pack(); - return combo; - } - - public static Button createButtonWithText(Composite parent, String label, int flags, int compFlags) { - Composite buttonComposite = new Composite(parent, compFlags); - buttonComposite.setLayout(new GridLayout(2, false)); - Label buttonLabel = new Label(buttonComposite, SWT.NONE); - buttonLabel.setText(label); - Button button = new Button(buttonComposite, flags); - buttonComposite.pack(); - return button; - } - - /** - * Create a GridData object which fills the available vertical and horizontal space - * - * @return - */ - public static GridData createFillGridData() { - GridData gridData = new GridData(); - gridData.grabExcessVerticalSpace = true; - gridData.grabExcessHorizontalSpace = true; - gridData.horizontalAlignment = GridData.FILL; - gridData.verticalAlignment = GridData.FILL; - return gridData; - } -} diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/AddProfileAndModelLibsHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/AddProfileAndModelLibsHandler.java index d98c2796769..af25e7c2a56 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/AddProfileAndModelLibsHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/AddProfileAndModelLibsHandler.java @@ -70,8 +70,7 @@ public class AddProfileAndModelLibsHandler extends CmdHandler { @Override
public boolean isEnabled() {
updateSelectedEObject();
- EObject selectedObj = getSelectedEObject();
- if(selectedObj instanceof Package) {
+ if(selectedEObject instanceof Package) {
return true;
}
return false;
@@ -149,10 +148,10 @@ public class AddProfileAndModelLibsHandler extends CmdHandler { * {@inheritDoc}
*/
public Object execute(ExecutionEvent event) throws ExecutionException {
- if(!(getSelectedEObject() instanceof Package)) {
+ if(!(selectedEObject instanceof Package)) {
return null;
}
- final Package selectedPkg = (Package)getSelectedEObject();
+ final Package selectedPkg = (Package)selectedEObject;
final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(selectedPkg);
final ResourceSet resourceSet = selectedPkg.eResource().getResourceSet();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/AllocateHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/AllocateHandler.java index c2627926cd0..cc4c9d26781 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/AllocateHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/AllocateHandler.java @@ -4,23 +4,22 @@ * with the CEA. * * Contributors: - * CEA LIST - initial API and implementation + * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation *******************************************************************************/ package org.eclipse.papyrus.qompass.designer.core.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.papyrus.FCM.DeploymentPlan; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult; -import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils; import org.eclipse.papyrus.qompass.designer.core.dialogs.AllocationDialog; +import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Package; @@ -34,9 +33,8 @@ public class AllocateHandler extends CmdHandler { */ public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if(selectedObj instanceof Package) { - return (StereotypeUtil.isApplied((Package)selectedObj, DeploymentPlan.class)); + if(selectedEObject instanceof Package) { + return (StereotypeUtil.isApplied((Package)selectedEObject, DeploymentPlan.class)); } return false; } @@ -46,11 +44,11 @@ public class AllocateHandler extends CmdHandler { */ public Object execute(ExecutionEvent event) throws ExecutionException { - if(!(getSelectedEObject() instanceof Package)) { + if(!(selectedEObject instanceof Package)) { return null; } - final Package cdp = (Package)getSelectedEObject(); + final Package cdp = (Package)selectedEObject; final Shell shell = new Shell(); // org.eclipse.papyrus.qompass.designer.vsl.ParseVSL.test(); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CmdHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CmdHandler.java index d9387503538..9a3cf254362 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CmdHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CmdHandler.java @@ -7,134 +7,43 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation + * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation *****************************************************************************/ package org.eclipse.papyrus.qompass.designer.core.handlers; -import java.util.Iterator; -import java.util.List; -import java.util.Vector; - import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.ecore.EObject; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IObjectActionDelegate; -import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver; import org.eclipse.ui.PlatformUI; -import org.eclipse.uml2.uml.Element; - - /** - * Handler for the command of customization of the content of the properties view - * The same class is used for menu actions within model explorer and diagram + * Superclass for handlers. It converts a selection into an EObject */ -public class CmdHandler extends AbstractHandler implements IObjectActionDelegate { - - /** - * {@inheritDoc} - */ - public Object execute(ExecutionEvent event) throws ExecutionException { - Display current = Display.getCurrent(); - - if(current == null) { - current = Display.getDefault(); - } - Shell shell = current.getActiveShell(); - - if(shell == null) { - // Activator.log.error("impossible to find a shell to open the message dialog", null); - } - - return null; - } +public abstract class CmdHandler extends AbstractHandler { /** - * Convert each selected elements from the explorator menu, or modeling view - * to an EObject and add it to a list - * - * @return list of EObject + * Convert selected elements within model explorer or diagram to an eObject */ public void updateSelectedEObject() { - Vector<EObject> currentSelectedEObjects = new Vector<EObject>(); - // Retrieve selected elements IStructuredSelection selection = (IStructuredSelection)PlatformUI .getWorkbench().getActiveWorkbenchWindow() .getSelectionService().getSelection(); - - Iterator<?> eltIt = (Iterator<?>)selection.iterator(); - - while(eltIt.hasNext()) { - Object currentObject = eltIt.next(); - - // If the object is an edit part, try to get semantic bridge - if(currentObject instanceof GraphicalEditPart) { - GraphicalEditPart editPart = (GraphicalEditPart)currentObject; - if(editPart.getModel() instanceof View) { - View view = (View)editPart.getModel(); - if(view.getElement() instanceof Element) { - currentObject = (Element)view.getElement(); - } - } + + if(selection != null) { + Object selectedObject = BusinessModelResolver.getInstance().getBusinessModel(selection.getFirstElement()); + if (selectedObject instanceof EObject) { + selectedEObject = (EObject) selectedObject; } - - // check whether part of model explorer - if(currentObject instanceof IAdaptable) { - // modisco ModelElementItem supports IAdaptable (cleaner than cast / dependency with modisco) - currentObject = ((IAdaptable)currentObject).getAdapter(EObject.class); - } - - // If element is a UML Element - if(currentObject instanceof Element) { - currentSelectedEObjects.add((EObject)currentObject); - } - } - selectedEObjects = currentSelectedEObjects; } /** - * Convert each selected elements from the explorer menu, or modeling view - * to an EObject and add it to a list - * - * @return list of EObject + * Store the selected EObject. Accessible for subclasses */ - public EObject getSelectedEObject() { - if(selectedEObjects.size() > 0) { - return selectedEObjects.get(0); - } - return null; - } - - public List<EObject> getSelectedEObjects() { - return selectedEObjects; - } - - private List<EObject> selectedEObjects; - - public void run(IAction action) { - // method from action-delegate - } - - public void selectionChanged(IAction action, ISelection selection) { - // method from action-delegate - updateSelectedEObject(); // required?? - } - - public void setActivePart(IAction action, IWorkbenchPart targetPart) { - // TODO Auto-generated method stub - } + protected EObject selectedEObject; } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/ConfigureInstanceHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/ConfigureInstanceHandler.java index 5733b1c6d15..b51b678e158 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/ConfigureInstanceHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/ConfigureInstanceHandler.java @@ -11,7 +11,6 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; @@ -36,11 +35,10 @@ public class ConfigureInstanceHandler extends CmdHandler { @Override public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if((selectedObj instanceof Class) || - (selectedObj instanceof Connector) || - (selectedObj instanceof Property) || - (selectedObj instanceof InstanceSpecification)) { + if((selectedEObject instanceof Class) || + (selectedEObject instanceof Connector) || + (selectedEObject instanceof Property) || + (selectedEObject instanceof InstanceSpecification)) { return true; } return false; @@ -52,11 +50,11 @@ public class ConfigureInstanceHandler extends CmdHandler { * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ public Object execute(ExecutionEvent event) throws ExecutionException { - if(!(getSelectedEObject() instanceof NamedElement)) { + if(!(selectedEObject instanceof NamedElement)) { return null; } - final NamedElement element = (NamedElement)getSelectedEObject(); + final NamedElement element = (NamedElement)selectedEObject; final Shell shell = new Shell(); // 1. select possible connectors according to port types diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/ConfigurePortHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/ConfigurePortHandler.java index ca0b1dd5b23..6ab36ddef14 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/ConfigurePortHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/ConfigurePortHandler.java @@ -11,7 +11,6 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; @@ -35,9 +34,8 @@ public class ConfigurePortHandler extends CmdHandler { @Override public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if((selectedObj instanceof Class) || - (selectedObj instanceof Port)) { + if((selectedEObject instanceof Class) || + (selectedEObject instanceof Port)) { return true; } return false; @@ -49,11 +47,11 @@ public class ConfigurePortHandler extends CmdHandler { * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ public Object execute(ExecutionEvent event) throws ExecutionException { - if(!(getSelectedEObject() instanceof NamedElement)) { + if(!(selectedEObject instanceof NamedElement)) { return null; } - final NamedElement element = (NamedElement)getSelectedEObject(); + final NamedElement element = (NamedElement)selectedEObject; final Shell shell = new Shell(); // 1. select possible connectors according to port types diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CreateDepPlanHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CreateDepPlanHandler.java index c265931899f..3700e2d1826 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CreateDepPlanHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CreateDepPlanHandler.java @@ -16,17 +16,16 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult; -import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation; import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils; import org.eclipse.papyrus.qompass.designer.core.sync.DepPlanSync; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; +import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.InstanceSpecification; @@ -46,8 +45,7 @@ public class CreateDepPlanHandler extends CmdHandler { @Override public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if((selectedObj instanceof Class) && Utils.isCompImpl((Class)selectedObj)) { + if((selectedEObject instanceof Class) && Utils.isCompImpl((Class)selectedEObject)) { return true; } return false; @@ -57,10 +55,10 @@ public class CreateDepPlanHandler extends CmdHandler { * {@inheritDoc} */ public Object execute(ExecutionEvent event) throws ExecutionException { - if(!(getSelectedEObject() instanceof Class)) { + if(!(selectedEObject instanceof Class)) { return null; } - final Class selectedComposite = (Class)getSelectedEObject(); + final Class selectedComposite = (Class)selectedEObject; CommandSupport.exec("Create deployment plans", event, new Runnable() { diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CreatePlatformHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CreatePlatformHandler.java index e2f2aa0d287..7b88bee2511 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CreatePlatformHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/CreatePlatformHandler.java @@ -16,7 +16,6 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.Utils; @@ -37,8 +36,7 @@ public class CreatePlatformHandler extends CmdHandler { @Override public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if(selectedObj instanceof Class) { + if(selectedEObject instanceof Class) { return true; } return false; @@ -48,10 +46,10 @@ public class CreatePlatformHandler extends CmdHandler { * {@inheritDoc} */ public Object execute(ExecutionEvent event) throws ExecutionException { - if(!(getSelectedEObject() instanceof Class)) { + if(!(selectedEObject instanceof Class)) { return null; } - final Class selectedComposite = (Class)getSelectedEObject(); + final Class selectedComposite = (Class)selectedEObject; CommandSupport.exec("Create platform model", event, new Runnable() { //$NON-NLS-1$ diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/GenCollaborationUseHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/GenCollaborationUseHandler.java index b1f87b28be1..f34cf3f07c7 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/GenCollaborationUseHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/GenCollaborationUseHandler.java @@ -1,26 +1,26 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.action.IAction; import org.eclipse.papyrus.FCM.Connector; import org.eclipse.papyrus.FCM.util.FCMUtil; -import org.eclipse.ui.IViewPart; import org.eclipse.uml2.uml.util.UMLUtil; /** - * currently unused - * - * @author ansgar + * TODO: for testing, currently unused */ +@Deprecated public class GenCollaborationUseHandler extends CmdHandler { - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) + /** + * {@inheritDoc} */ - public void init(IViewPart view) { + public Object execute(ExecutionEvent event) throws ExecutionException { + return null; } - + + /** /* * (non-Javadoc) * @@ -29,7 +29,7 @@ public class GenCollaborationUseHandler extends CmdHandler { public void run(IAction action) { updateSelectedEObject(); - org.eclipse.uml2.uml.Connector selectedConnector = (org.eclipse.uml2.uml.Connector)getSelectedEObject(); + org.eclipse.uml2.uml.Connector selectedConnector = (org.eclipse.uml2.uml.Connector)selectedEObject; Connector fcmConn = UMLUtil.getStereotypeApplication(selectedConnector, Connector.class); FCMUtil.generateCollaborationUse(fcmConn); } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/GenConnectionPatternHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/GenConnectionPatternHandler.java index 8919eec8eb8..70aa09f4944 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/GenConnectionPatternHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/GenConnectionPatternHandler.java @@ -1,5 +1,7 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.Status; import org.eclipse.jface.action.IAction; import org.eclipse.papyrus.FCM.InteractionComponent; @@ -9,9 +11,20 @@ import org.eclipse.ui.IViewPart; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.util.UMLUtil; +/** + * TODO: for testing, currently unused + */ +@Deprecated public class GenConnectionPatternHandler extends CmdHandler { - /* + /** + * {@inheritDoc} + */ + public Object execute(ExecutionEvent event) throws ExecutionException { + return null; + } + + /** * (non-Javadoc) * * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) @@ -19,14 +32,14 @@ public class GenConnectionPatternHandler extends CmdHandler { public void init(IViewPart view) { } - /* + /** * (non-Javadoc) * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ public void run(IAction action) { //only one model is selected - Class selectedClass = (Class)getSelectedEObject(); + Class selectedClass = (Class)selectedEObject; Log.log(Status.INFO, Log.DIALOGS, "GenConnectionPattern.run: " + selectedClass.getName()); InteractionComponent connType = UMLUtil.getStereotypeApplication(selectedClass, InteractionComponent.class); FCMUtil.generateDefaultConnectionPattern(connType); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/InstantiateDepPlanHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/InstantiateDepPlanHandler.java index 34c69acf5af..8a338286d38 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/InstantiateDepPlanHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/InstantiateDepPlanHandler.java @@ -21,14 +21,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.FCM.Configuration; import org.eclipse.papyrus.FCM.DeploymentPlan; import org.eclipse.papyrus.qompass.designer.core.ProjectManagement; -import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.papyrus.qompass.designer.core.dialogs.GenerationOptionsDialog; import org.eclipse.papyrus.qompass.designer.core.transformations.InstantiateDepPlan; +import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Element; @@ -45,10 +44,9 @@ public class InstantiateDepPlanHandler extends CmdHandler { @Override public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if(selectedObj instanceof Element) { - if(StereotypeUtil.isApplied((Element)selectedObj, DeploymentPlan.class) || - StereotypeUtil.isApplied((Element)selectedObj, Configuration.class)) { + if(selectedEObject instanceof Element) { + if(StereotypeUtil.isApplied((Element)selectedEObject, DeploymentPlan.class) || + StereotypeUtil.isApplied((Element)selectedEObject, Configuration.class)) { return true; } } @@ -60,10 +58,9 @@ public class InstantiateDepPlanHandler extends CmdHandler { */ public Object execute(ExecutionEvent event) throws ExecutionException { // only one model is selected - EObject selectedObj = getSelectedEObject(); selectedCDP = null; - if((selectedObj instanceof Package) || (selectedObj instanceof Class)) { - selectedCDP = (Element)getSelectedEObject(); + if((selectedEObject instanceof Package) || (selectedEObject instanceof Class)) { + selectedCDP = (Element)selectedEObject; } else { return null; } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SelectConnectorHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SelectConnectorHandler.java index 0d8d6cc21c4..c5f39ca93bc 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SelectConnectorHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SelectConnectorHandler.java @@ -11,12 +11,11 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.FCM.InteractionComponent; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; -import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.papyrus.qompass.designer.core.dialogs.ConnectorSelectionDialog; +import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Connector; @@ -36,8 +35,7 @@ public class SelectConnectorHandler extends CmdHandler { @Override public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if((selectedObj instanceof Connector) || (selectedObj instanceof Property)) { + if((selectedEObject instanceof Connector) || (selectedEObject instanceof Property)) { return true; } return false; @@ -50,23 +48,23 @@ public class SelectConnectorHandler extends CmdHandler { */ public Object execute(ExecutionEvent event) throws ExecutionException { // feature is a common superclass of Connector and Property - if(!(getSelectedEObject() instanceof Feature)) { + if(!(selectedEObject instanceof Feature)) { return null; } // get selected connector - final Feature selectedConnector = (Feature)getSelectedEObject(); + final Feature selectedFeature = (Feature)selectedEObject; Shell shell = new Shell(); // 1. select possible connectors according to port types // (only show compatible connectors check-box?) // 2. select implementation group according to connector type - Model model = selectedConnector.getModel(); + Model model = selectedFeature.getModel(); ConnectorSelectionDialog elementSelector = - new ConnectorSelectionDialog(shell, model, selectedConnector); + new ConnectorSelectionDialog(shell, model, selectedFeature); elementSelector.setTitle("Select connector"); - elementSelector.setMessage("Select an implementation for connector " + selectedConnector.getName()); + elementSelector.setMessage("Select an implementation for connector " + selectedFeature.getName()); elementSelector.open(); if(elementSelector.getReturnCode() == IDialogConstants.OK_ID) { final Object[] result = elementSelector.getResult(); @@ -74,7 +72,7 @@ public class SelectConnectorHandler extends CmdHandler { CommandSupport.exec("Select connector", event, new Runnable() { public void run() { - org.eclipse.papyrus.FCM.Connector fcmSelectedConnector = StereotypeUtil.applyApp(selectedConnector, org.eclipse.papyrus.FCM.Connector.class); + org.eclipse.papyrus.FCM.Connector fcmSelectedConnector = StereotypeUtil.applyApp(selectedFeature, org.eclipse.papyrus.FCM.Connector.class); InteractionComponent newConnType = UMLUtil.getStereotypeApplication((Class)result[0], InteractionComponent.class); fcmSelectedConnector.setIc(newConnType); } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SelectContainerHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SelectContainerHandler.java index 055d9b5401a..fa802e1758d 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SelectContainerHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SelectContainerHandler.java @@ -11,7 +11,6 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; @@ -35,13 +34,12 @@ public class SelectContainerHandler extends CmdHandler { @Override public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if((selectedObj instanceof Class) || - (selectedObj instanceof InstanceSpecification)) { + if((selectedEObject instanceof Class) || + (selectedEObject instanceof InstanceSpecification)) { return true; } - if(selectedObj instanceof Property) { - Type type = ((Property)selectedObj).getType(); + if(selectedEObject instanceof Property) { + Type type = ((Property)selectedEObject).getType(); if(type instanceof Class) { return true; } @@ -55,11 +53,11 @@ public class SelectContainerHandler extends CmdHandler { * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ public Object execute(ExecutionEvent event) throws ExecutionException { - if(!(getSelectedEObject() instanceof NamedElement)) { + if(!(selectedEObject instanceof NamedElement)) { return null; } - NamedElement ne = (NamedElement)getSelectedEObject(); + NamedElement ne = (NamedElement)selectedEObject; final Shell shell = new Shell(); if(ne instanceof Property) { diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SyncHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SyncHandler.java index 4a61ec165d2..6d17b8f7d6c 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SyncHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/handlers/SyncHandler.java @@ -16,17 +16,16 @@ package org.eclipse.papyrus.qompass.designer.core.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.papyrus.FCM.DeploymentPlan; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult; -import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.qompass.designer.core.sync.CompImplSync; import org.eclipse.papyrus.qompass.designer.core.sync.DepPlanSync; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationRTException; +import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Package; @@ -44,17 +43,18 @@ public class SyncHandler extends CmdHandler { @Override public boolean isEnabled() { updateSelectedEObject(); - EObject selectedObj = getSelectedEObject(); - if(selectedObj instanceof Property) { - selectedObj = ((Property)selectedObj).getType(); + // if a property is selected, use the associated type + if(selectedEObject instanceof Property) { + selectedEObject = ((Property)selectedEObject).getType(); } - if(selectedObj instanceof Class) { - if(Utils.isComponent((Class)selectedObj)) { + + if(selectedEObject instanceof Class) { + if(Utils.isComponent((Class)selectedEObject)) { return true; } } - if(selectedObj instanceof Package) { - if(StereotypeUtil.isApplied((Package)selectedObj, DeploymentPlan.class)) { + else if(selectedEObject instanceof Package) { + if(StereotypeUtil.isApplied((Package)selectedEObject, DeploymentPlan.class)) { return true; } } @@ -66,13 +66,13 @@ public class SyncHandler extends CmdHandler { */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { - //only one model is selected - EObject selectedObj = getSelectedEObject(); - if(selectedObj instanceof Property) { - selectedObj = ((Property)selectedObj).getType(); + // if a property is selected, use the associated type + if(selectedEObject instanceof Property) { + selectedEObject = ((Property)selectedEObject).getType(); } - if(selectedObj instanceof Class) { - final Class selectedClass = (Class)selectedObj; + + if(selectedEObject instanceof Class) { + final Class selectedClass = (Class)selectedEObject; if(Utils.isCompImpl(selectedClass)) { CommandSupport.exec("Synchronize component via implementation", event, new RunnableWithResult() { @@ -103,8 +103,8 @@ public class SyncHandler extends CmdHandler { }); } } - else if(selectedObj instanceof Package) { - final Package selectedPkg = (Package)selectedObj; + else if(selectedEObject instanceof Package) { + final Package selectedPkg = (Package)selectedEObject; CommandSupport.exec("Synchronize deployment plan", event, new RunnableWithResult() { public CommandResult run() { |