Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-03-04 13:57:05 +0000
committerptessier2014-03-04 13:57:05 +0000
commit493d78d4af3fa77cc1b71e0b4ae4b25a1281fc82 (patch)
tree5ccb49145fb7679ce384ab8d78f96f13b0c83235 /plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java
parent236cb1a4af4d3fdbb27e6d70ef7e0d99c98c4dcc (diff)
downloadorg.eclipse.papyrus-493d78d4af3fa77cc1b71e0b4ae4b25a1281fc82.tar.gz
org.eclipse.papyrus-493d78d4af3fa77cc1b71e0b4ae4b25a1281fc82.tar.xz
org.eclipse.papyrus-493d78d4af3fa77cc1b71e0b4ae4b25a1281fc82.zip
Bug 386118 - [EMF Facet] Papyrus should progressively support EMF Facet
0.2 adapt oep.view.papyrus
Diffstat (limited to 'plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java')
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java
index 84950c7f7db..579ea41c864 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java
@@ -42,7 +42,9 @@ public class ResolvingCustomizedLabelProvider implements ICustomizedLabelProvide
final EAttributeTreeElement treeElement = (EAttributeTreeElement) element;
final EObjectTreeElement parent = (EObjectTreeElement) treeElement.getParent();
image = this.delegate.getImage(parent.getEObject(), treeElement.getEAttribute());
- } else {
+ }
+
+ else {
image = this.delegate.getImage(CustomizedContentProviderUtils.resolve(element));
}
return image;

Back to the top