Bug 464585 - [Element Types] Profile diagram should be migrated to the

elementtypes framework

 - remove unused custom semantic policies and commands

Change-Id: I40ff42d1bc5b60137e63a894cd5e488ee6b992f7
Signed-off-by: mgolubev <golubev@montages.com>
Reviewed-on: https://git.eclipse.org/r/47863
Tested-by: Hudson CI
Reviewed-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>

5 files changed, 0 insertions, 401 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index ed9da2dc064..78ea1b59e09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Export-Package: org.eclipse.papyrus.uml.diagram.profile,
  org.eclipse.papyrus.uml.diagram.profile.custom.helper,
  org.eclipse.papyrus.uml.diagram.profile.custom.messages,
  org.eclipse.papyrus.uml.diagram.profile.custom.policies,
- org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic,
  org.eclipse.papyrus.uml.diagram.profile.custom.preferences,
  org.eclipse.papyrus.uml.diagram.profile.custom.providers,
  org.eclipse.papyrus.uml.diagram.profile.custom.requests,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationBranchDeletion.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationBranchDeletion.java
deleted file mode 100644
index f61b1d6d62b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/AssociationBranchDeletion.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.gmf.runtime.notation.Edge;

-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.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiAssociationHelper;

-import org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.ui.IObjectActionDelegate;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * The Class AssociationBranchDeletion is used delete a branch

- */

-

-public class AssociationBranchDeletion implements IObjectActionDelegate {

-

-	/** The selected element. */

-	private AssociationBranchEditPart selectedElement;

-

-	/**

-	 * Instantiates a new association branch deletion.

-	 */

-	public AssociationBranchDeletion() {

-		// TODO Auto-generated constructor stub

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void run(IAction action) {

-		CompoundCommand command = new CompoundCommand();

-		Association association = null;

-		TransactionalEditingDomain domain = selectedElement.getEditingDomain();

-		GraphicalEditPart associationNodeEditPart = null;

-		// 1. Semantic deletion

-		GraphicalEditPart branchSource = (GraphicalEditPart) selectedElement.getSource();

-		EStructuralFeature feature = null;

-		ArrayList<NamedElement> newValue = new ArrayList<NamedElement>();

-		// target is the association end of the association branch

-		association = (Association) branchSource.resolveSemanticElement();

-		associationNodeEditPart = branchSource;

-		newValue.addAll(association.getMemberEnds());

-		newValue.remove(MultiAssociationHelper.getPropertyToListen((Edge) selectedElement.getModel(), association));

-		feature = UMLPackage.eINSTANCE.getAssociation_OwnedEnd();

-		SetRequest setRequest = new SetRequest(association, feature, newValue);

-		SetValueCommand setValueCommand = new SetValueCommand(setRequest);

-		command.add(new ICommandProxy(setValueCommand));

-		// 2. graphical deletion of the branch

-		View associationBranchView = selectedElement.getNotationView();

-		command.add(new ICommandProxy(new DeleteCommand(domain, associationBranchView)));

-		// 3. test if it exists more than 2 branches

-		int branchNumber = associationNodeEditPart.getSourceConnections().size() + associationNodeEditPart.getTargetConnections().size();

-		if (branchNumber == 3) {

-			// 4. Graphical deletion of the node

-			command.add(new ICommandProxy(new DeleteCommand(domain, associationNodeEditPart.getNotationView())));

-			// 5. Graphical creation of the binary dependency

-			// 5.1 calculus of the future source and target of the binary

-			// dependency

-			ArrayList<EditPart> sourceList = new ArrayList<EditPart>();

-			ArrayList<EditPart> targetList = new ArrayList<EditPart>();

-			List<?> sourceConnections = associationNodeEditPart.getSourceConnections();

-			for (Object object : sourceConnections) {

-				if (object instanceof EditPart) {

-					sourceList.add((EditPart) object);

-				}

-			}

-			List<?> targetConnections = associationNodeEditPart.getTargetConnections();

-			for (Object object : targetConnections) {

-				if (object instanceof EditPart) {

-					targetList.add((EditPart) object);

-				}

-			}

-			sourceList.remove(selectedElement);

-			targetList.remove(selectedElement);

-			PreferencesHint preferencesHint = ((GraphicalEditPart) ((ConnectionEditPart) (sourceList.get(0))).getTarget()).getDiagramPreferencesHint();

-			ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_4001, ((IHintedType) UMLElementTypes.Association_4001).getSemanticHint(), preferencesHint);

-			CustomDeferredCreateConnectionViewCommand binaryCommand = new CustomDeferredCreateConnectionViewCommand(domain, ((IHintedType) UMLElementTypes.Association_4001).getSemanticHint(), new SemanticAdapter(null,

-					(((ConnectionEditPart) (sourceList.get(0))).getTarget()).getModel()), new SemanticAdapter(null, (((ConnectionEditPart) (sourceList.get(1))).getTarget()).getModel()), sourceList.get(0).getViewer(), preferencesHint, viewDescriptor, null);

-			binaryCommand.setElement(association);

-			command.add(new ICommandProxy(binaryCommand));

-		}

-		// 6.command Execution

-		selectedElement.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-	}

-

-	/**

-	 *

-	 * {@inheritedDoc}

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		if (selection instanceof IStructuredSelection) {

-			Object selectedobject = ((IStructuredSelection) selection).getFirstElement();

-			if (selectedobject instanceof AssociationBranchEditPart) {

-				selectedElement = (AssociationBranchEditPart) selectedobject;

-			}

-		}

-	}

-

-	/**

-	 *

-	 * {@inheritedDoc}

-	 */

-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

-		// TODO Auto-generated method stub

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyBranchDeletion.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyBranchDeletion.java
deleted file mode 100644
index ec5066caec4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DependencyBranchDeletion.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.CompoundCommand;

-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-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.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomDeferredCreateConnectionViewCommand;

-import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;

-import org.eclipse.ui.IObjectActionDelegate;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.uml2.uml.Dependency;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * The Class DependencyBranchDeletion used to delete a branch from n-ary dependency

- */

-public class DependencyBranchDeletion implements IObjectActionDelegate {

-

-	/** The selected element. */

-	private DependencyBranchEditPart selectedElement;

-

-	/**

-	 * Instantiates a new dependency branch deletion.

-	 */

-	public DependencyBranchDeletion() {

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	public void run(IAction action) {

-

-		CompoundCommand command = new CompoundCommand();

-		Dependency dependency = null;

-		TransactionalEditingDomain domain = selectedElement.getEditingDomain();

-		GraphicalEditPart dependencyNodeEditPart = null;

-		// 1. Semanctic deletion of the client or supplier

-		GraphicalEditPart branchSource = (GraphicalEditPart) selectedElement.getSource();

-		GraphicalEditPart branchtarget = (GraphicalEditPart) selectedElement.getTarget();

-		EStructuralFeature feature = null;

-		ArrayList<NamedElement> newValue = new ArrayList<NamedElement>();

-		if (branchSource.resolveSemanticElement() instanceof Dependency) {

-			// target is the supplier of the dependency

-			dependency = (Dependency) branchSource.resolveSemanticElement();

-			dependencyNodeEditPart = branchSource;

-			newValue.addAll(dependency.getSuppliers());

-			newValue.remove(branchtarget.resolveSemanticElement());

-			feature = UMLPackage.eINSTANCE.getDependency_Supplier();

-		} else {

-			// source is the client of the dependency to remove

-			feature = UMLPackage.eINSTANCE.getDependency_Client();

-			dependency = (Dependency) branchtarget.resolveSemanticElement();

-			dependencyNodeEditPart = branchtarget;

-			newValue.addAll(dependency.getClients());

-			newValue.remove(branchSource.resolveSemanticElement());

-		}

-		SetRequest setRequest = new SetRequest(dependency, feature, newValue);

-		SetValueCommand setValueCommand = new SetValueCommand(setRequest);

-		command.add(new ICommandProxy(setValueCommand));

-		// 2. graphical deletion of the branch

-		View branchDependencyView = selectedElement.getNotationView();

-		command.add(new ICommandProxy(new DeleteCommand(domain, branchDependencyView)));

-		// 3. test if it exists more than 2 branches

-		int branchNumber = dependencyNodeEditPart.getSourceConnections().size() + dependencyNodeEditPart.getTargetConnections().size();

-		if (branchNumber == 3) {

-			// 4. Graphical deletion of the node

-			command.add(new ICommandProxy(new DeleteCommand(domain, dependencyNodeEditPart.getNotationView())));

-			// 5. Graphical creation of the binary dependency

-			// 5.1 calculus of the furture source and taget of the binary

-			// dependency

-			ArrayList<EditPart> sourceList = new ArrayList<EditPart>();

-			ArrayList<EditPart> targetList = new ArrayList<EditPart>();

-			List<?> sourceConnections = dependencyNodeEditPart.getSourceConnections();

-			for (Object object : sourceConnections) {

-				if (object instanceof EditPart) {

-					sourceList.add((EditPart) object);

-				}

-			}

-			List<?> targetConnections = dependencyNodeEditPart.getTargetConnections();

-			for (Object object : targetConnections) {

-				if (object instanceof EditPart) {

-					targetList.add((EditPart) object);

-				}

-			}

-			sourceList.remove(selectedElement);

-			targetList.remove(selectedElement);

-			PreferencesHint preferencesHint = ((GraphicalEditPart) ((ConnectionEditPart) (sourceList.get(0))).getTarget()).getDiagramPreferencesHint();

-			ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_4008, ((IHintedType) UMLElementTypes.Dependency_4008).getSemanticHint(), preferencesHint);

-			CustomDeferredCreateConnectionViewCommand binaryCommand = new CustomDeferredCreateConnectionViewCommand(domain, ((IHintedType) UMLElementTypes.Dependency_4008).getSemanticHint(), new SemanticAdapter(null,

-					(((ConnectionEditPart) (targetList.get(0))).getSource()).getModel()), new SemanticAdapter(null, (((ConnectionEditPart) (sourceList.get(0))).getTarget()).getModel()), sourceList.get(0).getViewer(), preferencesHint, viewDescriptor, null);

-			binaryCommand.setElement(dependency);

-			command.add(new ICommandProxy(binaryCommand));

-		}

-		// 6.command Execution

-		selectedElement.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		if (selection instanceof IStructuredSelection) {

-			Object selectedobject = ((IStructuredSelection) selection).getFirstElement();

-			if (selectedobject instanceof DependencyBranchEditPart) {

-				selectedElement = (DependencyBranchEditPart) selectedobject;

-			}

-		}

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

-		// TODO Auto-generated method stub

-

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DisplayAllAssociationBranchCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DisplayAllAssociationBranchCommand.java
deleted file mode 100644
index 67c9c5761e2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DisplayAllAssociationBranchCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.profile.custom.commands;

-

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MultiAssociationHelper;

-import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart;

-import org.eclipse.ui.IObjectActionDelegate;

-import org.eclipse.ui.IWorkbenchPart;

-

-/**

- * This is the command in charge to delete the association and associated properties.

- */

-public class DisplayAllAssociationBranchCommand implements IObjectActionDelegate {

-

-	/** The selected element. */

-	private AssociationNodeEditPart selectedElement;

-

-	/**

-	 * constructor of this command.

-	 */

-	public DisplayAllAssociationBranchCommand() {

-		super();

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 */

-	public void run(IAction action) {

-		MultiAssociationHelper multiAssociationHelper = new MultiAssociationHelper(selectedElement.getEditingDomain());

-		selectedElement.getDiagramEditDomain().getDiagramCommandStack().execute(multiAssociationHelper.displayAllBranchesCommand(selectedElement));

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		if (selection instanceof IStructuredSelection) {

-			Object selectedobject = ((IStructuredSelection) selection).getFirstElement();

-			if (selectedobject instanceof AssociationNodeEditPart) {

-				selectedElement = (AssociationNodeEditPart) selectedobject;

-			}

-		}

-	}

-

-	/**

-	 * {@inheritedDoc}

-	 */

-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

-		// TODO Auto-generated method stub

-

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomGeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomGeneralizationItemSemanticEditPolicy.java
deleted file mode 100644
index 78962af8d91..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/itemsemantic/CustomGeneralizationItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 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:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Adapted code from the class diagram to the profile diagram

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic;

-

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.uml.diagram.profile.edit.policies.GeneralizationItemSemanticEditPolicy;

-

-/**

- * this a specialization to manage creation of GeneralizationSet

- */

-public class CustomGeneralizationItemSemanticEditPolicy extends GeneralizationItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		return super.getCompleteCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		return super.getStartCreateRelationshipCommand(req);

-	}

-}