diff options
Diffstat (limited to 'plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus')
2 files changed, 15 insertions, 9 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;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java index 1d80907c116..abe16d648b9 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java @@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.ETypedElement;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedImage;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.papyrus.emf.facet.custom.ui.internal.Activator;
@@ -63,14 +64,17 @@ public class ImageQuery implements IJavaQuery2<EObject, IImage> { final IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory
.adapt(source, IItemLabelProvider.class);
if (itemLabelProvider != null) {
- final ImageDescriptor imgDescriptor = ExtendedImageRegistry
- .getInstance().getImageDescriptor(source);
- final IImageProvider imgProvider = IImageProviderFactory.DEFAULT
- .createIImageProvider(Activator.getDefault());
- if (imgDescriptor != null) {
- final Image image = imgProvider.getImage(imgDescriptor);
- result = new ImageWrapper(image);
- }
+ Object imageObject = itemLabelProvider.getImage(source);
+ Image image = ExtendedImageRegistry.getInstance().getImage(imageObject);
+ result = new ImageWrapper(image);
+//// final ImageDescriptor imgDescriptor = ExtendedImageRegistry
+//// .getInstance().getImageDescriptor(source);
+// final IImageProvider imgProvider = IImageProviderFactory.DEFAULT
+// .createIImageProvider(Activator.getDefault());
+// if (imgDescriptor != null) {
+// final Image image = imgProvider.getImage(imgDescriptor);
+// result = new ImageWrapper(image);
+// }
}
return result;
}
|