Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-11-10 09:53:32 +0000
committerCamille Letavernier2015-11-10 09:55:33 +0000
commit17cef9291253fb9cba42bd7927661e71ca66e7d7 (patch)
treed7e068f0e2e77499af082450dd9695c91dc509ab /plugins
parent723215e77aaeda9e8acf6b6ca588db7dbd235a4c (diff)
downloadorg.eclipse.papyrus-17cef9291253fb9cba42bd7927661e71ca66e7d7.tar.gz
org.eclipse.papyrus-17cef9291253fb9cba42bd7927661e71ca66e7d7.tar.xz
org.eclipse.papyrus-17cef9291253fb9cba42bd7927661e71ca66e7d7.zip
478789: Papyrus Notation Model is used for non Papyrus Editors
https://bugs.eclipse.org/bugs/show_bug.cgi?id=478789 - Do not compute NamedStyles if the CSS Support is not enabled on the current resource - Add test Change-Id: Icf761fe2ec6885c11b102516e7a819e3ec3d4b7b Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java
index 6d25467378b..cab251a50a3 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src-gen/org/eclipse/papyrus/infra/gmfdiag/css/style/impl/CSSViewDelegate.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.gmfdiag.css.Activator;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
import org.eclipse.papyrus.infra.gmfdiag.css.helper.ParserHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
+import org.eclipse.papyrus.infra.gmfdiag.css.resource.CSSNotationResource;
import org.eclipse.papyrus.infra.gmfdiag.css.style.CSSView;
import org.w3c.dom.css.CSSValue;
@@ -59,7 +60,9 @@ public class CSSViewDelegate implements CSSView {
@Override
public NamedStyle getCSSNamedStyle(EClass eClass, String name) {
-
+ if (!CSSNotationResource.isCSSEnabled(view.eResource())) {
+ return null;
+ }
if (!NotationPackage.eINSTANCE.getNamedStyle().isSuperTypeOf(eClass)) {
return null;

Back to the top