Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-03-27 18:32:39 +0000
committerptessier2014-03-27 18:32:39 +0000
commitff768749648d09554e3a7878e135f05157436393 (patch)
tree9dee7742784d14f8f08615cbb7cc6d5d6c69ab1d /plugins
parentf82b0570c4d188420a753ab8c15e69b8bf5841c6 (diff)
parentee4591bbe74a80517780f021db9e550da17fbe79 (diff)
downloadorg.eclipse.papyrus-ff768749648d09554e3a7878e135f05157436393.tar.gz
org.eclipse.papyrus-ff768749648d09554e3a7878e135f05157436393.tar.xz
org.eclipse.papyrus-ff768749648d09554e3a7878e135f05157436393.zip
Merge branch 'master' of ssh://ptessier@git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git
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