1 files changed, 15 insertions, 7 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
index 4bb39cfc34c..49d15a4f9c1 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
@@ -31,11 +31,11 @@ import org.eclipse.gmf.runtime.notation.Style;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.Activator;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
 import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSAnnotations;
 
@@ -57,13 +57,16 @@ public class ResetStyleHandler extends AbstractHandler {
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		ISelection selection;
+
 		try {
-			selection = ServiceUtilsForHandlers.getInstance().getNestedActiveIEditorPart(event).getSite().getSelectionProvider().getSelection();
-			if(selection.isEmpty()) {
-				return null;
-			}
+			IMultiDiagramEditor editor = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry().getService(IMultiDiagramEditor.class);
+			selection = editor.getEditorSite().getSelectionProvider().getSelection();
 		} catch (ServiceException ex) {
-			Activator.log.error(ex);
+			throw new ExecutionException(ex.getMessage(), ex);
+		}
+
+		//		selection = HandlerUtil.getCurrentSelection(event);
+		if(selection == null || selection.isEmpty()) {
 			return null;
 		}
 
@@ -134,6 +137,11 @@ public class ResetStyleHandler extends AbstractHandler {
 					resetStyle((View)viewObject, true);
 				}
 			}
+			for(Object lineObject : diagram.getEdges()) {
+				if(lineObject instanceof View) {
+					resetStyle((View)lineObject, true);
+				}
+			}
 		}
 
 		private void resetStyle(View view, boolean recursive) {