diff options
30 files changed, 68 insertions, 131 deletions
diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF index 5a43b70a8e8..19c7428f196 100644 --- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.uml2.uml;bundle-version="4.1.0", org.eclipse.gmf.runtime.notation;bundle-version="1.7.0", org.eclipse.gmf.runtime.diagram.core;bundle-version="1.7.0", - org.eclipse.papyrus.infra.core;bundle-version="0.10.0" + org.eclipse.papyrus.infra.core;bundle-version="0.10.0", + org.eclipse.papyrus.uml.diagram.common Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CmdHandler.java b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CmdHandler.java deleted file mode 100644 index 4c7b467b7cf..00000000000 --- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CmdHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2010 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 (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation - *****************************************************************************/ - -package org.eclipse.papyrus.uml.diagram.example.programmaticcreation; - - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.ui.PlatformUI; - - -/** - * Superclass for handlers. It converts a selection into an EObject - */ -public abstract class CmdHandler extends AbstractHandler { - - /** - * Convert selected elements within model explorer or diagram to an eObject - */ - public void updateSelectedEObject() { - // Retrieve selected elements - IStructuredSelection selection = (IStructuredSelection)PlatformUI - .getWorkbench().getActiveWorkbenchWindow() - .getSelectionService().getSelection(); - - if(selection != null) { - selectedEObject = EMFHelper.getEObject(selection.getFirstElement()); - } - } - - /** - * Store the selected EObject. Accessible for subclasses - */ - protected EObject selectedEObject; -} diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsHandler.java b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsHandler.java index 3a3fb8cdb92..a3a882f47f2 100644 --- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsHandler.java +++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateCompositeDiagramElementsHandler.java @@ -16,6 +16,7 @@ import org.eclipse.core.commands.operations.OperationHistoryFactory; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.emf.workspace.AbstractEMFOperation; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.NamedElement; diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsHandler.java b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsHandler.java index 46229462f98..c9d5340a212 100644 --- a/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsHandler.java +++ b/examples/uml/org.eclipse.papyrus.uml.diagram.example.programmaticcreation/src/org/eclipse/papyrus/uml/diagram/example/programmaticcreation/CreateSequenceDiagramElementsHandler.java @@ -16,6 +16,7 @@ import org.eclipse.core.commands.operations.OperationHistoryFactory; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.emf.workspace.AbstractEMFOperation; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.NamedElement; diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF index 9e13d8fba42..885201679cd 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.acceleo;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.eclipse.papyrus.acceleo.ui;bundle-version="1.1.0"
+ org.eclipse.papyrus.acceleo.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/ResetAcceleoHandler.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/ResetAcceleoHandler.java index 79fd63ec005..b15a519e978 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/ResetAcceleoHandler.java +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/ResetAcceleoHandler.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.acceleo.debug.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.papyrus.acceleo.AcceleoDriver; -import org.eclipse.papyrus.acceleo.ui.handlers.CmdHandler; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.NamedElement; diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/TestAcceleoHandler.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/TestAcceleoHandler.java index 298139ec2d6..a254e6889e5 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/TestAcceleoHandler.java +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/src/org/eclipse/papyrus/acceleo/debug/handlers/TestAcceleoHandler.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.acceleo.debug.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.papyrus.acceleo.debug.dialogs.TestAcceleoDialog; -import org.eclipse.papyrus.acceleo.ui.handlers.CmdHandler; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.swt.widgets.Display; import org.eclipse.uml2.uml.NamedElement; diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF index c83fb302a41..8b668ce65d3 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF +++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime,
org.eclipse.emf.ecore;bundle-version="2.10.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0"
-Export-Package: org.eclipse.papyrus.acceleo.ui.handlers
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF index afe0894195f..a7d5e4a1789 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF @@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.acceleo.ui;bundle-version="1.1.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
org.eclipse.core.resources,
- org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.1.0"
+ org.eclipse.papyrus.codegen.extensionpoints;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/CDTprojectHandler.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/CDTprojectHandler.java index bb4e359cfc8..b34d6197cd0 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/CDTprojectHandler.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/CDTprojectHandler.java @@ -18,10 +18,10 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.emf.common.util.URI; -import org.eclipse.papyrus.acceleo.ui.handlers.CmdHandler; import org.eclipse.papyrus.codegen.extensionpoints.ILangSupport; import org.eclipse.papyrus.codegen.extensionpoints.LanguageSupport; import org.eclipse.papyrus.cpp.codegen.utils.LocateCppProject; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.Package; import org.eclipse.uml2.uml.PackageableElement; diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/GenerateCodeHandler.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/GenerateCodeHandler.java index 0e119c8595b..769fcd7d677 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/GenerateCodeHandler.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/src/org/eclipse/papyrus/cpp/codegen/ui/handlers/GenerateCodeHandler.java @@ -25,11 +25,11 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.papyrus.acceleo.AcceleoDriver; -import org.eclipse.papyrus.acceleo.ui.handlers.CmdHandler; import org.eclipse.papyrus.cpp.codegen.transformation.CppModelElementsCreator; import org.eclipse.papyrus.cpp.codegen.ui.Activator; import org.eclipse.papyrus.cpp.codegen.utils.ClassUtils; import org.eclipse.papyrus.cpp.codegen.utils.LocateCppProject; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.swt.widgets.Display; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.Package; diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF index 9a0403ecfc6..46ca4b300e4 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF +++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF @@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.acceleo.ui;bundle-version="1.1.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.1.0.qualifier
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java index 3d4fa42992b..d6239cd4a9f 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java +++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/handler/PapyrusCDTEditorHandler.java @@ -27,7 +27,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.papyrus.acceleo.ui.handlers.CmdHandler;
import org.eclipse.papyrus.commands.CheckedOperationHistory;
import org.eclipse.papyrus.cpp.codegen.utils.LocateCppProject;
import org.eclipse.papyrus.infra.core.resource.NotFoundException;
@@ -47,6 +46,7 @@ import org.eclipse.papyrus.texteditor.cdt.editor.PapyrusCDTEditor; import org.eclipse.papyrus.texteditor.cdt.modelresource.TextEditorModelSharedResource;
import org.eclipse.papyrus.texteditor.model.texteditormodel.TextEditorModel;
import org.eclipse.papyrus.texteditor.model.texteditormodel.TextEditorModelFactory;
+import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.uml2.uml.Class;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java index 07e474ba36c..2971bbff614 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java @@ -41,9 +41,8 @@ import org.eclipse.uml2.uml.UMLPackage; public class ModelManagement { /** - * Create a resource for the model passed as parameter - * - * @param newModel + * Create a new model and associate it with a temporary + * resource */ public ModelManagement() { getResourceSet(); @@ -52,18 +51,6 @@ public class ModelManagement { resource.getContents().add(model); } - /** - * Save a model within the given project - * - * @param model - * a model that should be saved - * @param project - * an existing project - */ - public void saveModel(IProject project) { - saveModel(getPath(project, null, null)); - } - public void dispose() { if (model != null) { model.destroy(); @@ -72,19 +59,41 @@ public class ModelManagement { resourceSet.getResources().remove(resource); } + /** + * provide access to the model + * @return the model amanaged by this instance of model manager + */ public Model getModel() { return model; } + /** + * Save a model within the given project at a default location. + * This location is [model.name/].uml within the project root. + * @link ModelManagement.getPath + * + * @param project + * an existing project + */ + public void saveModel(IProject project) { + saveModel(getPath(project, null, null)); + } + + /** + * Save the model within a given project, folder and postfix + * @param project + * @param modelFolder + * @param modelPostfix + */ public void saveModel(IProject project, String modelFolder, String modelPostfix) { String path = this.getPath(project, modelFolder, this.getModel().getName() + modelPostfix); this.saveModel(path); } /** - * Save a model within a passed project and a specified folder - * (TODO: use path instead a single folder?) + * Save a model using the passed path * + * @param path A string representation of the path. It will be converted into a URI */ public void saveModel(String path) { @@ -94,11 +103,6 @@ public class ModelManagement { ResourceSetImpl resourceSet = new ResourceSetImpl(); resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE); - /* - * Resource resource = resourceSet.createResource(uri); - * EList<EObject> contents = resource.getContents(); - * contents.add(model); - */ resource.setURI(uri); EList<EObject> contents = resource.getContents(); @@ -110,16 +114,20 @@ public class ModelManagement { } } resource.save(null); - } catch (IOException e) { - e.printStackTrace(); + } + catch (IOException e) { + Activator.log.error(e); } } /** + * Return a path based on project, folder and file name + * * @param project * an existing project * @param subFolder * a subfolder within the project (will be created, if it does not exist) + * if null, the project will be saved in the root of the project * @param filename * the name of the file or null (in his case, the name of the * model with the postfix .uml is used) diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java index d532fc500d4..63f4871a303 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java @@ -427,7 +427,7 @@ public class LazyCopier extends Copier { @Override public EObject copy(EObject sourceEObj) { if (sourceEObj == null) { - // this case may happen, if elements were systematically copied without checking for + // this case may happen, if elements are systematically copied without checking for // null references in the application code (e.g. if we copy a part-with-port which might // be null in case of delegation or connectors without ports return null; @@ -773,7 +773,9 @@ public class LazyCopier extends Copier { } else { EReference eReference = (EReference) eStructuralFeature; // create a shallow copy of the containment: update only references already in the copy map - shallowCopyContainment(eReference, sourceEObj, targetEObj); + if (sourceEObj != targetEObj) { + shallowCopyContainment(eReference, sourceEObj, targetEObj); + } } } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java index 6f5860df5ec..5bd0c45a164 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java @@ -20,6 +20,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.papyrus.qompass.designer.core.CommandSupport;
import org.eclipse.papyrus.qompass.designer.core.commands.AddMarteAndFcmProfile;
import org.eclipse.papyrus.qompass.designer.core.commands.AddQompassModelLibs;
+import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.eclipse.uml2.uml.Package;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AllocateHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AllocateHandler.java index 4213250423c..c04aabc5c03 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AllocateHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AllocateHandler.java @@ -19,6 +19,7 @@ import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult; import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils; import org.eclipse.papyrus.qompass.designer.ui.dialogs.AllocationDialog; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Package; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java deleted file mode 100644 index 197dabc3fed..00000000000 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CmdHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2010 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 (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation - *****************************************************************************/ - -package org.eclipse.papyrus.qompass.designer.ui.handlers; - - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.ui.PlatformUI; - - -/** - * Superclass for handlers. It converts a selection into an EObject - */ -public abstract class CmdHandler extends AbstractHandler { - - /** - * Convert selected elements within model explorer or diagram to an eObject - */ - public void updateSelectedEObject() { - // Retrieve selected elements - IStructuredSelection selection = (IStructuredSelection) PlatformUI - .getWorkbench().getActiveWorkbenchWindow() - .getSelectionService().getSelection(); - - if (selection != null) { - selectedEObject = EMFHelper.getEObject(selection.getFirstElement()); - } - } - - /** - * Store the selected EObject. Accessible for subclasses - */ - protected EObject selectedEObject; -} diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java index 0c75eeb0845..1c961e685a5 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java @@ -16,6 +16,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult; import org.eclipse.papyrus.qompass.designer.ui.dialogs.ConfigureInstanceDialog; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Connector; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java index 660110f2119..71f427b0602 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java @@ -17,6 +17,7 @@ import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult; import org.eclipse.papyrus.qompass.designer.ui.Messages; import org.eclipse.papyrus.qompass.designer.ui.dialogs.ConfigurePortDialog; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.NamedElement; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java index 9f436442641..500e2d8c2fa 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java @@ -27,6 +27,7 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants; import org.eclipse.papyrus.qompass.designer.core.sync.DepPlanSync; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; import org.eclipse.papyrus.qompass.designer.ui.Messages; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java index 49cdea8e591..707a944f077 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java @@ -23,6 +23,7 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation; import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationRTException; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Package; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenCollaborationUseHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenCollaborationUseHandler.java index 0e7cd0c2a47..614bc5b139e 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenCollaborationUseHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenCollaborationUseHandler.java @@ -5,6 +5,7 @@ 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.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.uml2.uml.util.UMLUtil; /** diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenConnectionPatternHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenConnectionPatternHandler.java index ab4fd5ad53b..5b56d15f739 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenConnectionPatternHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/GenConnectionPatternHandler.java @@ -7,6 +7,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.papyrus.FCM.InteractionComponent; import org.eclipse.papyrus.FCM.util.FCMUtil; import org.eclipse.papyrus.qompass.designer.core.Log; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.ui.IViewPart; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.util.UMLUtil; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java index 2a573528e88..4963c0bbd08 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java @@ -27,6 +27,7 @@ import org.eclipse.papyrus.FCM.DeploymentPlan; import org.eclipse.papyrus.qompass.designer.core.ProjectManagement; import org.eclipse.papyrus.qompass.designer.core.transformations.InstantiateDepPlan; import org.eclipse.papyrus.qompass.designer.ui.dialogs.GenerationOptionsDialog; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectConnectorHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectConnectorHandler.java index 99129e894cd..ebb52f8df69 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectConnectorHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectConnectorHandler.java @@ -15,6 +15,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.FCM.InteractionComponent; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.ui.dialogs.ConnectorSelectionDialog; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectContainerHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectContainerHandler.java index d483c7f28dd..4a06aa945d0 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectContainerHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SelectContainerHandler.java @@ -16,6 +16,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult; import org.eclipse.papyrus.qompass.designer.ui.dialogs.ContainerDialog; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.InstanceSpecification; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SyncHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SyncHandler.java index 44f325eef2d..bcb92f41843 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SyncHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/SyncHandler.java @@ -25,6 +25,7 @@ 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.diagram.common.handlers.CmdHandler; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.swt.widgets.Shell; import org.eclipse.uml2.uml.Class; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java index 196bf6fbfe6..f129bdaa807 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java @@ -9,6 +9,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.papyrus.qompass.designer.core.ProjectManagement; import org.eclipse.papyrus.qompass.designer.core.transformations.TrafoAndCodegenPackage; +import org.eclipse.papyrus.uml.diagram.common.handlers.CmdHandler; import org.eclipse.uml2.uml.Package; public class TrafoAndCodegenHandler extends CmdHandler { diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/CmdHandler.java index 81379916f19..790efdb7c0c 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.ui/src/org/eclipse/papyrus/acceleo/ui/handlers/CmdHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/CmdHandler.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
+ * Copyright (c) 2014 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@ * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - Initial API and implementation
*****************************************************************************/
-package org.eclipse.papyrus.acceleo.ui.handlers;
+package org.eclipse.papyrus.uml.diagram.common.handlers;
import org.eclipse.core.commands.AbstractHandler;
@@ -21,7 +21,8 @@ import org.eclipse.ui.PlatformUI; /**
- * Superclass for handlers. It converts a selection into an EObject
+ * Simple superclass for handlers. It converts a selection into an EObject.
+ * Used by C++ code generator and Qompass designer
*/
public abstract class CmdHandler extends AbstractHandler {
|