1 files changed, 128 insertions, 124 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/handler/ChangeShapeHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/handler/ChangeShapeHandler.java
index 12d20b5dabf..b345b71b617 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/handler/ChangeShapeHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/handler/ChangeShapeHandler.java
@@ -1,124 +1,128 @@
-/*****************************************************************************
- * 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.component.custom.handler;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.emf.edit.command.DeleteCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.component.custom.command.DeferredSetViewCommand;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class is an abstract class in charge to transform a editpart into another editpart
- * 
- */
-public abstract class ChangeShapeHandler extends AbstractHandler {
-
-	protected TransactionalEditingDomain transactionalEditingDomain = null;
-
-	protected org.eclipse.uml2.uml.Element selectedElement = null;
-	protected String newType;
-
-	/**
-	 * 
-	 * Constructor.
-	 *
-	 */
-	public ChangeShapeHandler() {
-		super();
-	}
-
-	protected abstract AbstractTransactionalCommand getChangeShapeCommand(final GraphicalEditPart editPart);
-
-	/**
-	 * 
-	 * @return null or the selected editPart
-	 */
-	protected GraphicalEditPart getSelectedGraphicalEditpart() {
-		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
-		ISelection selection = selectionService.getSelection();
-		if(selection instanceof IStructuredSelection) {
-			Object selectedobject = ((IStructuredSelection)selection).getFirstElement();
-			if(selectedobject instanceof GraphicalEditPart) {
-				return (GraphicalEditPart)selectedobject;
-			}
-		}
-		return null;
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		final GraphicalEditPart editPart = getSelectedGraphicalEditpart();
-		ServiceUtilsForEditPart util = ServiceUtilsForEditPart.getInstance();
-		try {
-			transactionalEditingDomain = util.getTransactionalEditingDomain(editPart);
-		} catch (Exception e) {
-			System.err.println("impossible to get the Transactional Editing Domain " + e);
-		}
-		try {
-			editPart.getEditingDomain().runExclusive(new Runnable() {
-
-				public void run() {
-					Display.getCurrent().asyncExec(new Runnable() {
-
-						public void run() {
-							//get Links
-							View view=(View)(editPart.getModel());
-							TransactionalEditingDomain domain= editPart.getEditingDomain();
-							@SuppressWarnings("unchecked")
-							ArrayList<Edge>targetEdge= new ArrayList<Edge>(view.getTargetEdges());
-							@SuppressWarnings("unchecked")
-							ArrayList<Edge>sourceEdge= new ArrayList<Edge>(view.getSourceEdges());
-							
-							//create new Shape
-							AbstractTransactionalCommand createCommand = getChangeShapeCommand(editPart);
-							org.eclipse.emf.common.command.Command deleteCommand = DeleteCommand.create(editPart.getEditingDomain(), view);
-							org.eclipse.emf.common.command.CompoundCommand compoundCommand = new org.eclipse.emf.common.command.CompoundCommand("change Shape");
-							compoundCommand.append(new GMFtoEMFCommandWrapper(createCommand));
-							
-							//remove old Shape
-							compoundCommand.append(deleteCommand);
-							
-							//Add links
-							DeferredSetViewCommand deferredSetCommand= new DeferredSetViewCommand(domain, (SemanticAdapter)createCommand.getCommandResult().getReturnValue(),  NotationPackage.eINSTANCE.getView_SourceEdges(), sourceEdge);
-							compoundCommand.append(new GMFtoEMFCommandWrapper(deferredSetCommand));
-							deferredSetCommand= new DeferredSetViewCommand(domain, (SemanticAdapter)createCommand.getCommandResult().getReturnValue(),  NotationPackage.eINSTANCE.getView_TargetEdges(), targetEdge);
-							compoundCommand.append(new GMFtoEMFCommandWrapper(deferredSetCommand));
-							
-							editPart.getEditingDomain().getCommandStack().execute(compoundCommand);
-						}
-					});
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
+/*****************************************************************************
+ * 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.component.custom.handler;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.edit.command.DeleteCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.component.custom.command.DeferredSetViewCommand;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * This class is an abstract class in charge to transform a editpart into another editpart
+ * 
+ */
+public abstract class ChangeShapeHandler extends AbstractHandler {
+
+	protected TransactionalEditingDomain transactionalEditingDomain = null;
+
+	protected org.eclipse.uml2.uml.Element selectedElement = null;
+	protected String newType;
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 */
+	public ChangeShapeHandler() {
+		super();
+	}
+
+	protected abstract AbstractTransactionalCommand getChangeShapeCommand(final GraphicalEditPart editPart);
+
+	/**
+	 * 
+	 * @return null or the selected editPart
+	 */
+	protected GraphicalEditPart getSelectedGraphicalEditpart() {
+		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (activeWorkbenchWindow!=null){
+			ISelectionService selectionService = activeWorkbenchWindow.getSelectionService();
+			ISelection selection = selectionService.getSelection();
+			if(selection instanceof IStructuredSelection) {
+				Object selectedobject = ((IStructuredSelection)selection).getFirstElement();
+				if(selectedobject instanceof GraphicalEditPart) {
+					return (GraphicalEditPart)selectedobject;
+				}
+			}			
+		}
+		return null;
+	}
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		final GraphicalEditPart editPart = getSelectedGraphicalEditpart();
+		ServiceUtilsForEditPart util = ServiceUtilsForEditPart.getInstance();
+		try {
+			transactionalEditingDomain = util.getTransactionalEditingDomain(editPart);
+		} catch (Exception e) {
+			System.err.println("impossible to get the Transactional Editing Domain " + e);
+		}
+		try {
+			editPart.getEditingDomain().runExclusive(new Runnable() {
+
+				public void run() {
+					Display.getCurrent().asyncExec(new Runnable() {
+
+						public void run() {
+							//get Links
+							View view=(View)(editPart.getModel());
+							TransactionalEditingDomain domain= editPart.getEditingDomain();
+							@SuppressWarnings("unchecked")
+							ArrayList<Edge>targetEdge= new ArrayList<Edge>(view.getTargetEdges());
+							@SuppressWarnings("unchecked")
+							ArrayList<Edge>sourceEdge= new ArrayList<Edge>(view.getSourceEdges());
+							
+							//create new Shape
+							AbstractTransactionalCommand createCommand = getChangeShapeCommand(editPart);
+							org.eclipse.emf.common.command.Command deleteCommand = DeleteCommand.create(editPart.getEditingDomain(), view);
+							org.eclipse.emf.common.command.CompoundCommand compoundCommand = new org.eclipse.emf.common.command.CompoundCommand("change Shape");
+							compoundCommand.append(new GMFtoEMFCommandWrapper(createCommand));
+							
+							//remove old Shape
+							compoundCommand.append(deleteCommand);
+							
+							//Add links
+							DeferredSetViewCommand deferredSetCommand= new DeferredSetViewCommand(domain, (SemanticAdapter)createCommand.getCommandResult().getReturnValue(),  NotationPackage.eINSTANCE.getView_SourceEdges(), sourceEdge);
+							compoundCommand.append(new GMFtoEMFCommandWrapper(deferredSetCommand));
+							deferredSetCommand= new DeferredSetViewCommand(domain, (SemanticAdapter)createCommand.getCommandResult().getReturnValue(),  NotationPackage.eINSTANCE.getView_TargetEdges(), targetEdge);
+							compoundCommand.append(new GMFtoEMFCommandWrapper(deferredSetCommand));
+							
+							editPart.getEditingDomain().getCommandStack().execute(compoundCommand);
+						}
+					});
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}