384569: [Palette - CSS] There should be an "apply CSS Style" post-action

available in the palette customization tool
https://bugs.eclipse.org/bugs/show_bug.cgi?id=384569

Move the plug-in to its final location

12 files changed, 21 insertions, 11 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 0bed1e7ccf7..1b554374d8d 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
@@ -171,8 +171,11 @@ public class ResetStyleHandler extends AbstractHandler {
 			resetAnnotations(view);

 			//Remove the Papyrus Style EAnnotations

 			resetStyleAnnotations(view);

-			//Reset the visibility

-			view.eUnset(NotationPackage.eINSTANCE.getView_Visible());

+

+			if(view.eClass() != NotationPackage.eINSTANCE.getDecorationNode()) {

+				//Reset the visibility (Except for labels which are not yet supported)

+				view.eUnset(NotationPackage.eINSTANCE.getView_Visible());

+			}

 		}

 

 		private void resetStyle(Style style) {

diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.classpath
diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.project
index 5a5285828be..5a5285828be 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.project
diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/.settings/org.eclipse.jdt.core.prefs
diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF
index 6669dcfe529..862fd7d4f78 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/META-INF/MANIFEST.MF
@@ -2,17 +2,18 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.gef;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="0.10.0",

- org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",

+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="0.10.1",

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

+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="0.10.0"

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.1",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.10.1",

+ org.eclipse.papyrus.infra.core;bundle-version="0.10.1"

 Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.10.0.qualifier

+Bundle-Version: 0.10.1.qualifier

 Bundle-Name: CSS Palette customization (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.palette.Activa

diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/about.html b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/about.html
index dd02e0be168..dd02e0be168 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/about.html
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/about.html
diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/build.properties
index e3693a3b66e..12082314b29 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\

                .,\

                about.html,\

-               plugin.xml

+               plugin.xml,\

+               icon/

 src.includes = about.html

diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/icon/sourceEditor.gif b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/icon/sourceEditor.gif
index 75ebdb85865..75ebdb85865 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/icon/sourceEditor.gif
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/icon/sourceEditor.gif
diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/plugin.xml
index afebf315d91..afebf315d91 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/plugin.xml
diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/Activator.java
index c768102bf62..c768102bf62 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/Activator.java
diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/aspect/CSSStylePostAction.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/aspect/CSSStylePostAction.java
index bbca138528b..fc634c7b140 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/aspect/CSSStylePostAction.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/aspect/CSSStylePostAction.java
@@ -69,7 +69,12 @@ public class CSSStylePostAction extends ModelPostAction {
 	}

 

 	public void save(Node parentNode) {

-		String value = editor.getValue();

+		String value;

+		if(editor == null) {

+			value = getValue();

+		} else {

+			value = editor.getValue();

+		}

 		Element cssElement = ((Element)parentNode).getOwnerDocument().createElement(CLASS_ELEMENT);

 		parentNode.appendChild(cssElement);

 		cssElement.setAttribute(CLASS_PROPERTY, value);

diff --git a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/provider/CSSStyleAspectActionProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/provider/CSSStyleAspectActionProvider.java
index bc5529c9ba8..bc5529c9ba8 100644
--- a/sandbox/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/provider/CSSStyleAspectActionProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.palette/src/org/eclipse/papyrus/infra/gmfdiag/css/palette/provider/CSSStyleAspectActionProvider.java