From 38e4b294992dace68bf92109c6dbbcf0d2e92166 Mon Sep 17 00:00:00 2001
From: cletavernie
Date: Tue, 22 Jan 2013 09:34:15 +0000
Subject: 397389: [Timing Diagram] Papyrus shall support UML2 timing diagram
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=397389

Update the CSS plug-in to take into account the UML Timing Diagram
---
 .../css/configuration/handler/AbstractStyleHandler.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration')

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
index 51bfcd51a23..436380c2d5f 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
@@ -40,8 +40,9 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
 import org.eclipse.papyrus.infra.gmfdiag.css.ATTRIBUTE_OP;
 import org.eclipse.papyrus.infra.gmfdiag.css.Attribute;
@@ -55,7 +56,7 @@ import org.eclipse.papyrus.infra.gmfdiag.css.SelectorCondition;
 import org.eclipse.papyrus.infra.gmfdiag.css.SimpleSelector;
 import org.eclipse.papyrus.infra.gmfdiag.css.Stylesheet;
 import org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator;
-import org.eclipse.papyrus.infra.gmfdiag.css.handler.CSSRefreshHandler;
+import org.eclipse.papyrus.infra.gmfdiag.css.engine.BaseCSSEngine;
 import org.eclipse.papyrus.infra.gmfdiag.css.provider.CustomStyle;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
@@ -68,13 +69,12 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 	public Object execute(ExecutionEvent event) {
 		ISelection selection;
 		try {
-			selection = ServiceUtilsForActionHandlers.getInstance().getNestedActiveIEditorPart().getSite().getSelectionProvider().getSelection();
+			selection = ServiceUtilsForHandlers.getInstance().getNestedActiveIEditorPart(event).getSite().getSelectionProvider().getSelection();
 			if(selection.isEmpty()) {
 				return null;
 			}
-		} catch (ServiceException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
 			return null;
 		}
 
@@ -165,7 +165,8 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 
 		try {
 			resource.save(new HashMap<Object, Object>());
-			(new CSSRefreshHandler()).execute(null); //FIXME: NPE on ExecutionEvent
+			BaseCSSEngine.instance.reset();
+			DiagramHelper.refreshDiagrams();
 		} catch (IOException ex) {
 			Activator.log.error(ex);
 			MessageDialog.open(MessageDialog.ERROR, parentShell, "Style error", "An unexpected error occured while trying to save the Stylesheet", SWT.NONE);
-- 
cgit v1.2.3