Bug 501766 - Context spy lost all of its Icon in the latest version
(20160916)
Change-Id: Ic16eeef3d3a7d888f517c6f1e3c07118da8dde11
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
diff --git a/bundles/org.eclipse.e4.tools.context.spy/plugin.xml b/bundles/org.eclipse.e4.tools.context.spy/plugin.xml
index e1cffaf..57c542a 100644
--- a/bundles/org.eclipse.e4.tools.context.spy/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.context.spy/plugin.xml
@@ -3,7 +3,7 @@
<extension point="org.eclipse.e4.tools.spy.spyPart">
<spyPart
description="Context Spy to understand what is behind the scene of injection"
- icon="icons/annotation_obj.gif"
+ icon="icons/annotation_obj.png"
name="Context spy"
part="org.eclipse.e4.tools.context.spy.ContextSpyPart"
shortcut="M2+M3+F10">
diff --git a/bundles/org.eclipse.e4.tools.context.spy/src/org/eclipse/e4/internal/tools/context/spy/ContextDataProvider.java b/bundles/org.eclipse.e4.tools.context.spy/src/org/eclipse/e4/internal/tools/context/spy/ContextDataProvider.java
index cbb87ac..ea843a1 100644
--- a/bundles/org.eclipse.e4.tools.context.spy/src/org/eclipse/e4/internal/tools/context/spy/ContextDataProvider.java
+++ b/bundles/org.eclipse.e4.tools.context.spy/src/org/eclipse/e4/internal/tools/context/spy/ContextDataProvider.java
@@ -58,13 +58,13 @@
private static final String INJECTED_IN_METHOD = "Injected in method :";
// Image keys constants
- private static final String PUBLIC_METHOD_IMG_KEY = "icons/methpub_obj.gif";
- private static final String PUBLIC_FIELD_IMG_KEY = "icons/field_public_obj.gif";
- private static final String VALUE_IN_CONTEXT_IMG_KEY = "icons/valueincontext.gif";
- private static final String INHERITED_VARIABLE_IMG_KEY = "icons/inher_co.gif";
+ private static final String PUBLIC_METHOD_IMG_KEY = "icons/methpub_obj.png";
+ private static final String PUBLIC_FIELD_IMG_KEY = "icons/field_public_obj.png";
+ private static final String VALUE_IN_CONTEXT_IMG_KEY = "icons/valueincontext.png";
+ private static final String INHERITED_VARIABLE_IMG_KEY = "icons/inher_co.png";
private static final String LOCAL_VARIABLE_IMG_KEY = "icons/letter-l-icon.png";
- private static final String CONTEXT_FUNCTION_IMG_KEY = "icons/contextfunction.gif";
- private static final String INJECT_IMG_KEY = "icons/annotation_obj.gif";
+ private static final String CONTEXT_FUNCTION_IMG_KEY = "icons/contextfunction.png";
+ private static final String INJECT_IMG_KEY = "icons/annotation_obj.png";
private ImageRegistry imgReg;
@@ -259,7 +259,7 @@
+ "Expand nodes to see where values are injected or updated";
} else if (isAContextKeyFunction(element)) {
String key = (String) ((Map.Entry<?, ?>) element).getKey();
- String fname = (String) selectedContext.localContextFunction().get(key).getClass().getCanonicalName();
+ String fname = selectedContext.localContextFunction().get(key).getClass().getCanonicalName();
return "This value is created by the Context Function : " + fname;
} else {
diff --git a/bundles/org.eclipse.e4.tools.context.spy/src/org/eclipse/e4/tools/context/spy/ContextSpyPart.java b/bundles/org.eclipse.e4.tools.context.spy/src/org/eclipse/e4/tools/context/spy/ContextSpyPart.java
index ebe4ca0..6746263 100644
--- a/bundles/org.eclipse.e4.tools.context.spy/src/org/eclipse/e4/tools/context/spy/ContextSpyPart.java
+++ b/bundles/org.eclipse.e4.tools.context.spy/src/org/eclipse/e4/tools/context/spy/ContextSpyPart.java
@@ -51,9 +51,9 @@
*/
public class ContextSpyPart {
- private static final String ICON_COLLAPSEALL = "icons/collapseall.gif";
- private static final String ICON_EXPANDALL = "icons/expandall.gif";
- private static final String ICON_REFRESH = "icons/refresh.gif";
+ private static final String ICON_COLLAPSEALL = "icons/collapseall.png";
+ private static final String ICON_EXPANDALL = "icons/expandall.png";
+ private static final String ICON_REFRESH = "icons/refresh.png";
// The ID for this part descriptor
static final String CONTEXT_SPY_VIEW_DESC = "org.eclipse.e4.tools.context.spy.view";
