312598: [Use case editor] Why does "subject" default to being a component?

https://bugs.eclipse.org/bugs/show_bug.cgi?id=312598

49 files changed, 744 insertions, 4150 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index a50975c6ff8..41ca049c432 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -60,7 +60,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.emf.appearance;bundle-version="0.9.0",

  org.eclipse.papyrus.uml.appearance;bundle-version="0.9.0",

  org.eclipse.papyrus.uml.service.types,

- org.eclipse.papyrus.infra.widgets

+ org.eclipse.papyrus.infra.widgets,

+ org.eclipse.papyrus.infra.emf;bundle-version="0.9.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

 Bundle-Version: 0.9.0.qualifier

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ComponentCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CustomSubjectClassifierCreateCommandTN.java
index 977742c1f0b..9f73fa051c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/ComponentCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/command/CustomSubjectClassifierCreateCommandTN.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

+ * Copyright (c) 2012 CEA LIST.

  *

  *    

  * All rights reserved. This program and the accompanying materials

@@ -8,33 +8,42 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

+package org.eclipse.papyrus.uml.diagram.usecase.command;

+

+import java.util.ArrayList;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

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

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

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

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

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

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.ui.SubjectSelectionDialog;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.uml2.uml.Classifier;

 

 /**

- * @generated

+ *specific command to create a subject 

+ *

  */

-public class ComponentCreateCommandTN extends EditElementCommand {

+public class CustomSubjectClassifierCreateCommandTN extends EditElementCommand {

 

+	

+	ArrayList<IHintedType> possibleSubject= new ArrayList<IHintedType>();

 	/**

 	 * @generated

 	 */

@@ -48,23 +57,24 @@ public class ComponentCreateCommandTN extends EditElementCommand {
 	/**

 	 * @generated

 	 */

-	public ComponentCreateCommandTN(CreateElementRequest req, EObject eObject) {

+	public CustomSubjectClassifierCreateCommandTN(CreateElementRequest req, EObject eObject, ArrayList<IHintedType> possibleSubject) {

 		super(req.getLabel(), null, req);

 		this.eObject = eObject;

 		this.eClass = eObject != null ? eObject.eClass() : null;

+		this.possibleSubject=possibleSubject;

 	}

 

 	/**

 	 * @generated

 	 */

-	public static ComponentCreateCommandTN create(CreateElementRequest req, EObject eObject) {

-		return new ComponentCreateCommandTN(req, eObject);

+	public static CustomSubjectClassifierCreateCommandTN create(CreateElementRequest req, EObject eObject, ArrayList<IHintedType> possibleSubject) {

+		return new CustomSubjectClassifierCreateCommandTN(req, eObject,possibleSubject);

 	}

 

 	/**

 	 * @generated

 	 */

-	public ComponentCreateCommandTN(CreateElementRequest req) {

+	public CustomSubjectClassifierCreateCommandTN(CreateElementRequest req) {

 		super(req.getLabel(), null, req);

 	}

 

@@ -95,19 +105,28 @@ public class ComponentCreateCommandTN extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Component newElement = UMLFactory.eINSTANCE.createComponent();

-		Package owner = (Package)getElementToEdit();

-		owner.getPackagedElements().add(newElement);

-		ElementInitializers.getInstance().init_Component_2015(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest)getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

+		SubjectSelectionDialog dialog= new SubjectSelectionDialog(new Shell(), possibleSubject, SWT.NATIVE);

+		dialog.open();

+		Classifier newElement=null;

+		IHintedType htype=dialog.getSelectedMetaclass();

+		EObject element=((CreateElementRequest)getRequest()).getContainer();

+		CreateElementRequest createElementRequest= new CreateElementRequest(element, htype);

+		

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(element);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand createCommand = provider.getEditCommand(createElementRequest);

+			createCommand.execute(new NullProgressMonitor(), null);

+			createCommand.getCommandResult().getReturnValue();

+			newElement=(Classifier)createCommand.getCommandResult().getReturnValue();

+		}

+		return  CommandResult.newOKCommandResult(newElement);

 	}

 

 	/**

 	 * @generated

 	 */

-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+	protected void doConfigure(Classifier newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

 		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

 		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomUseCaseDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomUseCaseDiagramItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..4026c6e5ee6
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/CustomUseCaseDiagramItemSemanticEditPolicy.java
@@ -0,0 +1,118 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

+

+import java.util.ArrayList;

+

+import org.eclipse.emf.ecore.EObject;

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

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

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

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.usecase.command.CustomSubjectClassifierCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.SubjectClassifierCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;

+

+

+/**

+ * this class is used to specialize the creation of a subject here a classifier

+ * before to propose element it test if can create it.

+ * 

+ * there also the possibility to add parameter to the request in order to precise the semantic to avoid the selecion dialog.

+ *

+ */

+public class CustomUseCaseDiagramItemSemanticEditPolicy extends UseCaseDiagramItemSemanticEditPolicy {

+	public static final String SUBJECT_SEMANTIC_HINT = "Subject_SemanticHint";

+	ArrayList<IHintedType> possibleSubject= new ArrayList<IHintedType>();

+

+	public CustomUseCaseDiagramItemSemanticEditPolicy() {

+		possibleSubject.add(org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.CLASS);

+		possibleSubject.add(org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.INTERFACE);

+		possibleSubject.add(org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.COMPONENT);

+		possibleSubject.add(org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.DATA_TYPE);

+		possibleSubject.add(org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.STATE_MACHINE);

+		possibleSubject.add(org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.SIGNAL);

+	}

+	@Override

+	protected Command getCreateCommand(CreateElementRequest req) {

+		//the case of the subject the semantic element can be various

+		EObject containerElement=req.getContainer();

+

+		if(UMLElementTypes.Classifier_2015 == req.getElementType()) {

+			ArrayList<ICommand> executableCommandCreation=new ArrayList<ICommand>();

+			ArrayList<IHintedType> executableHTypeCreation=new ArrayList<IHintedType>();

+

+			// test if the semantic is preciced

+			if(req.getParameter(SUBJECT_SEMANTIC_HINT)!=null){

+				IHintedType semanticHint=(IHintedType)req.getParameter(SUBJECT_SEMANTIC_HINT);

+				CreateElementRequest createElementRequest= new CreateElementRequest(containerElement, semanticHint);

+				IElementEditService provider = ElementEditServiceUtils.getCommandProvider(containerElement);

+				ICommand createCommand = provider.getEditCommand(createElementRequest);

+				if (createCommand.canExecute()){

+					executableCommandCreation.add(createCommand);

+					executableHTypeCreation.add(semanticHint);

+				}

+			}

+			else{

+				// no precision, so try to find all possibles commands

+				for( int i=0; i<possibleSubject.size();i++){

+					IHintedType currentHType=possibleSubject.get(i);

+

+					CreateElementRequest createElementRequest= new CreateElementRequest(containerElement, currentHType);

+					IElementEditService provider = ElementEditServiceUtils.getCommandProvider(containerElement);

+					ICommand createCommand = provider.getEditCommand(createElementRequest);

+					if (createCommand.canExecute()){

+						executableCommandCreation.add(createCommand);

+						executableHTypeCreation.add(currentHType);

+					}

+

+				}

+			}

+

+			//only one command so no dialog

+			if(executableCommandCreation.size()==1){

+				return new ICommandProxy(executableCommandCreation.get(0));

+			}

+			// several possible command--> dialog is set.

+			else if(executableCommandCreation.size()>1){

+				return new ICommandProxy(new  CustomSubjectClassifierCreateCommandTN(req, containerElement, executableHTypeCreation));

+			}

+			return getGEFWrapper(new SubjectClassifierCreateCommandTN(req));

+		}

+

+		return super.getCreateCommand(req);

+

+

+	}

+}

+//SubjectSelectionDialog dialog= new SubjectSelectionDialog(new Shell(), SWT.NATIVE);

+//dialog.open();

+//Classifier newElement=null;

+//EClass eclass=dialog.getSelectedMetaclass();

+//IElementType elementType=ElementTypeRegistry.getInstance().getElementType(eclass,ClientContextManager.getInstance().getClientContext("org.eclipse.papyrus.infra.services.edit.TypeContext"));

+//EObject element=((CreateElementRequest)getRequest()).getContainer();

+//CreateElementRequest createElementRequest= new CreateElementRequest(element, elementType);

+//

+//IElementEditService provider = ElementEditServiceUtils.getCommandProvider(element);

+//if(provider != null) {

+//	// Retrieve delete command from the Element Edit service

+//	ICommand createCommand = provider.getEditCommand(createElementRequest);

+//	createCommand.execute(new NullProgressMonitor(), null);

+//	createCommand.getCommandResult().getReturnValue();

+//	newElement=(Classifier)createCommand.getCommandResult().getReturnValue();

+//}

+//return  CommandResult.newOKCommandResult(newElement);
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/SubjectHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/SubjectHandler.java
index d308683fb35..8de541a4120 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/SubjectHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/SubjectHandler.java
@@ -29,7 +29,7 @@ public class SubjectHandler extends ChangeShapeHandler implements IHandler {
 	@Override

 	public boolean isEnabled() {

 		GraphicalEditPart editPart = getSelectedGraphicalEditpart();

-		if((editPart.resolveSemanticElement() instanceof org.eclipse.uml2.uml.Class) || (editPart.resolveSemanticElement() instanceof Interface)) {

+		if((editPart.resolveSemanticElement() instanceof org.eclipse.uml2.uml.Classifier)) {

 			if((editPart instanceof SubjectClassifierEditPartTN) ) {

 				return false;

 			} else {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/AbstractSubjectMetaclassesSelectionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/AbstractSubjectMetaclassesSelectionDialog.java
new file mode 100644
index 00000000000..06a5a5fecfb
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/AbstractSubjectMetaclassesSelectionDialog.java
@@ -0,0 +1,91 @@
+package org.eclipse.papyrus.uml.diagram.usecase.ui;

+

+import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Dialog;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.swt.widgets.Table;

+

+/**

+ * code generated to create this chooser of metaclasses to create a subject

+ */

+public class AbstractSubjectMetaclassesSelectionDialog extends Dialog {

+

+	protected Object result;

+

+	protected Shell shlmetaclassSelection;

+

+	protected Table table;

+

+	protected Button btnOk;

+

+	protected Button btnCancel;

+

+	/**

+	 * Create the dialog.

+	 * 

+	 * @param parent

+	 * @param style

+	 */

+	public AbstractSubjectMetaclassesSelectionDialog(Shell parent, int style) {

+		super(parent, SWT.DIALOG_TRIM | SWT.PRIMARY_MODAL);

+		setText("SWT Dialog");

+	}

+

+	/**

+	 * Open the dialog.

+	 * 

+	 * @return the result

+	 */

+	public Object open() {

+		createContents();

+		shlmetaclassSelection.open();

+		shlmetaclassSelection.layout();

+		Display display = getParent().getDisplay();

+		while(!shlmetaclassSelection.isDisposed()) {

+			if(!display.readAndDispatch()) {

+				display.sleep();

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * Create contents of the dialog.

+	 */

+	protected void createContents() {

+		shlmetaclassSelection = new Shell(getParent(), getStyle());

+		shlmetaclassSelection.setSize(501, 250);

+		shlmetaclassSelection.setText("Subject Metaclasses Selection");

+		shlmetaclassSelection.setLayout(new FillLayout(SWT.HORIZONTAL));

+

+		Composite composite = new Composite(shlmetaclassSelection, SWT.NONE);

+		composite.setLayout(null);

+		composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));

+

+		Label lblSelectTheAssociation = new Label(composite, SWT.NONE);

+		lblSelectTheAssociation.setLocation(24, 10);

+		lblSelectTheAssociation.setSize(441, 30);

+		lblSelectTheAssociation.setText("A subject can be a classfier, choose your concrete classifier:");

+		lblSelectTheAssociation.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));

+		FontData[] fontdatas = { new FontData("Tahoma", 9, SWT.BOLD) };

+		lblSelectTheAssociation.setFont(Activator.getFontManager().get(fontdatas));

+		table = new Table(composite, SWT.BORDER | SWT.FULL_SELECTION);

+		table.setBounds(25, 48, 440, 130);

+

+		btnOk = new Button(composite, SWT.NONE);

+		btnOk.setBounds(396, 180, 68, 23);

+		btnOk.setText("Ok");

+

+		btnCancel = new Button(composite, SWT.NONE);

+		btnCancel.setBounds(291, 180, 68, 23);

+		btnCancel.setText("Cancel");

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/SubjectSelectionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/SubjectSelectionDialog.java
new file mode 100644
index 00000000000..ba7ae76488b
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/SubjectSelectionDialog.java
@@ -0,0 +1,146 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.uml.diagram.usecase.ui;

+

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

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

+import org.eclipse.jface.viewers.ILabelProvider;

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

+import org.eclipse.jface.viewers.IStructuredContentProvider;

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

+import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.jface.viewers.TableViewer;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;

+import org.eclipse.papyrus.infra.emf.utils.EClassNameComparator;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.providers.UMLContentProvider;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.MouseListener;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Shell;

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

+import org.eclipse.uml2.uml.UMLFactory;

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

+

+import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils.Collections;

+

+

+/**

+ * This class can be launch is order to open a dialog used to choose an association

+ */

+public class SubjectSelectionDialog extends AbstractSubjectMetaclassesSelectionDialog {

+

+	/** The selected association. */

+	protected IHintedType selectedMetaclass;

+

+	/** The common metaclasses. */

+	ArrayList<IHintedType> subClassifierList;

+

+	/**

+	 * Instantiates a new association selection dialog.

+	 * 

+	 * @param parent

+	 *        the parent shell

+	 * @param style

+	 *        the style

+	 */

+	public SubjectSelectionDialog(Shell parent,ArrayList<IHintedType> executableHTypeCreation, int style) {

+		super(parent, style);

+

+		this.subClassifierList = executableHTypeCreation;

+		this.selectedMetaclass = (IHintedType)subClassifierList.toArray()[0];

+	}

+

+

+	

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.clazz.custom.ui.AbstractAssociationSelectionDialog#createContents()

+	 * 

+	 */

+

+	protected void createContents() {

+

+		// TODO Auto-generated method stub

+		super.createContents();

+		final ILabelProvider labelProvider = new  EMFLabelProvider(){

+			@Override

+			public String getText(Object element) {

+				// TODO Auto-generated method stub

+				if(element instanceof IHintedType){

+				String out= ((IHintedType)element).getDisplayName();

+				return out;

+				}

+				return super.getText(element);

+			}

+			@Override

+			public Image getImage(Object element) {

+				// TODO Auto-generated method stub

+				final ILabelProvider labelProvider = new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

+				return labelProvider.getImage(UMLFactory.eINSTANCE.createClass());

+			}

+		};//new EMFLabelProvider();//new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

+		final IStructuredContentProvider associationContentProvider = new IStructuredContentProvider() {

+

+			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+			}

+

+			public void dispose() {

+			}

+

+			public Object[] getElements(Object inputElement) {

+				return subClassifierList.toArray();

+			}

+		};

+		final TableViewer tableViewer = new TableViewer(table);

+		tableViewer.setLabelProvider(labelProvider);

+		tableViewer.setContentProvider(associationContentProvider);

+		tableViewer.setInput(subClassifierList);

+		btnOk.addMouseListener(new MouseListener() {

+

+			public void mouseUp(MouseEvent e) {

+				ISelection selection = tableViewer.getSelection();

+				if(selection instanceof IStructuredSelection) {

+					selectedMetaclass = (IHintedType)((IStructuredSelection)selection).getFirstElement();

+					shlmetaclassSelection.close();

+				}

+			}

+

+			public void mouseDown(MouseEvent e) {

+			}

+

+			public void mouseDoubleClick(MouseEvent e) {

+			}

+		});

+		btnCancel.setVisible(false);

+	}

+

+	/**

+	 * Gets the selected association.

+	 * 

+	 * @return the selected association

+	 */

+	public IHintedType getSelectedMetaclass() {

+		return selectedMetaclass;

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
index 02c1a1d5bcc..61ee403ecc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0"

+<xmi:XMI

+    xmi:version="2.0"

     xmlns:xmi="http://www.omg.org/XMI"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

     xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel"

@@ -33,6 +34,10 @@
           xsi:type="gmfgen:CustomBehaviour"

           key="EditPolicyRoles.DRAG_DROP_ROLE"

           editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy"/>

+      <behaviour

+          xsi:type="gmfgen:CustomBehaviour"

+          key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+          editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomUseCaseDiagramItemSemanticEditPolicy"/>

       <domainDiagramElement

           href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>

       <childNodes

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DefaultNamedElementCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DefaultNamedElementCreateCommandTN.java
index 45c53e21b47..c45812b0592 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DefaultNamedElementCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/DefaultNamedElementCreateCommandTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassCreateCommandTN.java
deleted file mode 100644
index 144579456c8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassCreateCommandTN.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

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

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

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

-

-/**

- * @generated

- */

-public class SubjectClassCreateCommandTN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private EClass eClass = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public SubjectClassCreateCommandTN(CreateElementRequest req, EObject eObject) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.eClass = eObject != null ? eObject.eClass() : null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static SubjectClassCreateCommandTN create(CreateElementRequest req, EObject eObject) {

-		return new SubjectClassCreateCommandTN(req, eObject);

-	}

-

-	/**

-	 * @generated

-	 */

-	public SubjectClassCreateCommandTN(CreateElementRequest req) {

-		super(req.getLabel(), null, req);

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 * 

-	 * @generated

-	 */

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest)getRequest()).getContainer();

-		if(container instanceof View) {

-			container = ((View)container).getElement();

-		}

-		if(container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean canExecute() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Class newElement = UMLFactory.eINSTANCE.createClass();

-		Package owner = (Package)getElementToEdit();

-		owner.getPackagedElements().add(newElement);

-		ElementInitializers.getInstance().init_Class_2020(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest)getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Class newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if(configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassifierCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassifierCreateCommandTN.java
index d5ddb69db1d..2b90b516e29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassifierCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectClassifierCreateCommandTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectCreateCommandTN.java
deleted file mode 100644
index 222ba2acd96..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectCreateCommandTN.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

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

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

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

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

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

-

-/**

- * @generated

- */

-public class SubjectCreateCommandTN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private EClass eClass = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public SubjectCreateCommandTN(CreateElementRequest req, EObject eObject) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.eClass = eObject != null ? eObject.eClass() : null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static SubjectCreateCommandTN create(CreateElementRequest req, EObject eObject) {

-		return new SubjectCreateCommandTN(req, eObject);

-	}

-

-	/**

-	 * @generated

-	 */

-	public SubjectCreateCommandTN(CreateElementRequest req) {

-		super(req.getLabel(), null, req);

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 * 

-	 * @generated

-	 */

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest)getRequest()).getContainer();

-		if(container instanceof View) {

-			container = ((View)container).getElement();

-		}

-		if(container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean canExecute() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		throw new UnsupportedOperationException("Unimplemented operation (abstract domain element).");

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Classifier newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if(configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectInterfaceCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectInterfaceCreateCommandTN.java
deleted file mode 100644
index 64d2db773ea..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/commands/SubjectInterfaceCreateCommandTN.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.commands;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

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

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

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

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

-import org.eclipse.papyrus.uml.diagram.usecase.providers.ElementInitializers;

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

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

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

-

-/**

- * @generated

- */

-public class SubjectInterfaceCreateCommandTN extends EditElementCommand {

-

-	/**

-	 * @generated

-	 */

-	private EClass eClass = null;

-

-	/**

-	 * @generated

-	 */

-	private EObject eObject = null;

-

-	/**

-	 * @generated

-	 */

-	public SubjectInterfaceCreateCommandTN(CreateElementRequest req, EObject eObject) {

-		super(req.getLabel(), null, req);

-		this.eObject = eObject;

-		this.eClass = eObject != null ? eObject.eClass() : null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public static SubjectInterfaceCreateCommandTN create(CreateElementRequest req, EObject eObject) {

-		return new SubjectInterfaceCreateCommandTN(req, eObject);

-	}

-

-	/**

-	 * @generated

-	 */

-	public SubjectInterfaceCreateCommandTN(CreateElementRequest req) {

-		super(req.getLabel(), null, req);

-	}

-

-	/**

-	 * FIXME: replace with setElementToEdit()

-	 * 

-	 * @generated

-	 */

-	protected EObject getElementToEdit() {

-		EObject container = ((CreateElementRequest)getRequest()).getContainer();

-		if(container instanceof View) {

-			container = ((View)container).getElement();

-		}

-		if(container != null) {

-			return container;

-		}

-		return eObject;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean canExecute() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		Interface newElement = UMLFactory.eINSTANCE.createInterface();

-		Package owner = (Package)getElementToEdit();

-		owner.getPackagedElements().add(newElement);

-		ElementInitializers.getInstance().init_Interface_2021(newElement);

-		doConfigure(newElement, monitor, info);

-		((CreateElementRequest)getRequest()).setNewElement(newElement);

-		return CommandResult.newOKCommandResult(newElement);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

-		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

-		configureRequest.addParameters(getRequest().getParameters());

-		ICommand configureCommand = elementType.getEditCommand(configureRequest);

-		if(configureCommand != null && configureCommand.canExecute()) {

-			configureCommand.execute(monitor, info);

-		}

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/DefaultNamedElementEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/DefaultNamedElementEditHelper.java
index 1177c01a9fc..87309d19e8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/DefaultNamedElementEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/DefaultNamedElementEditHelper.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/SubjectEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/SubjectEditHelper.java
index 851c6b216aa..8021a00b2c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/SubjectEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/helpers/SubjectEditHelper.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.helpers;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentNameEditPartTN.java
deleted file mode 100644
index 905eba5ac10..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentNameEditPartTN.java
+++ /dev/null
@@ -1,759 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *    

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

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

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

-package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

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

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

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

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

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

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

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

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

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

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

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

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

-import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class ComponentNameEditPartTN extends PapyrusCompartmentEditPart implements ITextAwareEditPart {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 5019;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 * 

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-

-	/**

-	 * @generated

-	 */

-	public ComponentNameEditPartTN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UseCaseDiagramEditPart.NodeLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if(figure instanceof WrappingLabel) {

-			return ((WrappingLabel)figure).getText();

-		} else if(figure instanceof ILabelFigure) {

-			return ((ILabelFigure)figure).getText();

-		} else {

-			return ((Label)figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if(figure instanceof WrappingLabel) {

-			((WrappingLabel)figure).setText(text);

-		} else if(figure instanceof ILabelFigure) {

-			((ILabelFigure)figure).setText(text);

-		} else {

-			((Label)figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if(figure instanceof WrappingLabel) {

-			return ((WrappingLabel)figure).getIcon();

-		} else if(figure instanceof ILabelFigure) {

-			return ((ILabelFigure)figure).getIcon();

-		} else {

-			return ((Label)figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if(figure instanceof WrappingLabel) {

-			((WrappingLabel)figure).setIcon(icon);

-		} else if(figure instanceof ILabelFigure) {

-			((ILabelFigure)figure).setIcon(icon);

-		} else {

-			((Label)figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(WrappingLabel figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if(parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if(text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getEditText() {

-		if(getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			public String isValid(final Object value) {

-				if(value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {

-

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

-							}

-						});

-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	public IContentAssistProcessor getCompletionProcessor() {

-		if(getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IParser getParser() {

-		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ComponentNameEditPartTN.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if(manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		getManager().show();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if(getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if(getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager)getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch(directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if(configuration == null || configuration.getLanguage() == null) {

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if(configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if(configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if(configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if(Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			// initialize the direct edit manager

-			try {

-				getEditingDomain().runExclusive(new Runnable() {

-

-					public void run() {

-						if(isActive() && isEditable()) {

-							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-								Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-								performDirectEdit(initialChar.charValue());

-							} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-								DirectEditRequest editRequest = (DirectEditRequest)theRequest;

-								performDirectEdit(editRequest.getLocation());

-							} else {

-								performDirectEdit();

-							}

-						}

-					}

-				});

-			} catch (InterruptedException e) {

-				e.printStackTrace();

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if(maskLabelPolicy == null) {

-			setLabelTextHelper(getFigure(), getLabelText());

-			setLabelIconHelper(getFigure(), getLabelIcon());

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshFont() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addSemanticListeners() {

-		if(getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

-			for(int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeSemanticListeners() {

-		if(parserElements != null) {

-			for(int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if(accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return (View)getModel();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 * 

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if(resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 * 

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 * 

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if(configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if(languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 * 

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *        the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				public void run() {

-					if(isActive() && isEditable()) {

-						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addNotationalListeners() {

-		super.addNotationalListeners();

-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeNotationalListeners() {

-		super.removeNotationalListeners();

-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void handleNotificationEvent(Notification event) {

-		refreshLabel();

-		Object feature = event.getFeature();

-		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer)event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if(getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser)getParser();

-				if(modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if(resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static final String ADD_PARENT_MODEL = "AddParentModel";

-

-	/**

-	 * @generated

-	 */

-	public void activate() {

-		super.activate();

-		addOwnerElementListeners();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	public void deactivate() {

-		removeOwnerElementListeners();

-		super.deactivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeOwnerElementListeners() {

-		removeListenerFilter(ADD_PARENT_MODEL);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
index 1b8e467c814..953015ecda1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementNameEditPart.java
index 43c31e70edd..466de952284 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementNameEditPart.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassNameEditPartTN.java
deleted file mode 100644
index b1aa00c8d35..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassNameEditPartTN.java
+++ /dev/null
@@ -1,763 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

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

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

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

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

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

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

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

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

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

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

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

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

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

-import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class SubjectClassNameEditPartTN extends PapyrusCompartmentEditPart implements ITextAwareEditPart {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6037;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 * 

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-

-	/**

-	 * @generated

-	 */

-	public SubjectClassNameEditPartTN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UseCaseDiagramEditPart.NodeLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if(figure instanceof WrappingLabel) {

-			return ((WrappingLabel)figure).getText();

-		} else if(figure instanceof ILabelFigure) {

-			return ((ILabelFigure)figure).getText();

-		} else {

-			return ((Label)figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if(figure instanceof WrappingLabel) {

-			((WrappingLabel)figure).setText(text);

-		} else if(figure instanceof ILabelFigure) {

-			((ILabelFigure)figure).setText(text);

-		} else {

-			((Label)figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if(figure instanceof WrappingLabel) {

-			return ((WrappingLabel)figure).getIcon();

-		} else if(figure instanceof ILabelFigure) {

-			return ((ILabelFigure)figure).getIcon();

-		} else {

-			return ((Label)figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if(figure instanceof WrappingLabel) {

-			((WrappingLabel)figure).setIcon(icon);

-		} else if(figure instanceof ILabelFigure) {

-			((ILabelFigure)figure).setIcon(icon);

-		} else {

-			((Label)figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(WrappingLabel figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		EObject parserElement = getParserElement();

-		if(parserElement == null) {

-			return null;

-		}

-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for(View view : views) {

-			if(NameLabelIconHelper.showLabelIcon(view)) {

-				return UMLElementTypes.getImage(parserElement.eClass());

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if(parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if(text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getEditText() {

-		if(getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			public String isValid(final Object value) {

-				if(value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {

-

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

-							}

-						});

-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	public IContentAssistProcessor getCompletionProcessor() {

-		if(getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IParser getParser() {

-		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_2020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassNameEditPartTN.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if(manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		getManager().show();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if(getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if(getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager)getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch(directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if(configuration == null || configuration.getLanguage() == null) {

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if(configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if(configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if(configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if(Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			// initialize the direct edit manager

-			try {

-				getEditingDomain().runExclusive(new Runnable() {

-

-					public void run() {

-						if(isActive() && isEditable()) {

-							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-								Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-								performDirectEdit(initialChar.charValue());

-							} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-								DirectEditRequest editRequest = (DirectEditRequest)theRequest;

-								performDirectEdit(editRequest.getLocation());

-							} else {

-								performDirectEdit();

-							}

-						}

-					}

-				});

-			} catch (InterruptedException e) {

-				e.printStackTrace();

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if(maskLabelPolicy == null) {

-			setLabelTextHelper(getFigure(), getLabelText());

-			setLabelIconHelper(getFigure(), getLabelIcon());

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshFont() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addSemanticListeners() {

-		if(getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

-			for(int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeSemanticListeners() {

-		if(parserElements != null) {

-			for(int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if(accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return (View)getModel();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 * 

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if(resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 * 

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 * 

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if(configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if(languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 * 

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *        the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				public void run() {

-					if(isActive() && isEditable()) {

-						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addNotationalListeners() {

-		super.addNotationalListeners();

-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeNotationalListeners() {

-		super.removeNotationalListeners();

-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void handleNotificationEvent(Notification event) {

-		refreshLabel();

-		Object feature = event.getFeature();

-		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer)event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if(getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser)getParser();

-				if(modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if(resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

-			refreshLabel();

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static final String ADD_PARENT_MODEL = "AddParentModel";

-

-	/**

-	 * @generated

-	 */

-	public void activate() {

-		super.activate();

-		addOwnerElementListeners();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	public void deactivate() {

-		removeOwnerElementListeners();

-		super.deactivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeOwnerElementListeners() {

-		removeListenerFilter(ADD_PARENT_MODEL);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassUsecasesEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassUsecasesEditPart.java
deleted file mode 100644
index 6fe7743a1b6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassUsecasesEditPart.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.gef.GraphicalEditPart;

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectClassUsecasesItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

-

-/**

- * @generated

- */

-public class SubjectClassUsecasesEditPart extends ShapeCompartmentEditPart {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7018;

-

-	/**

-	 * @generated

-	 */

-	public SubjectClassUsecasesEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.SubjectClassUsecasesEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IFigure createFigure() {

-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();

-		result.setTitleVisibility(false);

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubjectClassUsecasesItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectClassUsecasesCanonicalEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void handleNotificationEvent(Notification notification) {

-		Object feature = notification.getFeature();

-		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

-			refreshBounds();

-		}

-		super.handleNotificationEvent(notification);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshBounds() {

-		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

-		Dimension size = new Dimension(width, height);

-		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		Point loc = new Point(x, y);

-		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshBounds();

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
index 44f600005bf..503f207d31f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierNameEditPartTN.java
index d8a7bda2a6f..bbf4bf9edb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierNameEditPartTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectComponentUsecasesEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectComponentUsecasesEditPart.java
index 15b631e5db7..5814d27c0a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectComponentUsecasesEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectComponentUsecasesEditPart.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectEditPartTN.java
index 9f61c7eccaf..9330b3d0595 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectEditPartTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.ArrayList;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceNameEditPartTN.java
deleted file mode 100644
index 88730de2244..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceNameEditPartTN.java
+++ /dev/null
@@ -1,763 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

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

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

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

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

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

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

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

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

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

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

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

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

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

-import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class SubjectInterfaceNameEditPartTN extends PapyrusCompartmentEditPart implements ITextAwareEditPart {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6038;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 * 

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 * 

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-

-	/**

-	 * @generated

-	 */

-	public SubjectInterfaceNameEditPartTN(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UseCaseDiagramEditPart.NodeLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if(figure instanceof WrappingLabel) {

-			return ((WrappingLabel)figure).getText();

-		} else if(figure instanceof ILabelFigure) {

-			return ((ILabelFigure)figure).getText();

-		} else {

-			return ((Label)figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if(figure instanceof WrappingLabel) {

-			((WrappingLabel)figure).setText(text);

-		} else if(figure instanceof ILabelFigure) {

-			((ILabelFigure)figure).setText(text);

-		} else {

-			((Label)figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if(figure instanceof WrappingLabel) {

-			return ((WrappingLabel)figure).getIcon();

-		} else if(figure instanceof ILabelFigure) {

-			return ((ILabelFigure)figure).getIcon();

-		} else {

-			return ((Label)figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if(figure instanceof WrappingLabel) {

-			((WrappingLabel)figure).setIcon(icon);

-		} else if(figure instanceof ILabelFigure) {

-			((ILabelFigure)figure).setIcon(icon);

-		} else {

-			((Label)figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(WrappingLabel figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected List getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		EObject parserElement = getParserElement();

-		if(parserElement == null) {

-			return null;

-		}

-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for(View view : views) {

-			if(NameLabelIconHelper.showLabelIcon(view)) {

-				return UMLElementTypes.getImage(parserElement.eClass());

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if(parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if(text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getEditText() {

-		if(getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			public String isValid(final Object value) {

-				if(value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {

-

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

-							}

-						});

-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	public IContentAssistProcessor getCompletionProcessor() {

-		if(getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IParser getParser() {

-		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_2021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceNameEditPartTN.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if(manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		getManager().show();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if(getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if(getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager)getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch(directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if(configuration == null || configuration.getLanguage() == null) {

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if(configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if(configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if(configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if(Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			// initialize the direct edit manager

-			try {

-				getEditingDomain().runExclusive(new Runnable() {

-

-					public void run() {

-						if(isActive() && isEditable()) {

-							if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-								Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-								performDirectEdit(initialChar.charValue());

-							} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-								DirectEditRequest editRequest = (DirectEditRequest)theRequest;

-								performDirectEdit(editRequest.getLocation());

-							} else {

-								performDirectEdit();

-							}

-						}

-					}

-				});

-			} catch (InterruptedException e) {

-				e.printStackTrace();

-			}

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if(maskLabelPolicy == null) {

-			setLabelTextHelper(getFigure(), getLabelText());

-			setLabelIconHelper(getFigure(), getLabelIcon());

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshFont() {

-		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if(style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addSemanticListeners() {

-		if(getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

-			for(int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeSemanticListeners() {

-		if(parserElements != null) {

-			for(int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if(accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return (View)getModel();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if(checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if(checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 * 

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if(resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 * 

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 * 

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if(configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if(languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 * 

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 * 

-	 * @param theRequest

-	 *        the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				public void run() {

-					if(isActive() && isEditable()) {

-						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addNotationalListeners() {

-		super.addNotationalListeners();

-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeNotationalListeners() {

-		super.removeNotationalListeners();

-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void handleNotificationEvent(Notification event) {

-		refreshLabel();

-		Object feature = event.getFeature();

-		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer)event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if(getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser)getParser();

-				if(modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if(resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

-			refreshLabel();

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	private static final String ADD_PARENT_MODEL = "AddParentModel";

-

-	/**

-	 * @generated

-	 */

-	public void activate() {

-		super.activate();

-		addOwnerElementListeners();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

-	}

-

-	/**

-	 * @generated

-	 */

-	public void deactivate() {

-		removeOwnerElementListeners();

-		super.deactivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void removeOwnerElementListeners() {

-		removeListenerFilter(ADD_PARENT_MODEL);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceUsecasesEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceUsecasesEditPart.java
deleted file mode 100644
index ef005d1e782..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectInterfaceUsecasesEditPart.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

-

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.gef.GraphicalEditPart;

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectInterfaceUsecasesItemSemanticEditPolicy;

-import org.eclipse.papyrus.uml.diagram.usecase.part.Messages;

-

-/**

- * @generated

- */

-public class SubjectInterfaceUsecasesEditPart extends ShapeCompartmentEditPart {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 7019;

-

-	/**

-	 * @generated

-	 */

-	public SubjectInterfaceUsecasesEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	public String getCompartmentName() {

-		return Messages.SubjectInterfaceUsecasesEditPart_title;

-	}

-

-	/**

-	 * @generated

-	 */

-	public IFigure createFigure() {

-		ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();

-		result.setTitleVisibility(false);

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubjectInterfaceUsecasesItemSemanticEditPolicy());

-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

-		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.SubjectInterfaceUsecasesCanonicalEditPolicy());

-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setRatio(Double ratio) {

-		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

-			super.setRatio(ratio);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void handleNotificationEvent(Notification notification) {

-		Object feature = notification.getFeature();

-		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

-			refreshBounds();

-		}

-		super.handleNotificationEvent(notification);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshBounds() {

-		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

-		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

-		Dimension size = new Dimension(width, height);

-		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

-		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

-		Point loc = new Point(x, y);

-		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshBounds();

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectNameEditPartTN.java
index 75e3ccaec34..87e078914f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectNameEditPartTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.parts;

 

 import java.util.Collections;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseDiagramEditPart.java
index f2061e2987c..7a5e8394e73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseDiagramEditPart.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPol
 import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

 import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.CustomUseCaseDiagramItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseDiagramItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

 

@@ -66,6 +67,7 @@ public class UseCaseDiagramEditPart extends PapyrusDiagramEditPart {
 		//in Papyrus diagrams are not strongly synchronised

 		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseDiagramCanonicalEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomUseCaseDiagramItemSemanticEditPolicy());

 		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentItemSemanticEditPolicyTN.java
deleted file mode 100644
index 2eb345ab350..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/ComponentItemSemanticEditPolicyTN.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *    

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

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

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

-package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

-

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

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

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

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

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

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

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

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

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

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

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

-

-/**

- * @generated

- */

-public class ComponentItemSemanticEditPolicyTN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public ComponentItemSemanticEditPolicyTN() {

-		super(UMLElementTypes.Component_2015);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		EObject selectedEObject = req.getElementToDestroy();

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

-		if(provider != null) {

-			// Retrieve delete command from the Element Edit service

-			ICommand deleteCommand = provider.getEditCommand(req);

-			if(deleteCommand != null) {

-				return new ICommandProxy(deleteCommand);

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if(UMLElementTypes.Generalization_4010 == req.getElementType()) {

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Association_4011 == req.getElementType()) {

-			return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.ConstraintConstrainedElement_4012 == req.getElementType()) {

-			return null;

-		}

-		if(UMLElementTypes.Dependency_4013 == req.getElementType()) {

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.CommentAnnotatedElement_4014 == req.getElementType()) {

-			return null;

-		}

-		if(UMLElementTypes.Abstraction_4015 == req.getElementType()) {

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Usage_4016 == req.getElementType()) {

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Realization_4017 == req.getElementType()) {

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.PackageImport_4019 == req.getElementType()) {

-			return getGEFWrapper(new PackageImportCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if(UMLElementTypes.Generalization_4010 == req.getElementType()) {

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Association_4011 == req.getElementType()) {

-			return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.ConstraintConstrainedElement_4012 == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Dependency_4013 == req.getElementType()) {

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.CommentAnnotatedElement_4014 == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Abstraction_4015 == req.getElementType()) {

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Usage_4016 == req.getElementType()) {

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Realization_4017 == req.getElementType()) {

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.PackageImport_4019 == req.getElementType()) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 * 

-	 * @generated

-	 */

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch(getVisualID(req)) {

-		case GeneralizationEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case PackageImportEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if(provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if(reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 * 

-	 * @generated

-	 */

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch(getVisualID(req)) {

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/DefaultNamedElementItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/DefaultNamedElementItemSemanticEditPolicyTN.java
index 0e350a09594..5c97b96e581 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/DefaultNamedElementItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/DefaultNamedElementItemSemanticEditPolicyTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassItemSemanticEditPolicyTN.java
deleted file mode 100644
index b97701eb4fb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassItemSemanticEditPolicyTN.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

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

-import org.eclipse.emf.edit.command.DeleteCommand;

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

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

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectClassUsecasesEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

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

-

-/**

- * @generated

- */

-public class SubjectClassItemSemanticEditPolicyTN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SubjectClassItemSemanticEditPolicyTN() {

-		super(UMLElementTypes.Class_2020);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View)getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

-		if(annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyChildNodesCommand(cmd);

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addDestroyChildNodesCommand(ICompositeCommand cmd) {

-		View view = (View)getHost().getModel();

-		for(Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

-			Node node = (Node)nit.next();

-			switch(UMLVisualIDRegistry.getVisualID(node)) {

-			case SubjectClassUsecasesEditPart.VISUAL_ID:

-				for(Iterator<?> cit = node.getChildren().iterator(); cit.hasNext();) {

-					Node cnode = (Node)cit.next();

-					switch(UMLVisualIDRegistry.getVisualID(cnode)) {

-					case UseCaseInComponentEditPart.VISUAL_ID:

-						for(Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case IncludeEditPart.VISUAL_ID:

-							case ExtendEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case AssociationEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case UsageEditPart.VISUAL_ID:

-							case RealizationEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-						for(Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							case IncludeEditPart.VISUAL_ID:

-							case ExtendEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case AssociationEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case UsageEditPart.VISUAL_ID:

-							case RealizationEditPart.VISUAL_ID:

-							case PackageImportEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

-								break;

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case CommentEditPartCN.VISUAL_ID:

-						for(Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-						for(Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

-								break;

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ConstraintInComponentEditPart.VISUAL_ID:

-						for(Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case DependencyEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case UsageEditPart.VISUAL_ID:

-							case RealizationEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-						for(Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

-								break;

-							case DependencyEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case UsageEditPart.VISUAL_ID:

-							case RealizationEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

-								break;

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					}

-				}

-				break;

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if(UMLElementTypes.Generalization_4010 == req.getElementType()) {

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Association_4011 == req.getElementType()) {

-			return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.ConstraintConstrainedElement_4012 == req.getElementType()) {

-			return null;

-		}

-		if(UMLElementTypes.Dependency_4013 == req.getElementType()) {

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.CommentAnnotatedElement_4014 == req.getElementType()) {

-			return null;

-		}

-		if(UMLElementTypes.Abstraction_4015 == req.getElementType()) {

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Usage_4016 == req.getElementType()) {

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Realization_4017 == req.getElementType()) {

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.PackageImport_4019 == req.getElementType()) {

-			return getGEFWrapper(new PackageImportCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if(UMLElementTypes.Generalization_4010 == req.getElementType()) {

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Association_4011 == req.getElementType()) {

-			return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.ConstraintConstrainedElement_4012 == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Dependency_4013 == req.getElementType()) {

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.CommentAnnotatedElement_4014 == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Abstraction_4015 == req.getElementType()) {

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Usage_4016 == req.getElementType()) {

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Realization_4017 == req.getElementType()) {

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.PackageImport_4019 == req.getElementType()) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 * 

-	 * @generated

-	 */

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch(getVisualID(req)) {

-		case GeneralizationEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case PackageImportEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if(provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if(reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 * 

-	 * @generated

-	 */

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch(getVisualID(req)) {

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassUsecasesCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassUsecasesCanonicalEditPolicy.java
deleted file mode 100644
index 10bebfaeabd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassUsecasesCanonicalEditPolicy.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

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

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

-import org.eclipse.gef.EditPart;

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

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

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

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

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

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

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

-

-/**

- * @generated

- */

-public class SubjectClassUsecasesCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for(int i = 0; i < c.size(); i++) {

-			((EditPart)c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set getFeaturesToSynchronize() {

-		if(myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClassifier_OwnedUseCase());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getNamespace_OwnedRule());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	protected List getSemanticChildrenList() {

-		View viewObject = (View)getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassUsecases_7018SemanticChildren(viewObject);

-		for(UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == UseCaseInComponentEditPart.VISUAL_ID || visualID == CommentEditPartCN.VISUAL_ID || visualID == ConstraintInComponentEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if(resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getClassUsecases_7018SemanticChildren((View)getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for(View v : getViewChildren()) {

-			if(isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for(Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for(View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if(next.getModelElement().equals(semanticElement)) {

-					if(hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if(perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for(UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if(cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>)request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if(changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if(createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassUsecasesItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassUsecasesItemSemanticEditPolicy.java
deleted file mode 100644
index ffb4fc04b80..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassUsecasesItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

-

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

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

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintInComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseInComponentCreateCommand;

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

-

-/**

- * @generated

- */

-public class SubjectClassUsecasesItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SubjectClassUsecasesItemSemanticEditPolicy() {

-		super(UMLElementTypes.Class_2020);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		if(UMLElementTypes.UseCase_3009 == req.getElementType()) {

-			return getGEFWrapper(new UseCaseInComponentCreateCommand(req));

-		}

-		if(UMLElementTypes.Comment_3015 == req.getElementType()) {

-			return getGEFWrapper(new CommentCreateCommandCN(req));

-		}

-		if(UMLElementTypes.Constraint_3017 == req.getElementType()) {

-			return getGEFWrapper(new ConstraintInComponentCreateCommand(req));

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassifierItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassifierItemSemanticEditPolicyTN.java
index dd5189753bb..092dc7955e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassifierItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectClassifierItemSemanticEditPolicyTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesCanonicalEditPolicy.java
index 9e7b69a2c09..491ed62dfa1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesCanonicalEditPolicy.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import java.util.ArrayList;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesItemSemanticEditPolicy.java
index ca294f3d706..3e7a8e221ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectComponentUsecasesItemSemanticEditPolicy.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.gef.commands.Command;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceItemSemanticEditPolicyTN.java
deleted file mode 100644
index 503e96ea4e3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceItemSemanticEditPolicyTN.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

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

-import org.eclipse.emf.edit.command.DeleteCommand;

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

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

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtendEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.IncludeEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.SubjectInterfaceUsecasesEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

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

-

-/**

- * @generated

- */

-public class SubjectInterfaceItemSemanticEditPolicyTN extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SubjectInterfaceItemSemanticEditPolicyTN() {

-		super(UMLElementTypes.Interface_2021);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getDestroyElementCommand(DestroyElementRequest req) {

-		View view = (View)getHost().getModel();

-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

-		cmd.setTransactionNestingEnabled(true);

-		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

-		if(annotation == null) {

-			// there are indirectly referenced children, need extra commands: false

-			addDestroyChildNodesCommand(cmd);

-			addDestroyShortcutsCommand(cmd, view);

-			// delete host element

-			List<EObject> todestroy = new ArrayList<EObject>();

-			todestroy.add(req.getElementToDestroy());

-			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

-		} else {

-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

-		}

-		return getGEFWrapper(cmd.reduce());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void addDestroyChildNodesCommand(ICompositeCommand cmd) {

-		View view = (View)getHost().getModel();

-		for(Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

-			Node node = (Node)nit.next();

-			switch(UMLVisualIDRegistry.getVisualID(node)) {

-			case SubjectInterfaceUsecasesEditPart.VISUAL_ID:

-				for(Iterator<?> cit = node.getChildren().iterator(); cit.hasNext();) {

-					Node cnode = (Node)cit.next();

-					switch(UMLVisualIDRegistry.getVisualID(cnode)) {

-					case UseCaseInComponentEditPart.VISUAL_ID:

-						for(Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case IncludeEditPart.VISUAL_ID:

-							case ExtendEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case AssociationEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case UsageEditPart.VISUAL_ID:

-							case RealizationEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-						for(Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							case IncludeEditPart.VISUAL_ID:

-							case ExtendEditPart.VISUAL_ID:

-							case GeneralizationEditPart.VISUAL_ID:

-							case AssociationEditPart.VISUAL_ID:

-							case DependencyEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case UsageEditPart.VISUAL_ID:

-							case RealizationEditPart.VISUAL_ID:

-							case PackageImportEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

-								break;

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case CommentEditPartCN.VISUAL_ID:

-						for(Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-						for(Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

-								break;

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					case ConstraintInComponentEditPart.VISUAL_ID:

-						for(Iterator<?> it = cnode.getTargetEdges().iterator(); it.hasNext();) {

-							Edge incomingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-							case CommentAnnotatedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							case DependencyEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case UsageEditPart.VISUAL_ID:

-							case RealizationEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

-								break;

-							}

-						}

-						for(Iterator<?> it = cnode.getSourceEdges().iterator(); it.hasNext();) {

-							Edge outgoingLink = (Edge)it.next();

-							switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

-							case ConstraintConstrainedElementEditPart.VISUAL_ID:

-								DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(outgoingLink.getSource().getElement(), null, outgoingLink.getTarget().getElement(), false);

-								cmd.add(new DestroyReferenceCommand(destroyRefReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

-								break;

-							case DependencyEditPart.VISUAL_ID:

-							case AbstractionEditPart.VISUAL_ID:

-							case UsageEditPart.VISUAL_ID:

-							case RealizationEditPart.VISUAL_ID:

-								DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

-								cmd.add(new DestroyElementCommand(destroyEltReq));

-								cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

-								break;

-							}

-						}

-						cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: true

-						// don't need explicit deletion of cnode as parent's view deletion would clean child views as well 

-						// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));

-						break;

-					}

-				}

-				break;

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

-		return command != null ? command : super.getCreateRelationshipCommand(req);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if(UMLElementTypes.Generalization_4010 == req.getElementType()) {

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Association_4011 == req.getElementType()) {

-			return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.ConstraintConstrainedElement_4012 == req.getElementType()) {

-			return null;

-		}

-		if(UMLElementTypes.Dependency_4013 == req.getElementType()) {

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.CommentAnnotatedElement_4014 == req.getElementType()) {

-			return null;

-		}

-		if(UMLElementTypes.Abstraction_4015 == req.getElementType()) {

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Usage_4016 == req.getElementType()) {

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Realization_4017 == req.getElementType()) {

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.PackageImport_4019 == req.getElementType()) {

-			return getGEFWrapper(new PackageImportCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

-		if(UMLElementTypes.Generalization_4010 == req.getElementType()) {

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Association_4011 == req.getElementType()) {

-			return getGEFWrapper(new AssociationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.ConstraintConstrainedElement_4012 == req.getElementType()) {

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Dependency_4013 == req.getElementType()) {

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.CommentAnnotatedElement_4014 == req.getElementType()) {

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Abstraction_4015 == req.getElementType()) {

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Usage_4016 == req.getElementType()) {

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.Realization_4017 == req.getElementType()) {

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

-		}

-		if(UMLElementTypes.PackageImport_4019 == req.getElementType()) {

-			return null;

-		}

-		return null;

-	}

-

-	/**

-	 * Returns command to reorient EClass based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 * 

-	 * @generated

-	 */

-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

-		switch(getVisualID(req)) {

-		case GeneralizationEditPart.VISUAL_ID:

-		case DependencyEditPart.VISUAL_ID:

-		case AbstractionEditPart.VISUAL_ID:

-		case UsageEditPart.VISUAL_ID:

-		case RealizationEditPart.VISUAL_ID:

-		case PackageImportEditPart.VISUAL_ID:

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

-			if(provider == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			// Retrieve re-orient command from the Element Edit service

-			ICommand reorientCommand = provider.getEditCommand(req);

-			if(reorientCommand == null) {

-				return UnexecutableCommand.INSTANCE;

-			}

-			return getGEFWrapper(reorientCommand.reduce());

-		case AssociationEditPart.VISUAL_ID:

-			return getGEFWrapper(new AssociationReorientCommand(req));

-		}

-		return super.getReorientRelationshipCommand(req);

-	}

-

-	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

-	 * 

-	 * @generated

-	 */

-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

-		switch(getVisualID(req)) {

-		case ConstraintConstrainedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

-		case CommentAnnotatedElementEditPart.VISUAL_ID:

-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

-		}

-		return super.getReorientReferenceRelationshipCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceUsecasesCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceUsecasesCanonicalEditPolicy.java
deleted file mode 100644
index 10460d9b44e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceUsecasesCanonicalEditPolicy.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

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

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

-import org.eclipse.gef.EditPart;

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

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

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

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

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

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

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

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

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ConstraintInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseInComponentEditPart;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;

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

-

-/**

- * @generated

- */

-public class SubjectInterfaceUsecasesCanonicalEditPolicy extends CanonicalEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	private Set<EStructuralFeature> myFeaturesToSynchronize;

-

-	/**

-	 * @generated

-	 */

-	protected void refreshOnActivate() {

-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

-		List<?> c = getHost().getChildren();

-		for(int i = 0; i < c.size(); i++) {

-			((EditPart)c.get(i)).activate();

-		}

-		super.refreshOnActivate();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Set getFeaturesToSynchronize() {

-		if(myFeaturesToSynchronize == null) {

-			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getClassifier_OwnedUseCase());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getElement_OwnedComment());

-			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getNamespace_OwnedRule());

-		}

-		return myFeaturesToSynchronize;

-	}

-

-	/**

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	protected List getSemanticChildrenList() {

-		View viewObject = (View)getHost().getModel();

-		LinkedList<EObject> result = new LinkedList<EObject>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceUsecases_7019SemanticChildren(viewObject);

-		for(UMLNodeDescriptor d : childDescriptors) {

-			result.add(d.getModelElement());

-		}

-		return result;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

-		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

-	}

-

-	/**

-	 * @generated

-	 */

-	private boolean isMyDiagramElement(View view) {

-		int visualID = UMLVisualIDRegistry.getVisualID(view);

-		return visualID == UseCaseInComponentEditPart.VISUAL_ID || visualID == CommentEditPartCN.VISUAL_ID || visualID == ConstraintInComponentEditPart.VISUAL_ID;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshSemantic() {

-		if(resolveSemanticElement() == null) {

-			return;

-		}

-		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

-		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getInterfaceUsecases_7019SemanticChildren((View)getHost().getModel());

-		LinkedList<View> orphaned = new LinkedList<View>();

-		// we care to check only views we recognize as ours

-		LinkedList<View> knownViewChildren = new LinkedList<View>();

-		for(View v : getViewChildren()) {

-			if(isMyDiagramElement(v)) {

-				knownViewChildren.add(v);

-			}

-		}

-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

-		//

-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

-		for(Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

-			UMLNodeDescriptor next = descriptorsIterator.next();

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

-			for(View childView : getViewChildren()) {

-				EObject semanticElement = childView.getElement();

-				if(next.getModelElement().equals(semanticElement)) {

-					if(hint.equals(childView.getType())) {

-						perfectMatch.add(childView);

-						// actually, can stop iteration over view children here, but

-						// may want to use not the first view but last one as a 'real' match (the way original CEP does

-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

-					}

-				}

-			}

-			if(perfectMatch.size() > 0) {

-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

-				// use only one view (first or last?), keep rest as orphaned for further consideration

-				knownViewChildren.remove(perfectMatch.getFirst());

-			}

-		}

-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

-		orphaned.addAll(knownViewChildren);

-		//

-		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

-		for(UMLNodeDescriptor next : childDescriptors) {

-			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

-			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

-			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

-			viewDescriptors.add(descriptor);

-		}

-		boolean changed = deleteViews(orphaned.iterator());

-		//

-		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

-		Command cmd = getCreateViewCommand(request);

-		if(cmd != null && cmd.canExecute()) {

-			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

-			executeCommand(cmd);

-			@SuppressWarnings("unchecked")

-			List<IAdaptable> nl = (List<IAdaptable>)request.getNewObject();

-			createdViews.addAll(nl);

-		}

-		if(changed || createdViews.size() > 0) {

-			postProcessRefreshSemantic(createdViews);

-		}

-		if(createdViews.size() > 1) {

-			// perform a layout of the container

-			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

-			executeCommand(new ICommandProxy(layoutCmd));

-		}

-		makeViewsImmutable(createdViews);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceUsecasesItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceUsecasesItemSemanticEditPolicy.java
deleted file mode 100644
index 0975c29cb16..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectInterfaceUsecasesItemSemanticEditPolicy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

-

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

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

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.ConstraintInComponentCreateCommand;

-import org.eclipse.papyrus.uml.diagram.usecase.edit.commands.UseCaseInComponentCreateCommand;

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

-

-/**

- * @generated

- */

-public class SubjectInterfaceUsecasesItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

-

-	/**

-	 * @generated

-	 */

-	public SubjectInterfaceUsecasesItemSemanticEditPolicy() {

-		super(UMLElementTypes.Interface_2021);

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Command getCreateCommand(CreateElementRequest req) {

-		if(UMLElementTypes.UseCase_3009 == req.getElementType()) {

-			return getGEFWrapper(new UseCaseInComponentCreateCommand(req));

-		}

-		if(UMLElementTypes.Comment_3015 == req.getElementType()) {

-			return getGEFWrapper(new CommentCreateCommandCN(req));

-		}

-		if(UMLElementTypes.Constraint_3017 == req.getElementType()) {

-			return getGEFWrapper(new ConstraintInComponentCreateCommand(req));

-		}

-		return super.getCreateCommand(req);

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectItemSemanticEditPolicyTN.java
index 2b7b397bfd5..56e3d329e68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/SubjectItemSemanticEditPolicyTN.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorActionProvider.java
index 3ebd829a4bc..8ffa07bdecb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorActionProvider.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorContentProvider.java
index 2431c678e4d..a0838035ad7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/navigator/UMLNavigatorContentProvider.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.navigator;

 

 import java.util.ArrayList;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/ValidateAction.java
index 40b3161c2cd..48ac8304f68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/ValidateAction.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.part;

 

 import java.lang.reflect.InvocationTargetException;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassPreferencePage.java
index c80d98835bd..ba7f68f51b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassPreferencePage.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassifierPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassifierPreferencePage.java
index e3781679e2b..c56be34556c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassifierPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassifierPreferencePage.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DefaultNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DefaultNamedElementPreferencePage.java
index 05748489799..450f4783c9b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DefaultNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DefaultNamedElementPreferencePage.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/InterfacePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/InterfacePreferencePage.java
index b3d7d2c5830..6b192122ebb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/InterfacePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/InterfacePreferencePage.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.preferences;

 

 import java.util.Map;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java
index b7a6281ac3f..538db7b5f48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLMarkerNavigationProvider.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import java.util.Arrays;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java
index 4da56aa9864..814aece69ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationDecoratorProvider.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import org.eclipse.gef.EditDomain;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java
index 10f544c3eb9..25b375c7d84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLValidationProvider.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.usecase.providers;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;