Bug 530493 - ClassCastException in ArrangeHandler.doRun

 - fix the ClassCastException by adding instance of check

Change-Id: Ie3511d735de46fa3e44752ed0d948b64abb59016
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

1 files changed, 5 insertions, 6 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ArrangeHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ArrangeHandler.java
index 19683787943..1aaeb719448 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ArrangeHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/ArrangeHandler.java
@@ -37,9 +37,6 @@ import org.eclipse.ui.IWorkbenchPart;
 
 /**
  * Handler for the Arrange Action
- *
- *
- *
  */
 public class ArrangeHandler extends AbstractGraphicalCommandHandler {
 
@@ -111,7 +108,7 @@ public class ArrangeHandler extends AbstractGraphicalCommandHandler {
 		DiagramCommandStack stack = getDiagramCommandStack();
 		if (stack != null) {
 			try {
-				(stack).execute(getCommand(), progressMonitor);
+				stack.execute(getCommand(), progressMonitor);
 			} catch (ExecutionException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -132,8 +129,10 @@ public class ArrangeHandler extends AbstractGraphicalCommandHandler {
 					size += element.getFigure().getChildren().size();
 				}
 			} else if (operationSet != null && !operationSet.isEmpty()) {
-				IGraphicalEditPart container = (IGraphicalEditPart) getSelectionParent(operationSet);
-				size += container.getFigure().getChildren().size();
+				EditPart container = getSelectionParent(operationSet);
+				if (container instanceof IGraphicalEditPart) {
+					size += ((IGraphicalEditPart) container).getFigure().getChildren().size();
+				}
 			}
 
 			int totalDuration = Math.min(durationInc * factor / 2, Math.max(durationInc, (size / factor) * durationInc));