From 7a1e61e4203fcf468a2635b80dd94182a95b588b Mon Sep 17 00:00:00 2001 From: Maged Elaasar Date: Tue, 21 Feb 2017 00:19:48 -0800 Subject: Bug 510451 - Reimplement the ISO42010 specification to properly support architectural contexts and viewpoints Replaced the viewpoint configuration framework by a new architectural context/viewpoint framework. This involves defining architecture contexts and viewpoints in models and contributing them via extension points or via the preferences. Models reference an architecture context and a set of viewpoints at creation time, but can be switched later. Architecture contexts double as client contexts for which elementtypesetconfigurations can be registered. They also define viewpoints, which reference representation kinds (diagrams or tables). This contribution defines three architecture contexts: UML, Profile, and SysML corresponding to what Papyrus used to call diagram categories. Change-Id: I203b58d9e97afdffc45c2674683c0281eb8a7c5b Signed-off-by: Maged Elaasar --- .../custom/migration/DeploymentReconciler.java | 62 -------------------- .../DeploymentReconcilerForCompartment.java | 67 ---------------------- .../DeploymentReconcilerForCompartment_1_2_0.java | 67 ++++++++++++++++++++++ .../migration/DeploymentReconciler_1_1_0.java | 62 ++++++++++++++++++++ .../model/DeploymentDiagram.configuration | 17 ------ .../plugin.xml | 22 +++---- 6 files changed, 136 insertions(+), 161 deletions(-) delete mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler.java delete mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment.java create mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java create mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java delete mode 100644 plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.configuration (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment') diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler.java deleted file mode 100644 index 0b1b8e0051f..00000000000 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler.java +++ /dev/null @@ -1,62 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2009-2015 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: - * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation - * - *****************************************************************************/ -package org.eclipse.papyrus.uml.diagram.deployment.custom.migration; - -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.gmf.runtime.common.core.command.ICommand; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand; -import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler; - -/** - * Deployment Diagram Reconciler from 1.0.0 to 1.1.0 - */ -public class DeploymentReconciler extends DiagramReconciler { - - private final static String ArtifactEditPart_VISUAL_ID = "2006"; - private final static String ArtifactFloatingLabelEditPart_VISUAL_ID = "61"; - private final static String ArtifactEditPartACN_VISUAL_ID = "28"; - private final static String ArtifactFloatingLabelEditPartACN_VISUAL_ID = "60"; - private final static String ArtifactEditPartCN_VISUAL_ID = "25"; - private final static String ArtifactFloatingLabelEditPartCN_VISUAL_ID = "59"; - - /** - * Gets the reconcile command. - * - * @param diagram - * the diagram - * @return the reconcile command - * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram) - */ - @Override - public ICommand getReconcileCommand(Diagram diagram) { - return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap()); - } - - /** - * Gets the floating label map to add. - * - * @return the floating label map - */ - private Map getFloatingLabelMap() { - Map map = new HashMap(); - map.put(ArtifactEditPart_VISUAL_ID, ArtifactFloatingLabelEditPart_VISUAL_ID); - map.put(ArtifactEditPartACN_VISUAL_ID, ArtifactFloatingLabelEditPartACN_VISUAL_ID); - map.put(ArtifactEditPartCN_VISUAL_ID, ArtifactFloatingLabelEditPartCN_VISUAL_ID); - - return map; - } -} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment.java deleted file mode 100644 index 56b218a0301..00000000000 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment.java +++ /dev/null @@ -1,67 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2015 CEA LIST and others. - * - * 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: - * CEA LIST - Initial API and implementation - * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation - * - *****************************************************************************/ -package org.eclipse.papyrus.uml.diagram.deployment.custom.migration; - -import java.util.Arrays; -import java.util.List; - -import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartment; - -/** - * Diagram Reconciler for compartment from 1.1.0 to 1.2.0 - */ -public class DeploymentReconcilerForCompartment extends ReconcilerForCompartment { - - private static final String ModelPackageableElementCompartmentEditPart_VISUAL_ID = "51"; - private static final String PackagePackageableElementCompartmentEditPart_VISUAL_ID = "38"; - private static final String DeviceCompositeCompartmentEditPart_VISUAL_ID = "17"; - private static final String ExecutionEnvironmentCompositeCompartmentEditPart_VISUAL_ID = "18"; - private static final String NodeCompositeCompartmentEditPart_VISUAL_ID = "19"; - private static final String ArtifactCompositeCompartmentEditPart_VISUAL_ID = "26"; - private static final String ModelPackageableElementCompartmentEditPartCN_VISUAL_ID = "52"; - private static final String PackagePackageableElementCompartmentEditPartCN_VISUAL_ID = "39"; - private static final String DeviceCompositeCompartmentEditPartCN_VISUAL_ID = "30"; - private static final String ExecutionEnvironmentCompositeCompartmentEditPartCN_VISUAL_ID = "31"; - private static final String NodeCompositeCompartmentEditPartCN_VISUAL_ID = "32"; - private static final String ArtifactCompositeCompartmentEditPartCN_VISUAL_ID = "33"; - private static final String ArtifactCompositeCompartmentEditPartACN_VISUAL_ID = "34"; - - /** The compartments visual id. */ - private List compartmentsVisualID = Arrays.asList( - ModelPackageableElementCompartmentEditPart_VISUAL_ID, - PackagePackageableElementCompartmentEditPart_VISUAL_ID, - DeviceCompositeCompartmentEditPart_VISUAL_ID, - ExecutionEnvironmentCompositeCompartmentEditPart_VISUAL_ID, - NodeCompositeCompartmentEditPart_VISUAL_ID, - ArtifactCompositeCompartmentEditPart_VISUAL_ID, - ModelPackageableElementCompartmentEditPartCN_VISUAL_ID, - PackagePackageableElementCompartmentEditPartCN_VISUAL_ID, - DeviceCompositeCompartmentEditPartCN_VISUAL_ID, - ExecutionEnvironmentCompositeCompartmentEditPartCN_VISUAL_ID, - NodeCompositeCompartmentEditPartCN_VISUAL_ID, - ArtifactCompositeCompartmentEditPartCN_VISUAL_ID, - ArtifactCompositeCompartmentEditPartACN_VISUAL_ID); - - /** - * Gets the compartments visual id. - * - * @return the compartments visual id - * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartment#getCompartmentsVisualID() - */ - @Override - public List getCompartmentsVisualID() { - return compartmentsVisualID; - } - -} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java new file mode 100644 index 00000000000..266390e3b41 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java @@ -0,0 +1,67 @@ +/***************************************************************************** + * Copyright (c) 2015 CEA LIST and others. + * + * 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: + * CEA LIST - Initial API and implementation + * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.deployment.custom.migration; + +import java.util.Arrays; +import java.util.List; + +import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartment; + +/** + * Diagram Reconciler for compartment from 1.1.0 to 1.2.0 + */ +public class DeploymentReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment { + + private static final String ModelPackageableElementCompartmentEditPart_VISUAL_ID = "51"; + private static final String PackagePackageableElementCompartmentEditPart_VISUAL_ID = "38"; + private static final String DeviceCompositeCompartmentEditPart_VISUAL_ID = "17"; + private static final String ExecutionEnvironmentCompositeCompartmentEditPart_VISUAL_ID = "18"; + private static final String NodeCompositeCompartmentEditPart_VISUAL_ID = "19"; + private static final String ArtifactCompositeCompartmentEditPart_VISUAL_ID = "26"; + private static final String ModelPackageableElementCompartmentEditPartCN_VISUAL_ID = "52"; + private static final String PackagePackageableElementCompartmentEditPartCN_VISUAL_ID = "39"; + private static final String DeviceCompositeCompartmentEditPartCN_VISUAL_ID = "30"; + private static final String ExecutionEnvironmentCompositeCompartmentEditPartCN_VISUAL_ID = "31"; + private static final String NodeCompositeCompartmentEditPartCN_VISUAL_ID = "32"; + private static final String ArtifactCompositeCompartmentEditPartCN_VISUAL_ID = "33"; + private static final String ArtifactCompositeCompartmentEditPartACN_VISUAL_ID = "34"; + + /** The compartments visual id. */ + private List compartmentsVisualID = Arrays.asList( + ModelPackageableElementCompartmentEditPart_VISUAL_ID, + PackagePackageableElementCompartmentEditPart_VISUAL_ID, + DeviceCompositeCompartmentEditPart_VISUAL_ID, + ExecutionEnvironmentCompositeCompartmentEditPart_VISUAL_ID, + NodeCompositeCompartmentEditPart_VISUAL_ID, + ArtifactCompositeCompartmentEditPart_VISUAL_ID, + ModelPackageableElementCompartmentEditPartCN_VISUAL_ID, + PackagePackageableElementCompartmentEditPartCN_VISUAL_ID, + DeviceCompositeCompartmentEditPartCN_VISUAL_ID, + ExecutionEnvironmentCompositeCompartmentEditPartCN_VISUAL_ID, + NodeCompositeCompartmentEditPartCN_VISUAL_ID, + ArtifactCompositeCompartmentEditPartCN_VISUAL_ID, + ArtifactCompositeCompartmentEditPartACN_VISUAL_ID); + + /** + * Gets the compartments visual id. + * + * @return the compartments visual id + * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartment#getCompartmentsVisualID() + */ + @Override + public List getCompartmentsVisualID() { + return compartmentsVisualID; + } + +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java new file mode 100644 index 00000000000..5fd3e472d72 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java @@ -0,0 +1,62 @@ +/***************************************************************************** + * Copyright (c) 2009-2015 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: + * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.deployment.custom.migration; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.gmf.runtime.common.core.command.ICommand; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.papyrus.infra.gmfdiag.common.commands.InsertFloatingLabelFromMapCommand; +import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler; + +/** + * Deployment Diagram Reconciler from 1.0.0 to 1.1.0 + */ +public class DeploymentReconciler_1_1_0 extends DiagramReconciler { + + private final static String ArtifactEditPart_VISUAL_ID = "2006"; + private final static String ArtifactFloatingLabelEditPart_VISUAL_ID = "61"; + private final static String ArtifactEditPartACN_VISUAL_ID = "28"; + private final static String ArtifactFloatingLabelEditPartACN_VISUAL_ID = "60"; + private final static String ArtifactEditPartCN_VISUAL_ID = "25"; + private final static String ArtifactFloatingLabelEditPartCN_VISUAL_ID = "59"; + + /** + * Gets the reconcile command. + * + * @param diagram + * the diagram + * @return the reconcile command + * @see org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler#getReconcileCommand(org.eclipse.gmf.runtime.notation.Diagram) + */ + @Override + public ICommand getReconcileCommand(Diagram diagram) { + return new InsertFloatingLabelFromMapCommand(diagram, getFloatingLabelMap()); + } + + /** + * Gets the floating label map to add. + * + * @return the floating label map + */ + private Map getFloatingLabelMap() { + Map map = new HashMap(); + map.put(ArtifactEditPart_VISUAL_ID, ArtifactFloatingLabelEditPart_VISUAL_ID); + map.put(ArtifactEditPartACN_VISUAL_ID, ArtifactFloatingLabelEditPartACN_VISUAL_ID); + map.put(ArtifactEditPartCN_VISUAL_ID, ArtifactFloatingLabelEditPartCN_VISUAL_ID); + + return map; + } +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.configuration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.configuration deleted file mode 100644 index e12548d2e03..00000000000 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.configuration +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml index 9b4c8d055c9..90b4cd183fd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml @@ -14,14 +14,6 @@ --> - - - - - + reconcilerClass="org.eclipse.papyrus.uml.diagram.deployment.custom.migration.DeploymentReconciler_1_1_0" + source="1.0.0" + target="1.3.0"> + reconcilerClass="org.eclipse.papyrus.uml.diagram.deployment.custom.migration.DeploymentReconcilerForCompartment_1_2_0" + source="1.1.0" + target="1.3.0"> + target="1.3.0"> -- cgit v1.2.3