From 606a10b1e97302d435aeb31d2e6c37e779ba4a83 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Tue, 3 Mar 2020 18:27:33 +0100
Subject: [PATCH] Use
org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle
* Instead of deprecated method in AbstractUIPlugin
Issue-Ref: 3939
Issue-Url: https://af3-developer.fortiss.org/issues/3939
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../src/org/fortiss/af3/rcp/application/.ratings | 2 +-
.../fortiss/af3/rcp/application/AF3ApplicationActivator.java | 4 +++-
.../src/org/fortiss/af3/rcp/help/.ratings | 2 +-
.../src/org/fortiss/af3/rcp/help/AF3HelpActivator.java | 4 +++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/.ratings b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/.ratings
index 6cd1f47..07fdc6b 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/.ratings
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/.ratings
@@ -1,3 +1,3 @@
AF3Application.java 9bd897f7c02bfffc9be41c4fcb9ceca088a574b4 GREEN
-AF3ApplicationActivator.java 3f3a7bbe875ede3b265d7fa27e675961c5792e37 GREEN
+AF3ApplicationActivator.java cf948c7116dae2311d06e2fa54f51fd05aa3f2e8 YELLOW
NewProjectContextMenu.java cda28ae7d66ca140f24d13ec2e205c02068c3dc1 GREEN
diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/AF3ApplicationActivator.java b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/AF3ApplicationActivator.java
index 3f3a7bb..cf948c7 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/AF3ApplicationActivator.java
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/AF3ApplicationActivator.java
@@ -15,6 +15,8 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.rcp.application;
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
+
import java.io.File;
import javax.xml.parsers.DocumentBuilder;
@@ -70,7 +72,7 @@ public class AF3ApplicationActivator extends AbstractUIPlugin {
* relative path
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
}
/**
diff --git a/org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/.ratings b/org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/.ratings
index 54df857..7ad5394 100644
--- a/org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/.ratings
+++ b/org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/.ratings
@@ -1 +1 @@
-AF3HelpActivator.java ba9e079aa36be2c09780df324cdca9fcd280711e GREEN
+AF3HelpActivator.java 0e4b9fee0114114c727b0df1b359bc00053f66db YELLOW
diff --git a/org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/AF3HelpActivator.java b/org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/AF3HelpActivator.java
index ba9e079..0e4b9fe 100644
--- a/org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/AF3HelpActivator.java
+++ b/org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/AF3HelpActivator.java
@@ -15,6 +15,8 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.rcp.help;
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
+
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -53,6 +55,6 @@ public class AF3HelpActivator extends AbstractUIPlugin {
/** Returns an image descriptor for the image file at the given plug-in relative path. */
public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
}
}
--
GitLab