Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-03-27 13:07:04 -0400
committerCamille Letavernier2014-03-27 13:07:04 -0400
commit3491c13ff1a054f6c43e438c1fda07ba1123154c (patch)
tree95ade19598306f35d812ea4db5d18f06a1de202b /plugins
parent09d29d2bc9abd2fe27d4a5f52e15588bb8817627 (diff)
downloadorg.eclipse.papyrus-3491c13ff1a054f6c43e438c1fda07ba1123154c.tar.gz
org.eclipse.papyrus-3491c13ff1a054f6c43e438c1fda07ba1123154c.tar.xz
org.eclipse.papyrus-3491c13ff1a054f6c43e438c1fda07ba1123154c.zip
431345: [CSS] No-icon filter ignored for Type References
https://bugs.eclipse.org/bugs/show_bug.cgi?id=431345
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java
index 704da4abc99..eccccb2e6c4 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSCustomStyleDelegate.java
@@ -17,6 +17,7 @@ import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusC
import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
import org.eclipse.papyrus.infra.emf.appearance.style.AppearanceStyleProvider;
import org.eclipse.papyrus.infra.gmfdiag.css.engine.ExtendedCSSEngine;
+import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSDOMSemanticElementHelper;
import org.eclipse.papyrus.infra.gmfdiag.css.helper.StringHelper;
import org.w3c.dom.Element;
import org.w3c.dom.css.CSSValue;
@@ -55,11 +56,12 @@ public class CSSCustomStyleDelegate implements CustomStyle {
* The CSS engine used to handle the custom properties
*/
public CSSCustomStyleDelegate(View view, ExtendedCSSEngine engine) {
- this.view = view;
+ this.view = CSSDOMSemanticElementHelper.findPrimaryView(view);
this.engine = engine;
this.element = engine.getElement(this.view);
}
+ @Override
public boolean showElementIcon() {
EAnnotation displayNameLabelIcon = view.getEAnnotation(VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);
if(displayNameLabelIcon != null) {
@@ -73,6 +75,7 @@ public class CSSCustomStyleDelegate implements CustomStyle {
return (Boolean)engine.convert(cssValue, Boolean.class, null);
}
+ @Override
public int getQualifiedNameDepth() {
EAnnotation qualifiedNameAnnotation = view.getEAnnotation(VisualInformationPapyrusConstants.QUALIFIED_NAME);
if(qualifiedNameAnnotation != null) {
@@ -103,6 +106,7 @@ public class CSSCustomStyleDelegate implements CustomStyle {
}
}
+ @Override
public boolean showShadow() {
EAnnotation shadowAnnotation = view.getEAnnotation(VisualInformationPapyrusConstants.SHADOWFIGURE);

Back to the top