From 68ca102e6d9055f8c402ad9224ec1fb1626bd784 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Tue, 3 Mar 2020 18:23:29 +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/tooling/base/ui/.ratings | 2 +-
.../org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java | 4 +++-
.../src/org/fortiss/tooling/common/ui/.ratings | 2 +-
.../fortiss/tooling/common/ui/ToolingCommonUIActivator.java | 4 +++-
.../src/org/fortiss/tooling/graphicsGL/ui/.ratings | 2 +-
.../tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java | 3 ++-
.../src/org/fortiss/tooling/kernel/ui/.ratings | 2 +-
.../fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java | 4 +++-
8 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/.ratings
index b78c28a17..5afaa2dca 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/.ratings
@@ -1 +1 @@
-ToolingBaseUIActivator.java 42fa7691bceec500b4e08cb28ef7fc69b9f8f658 GREEN
+ToolingBaseUIActivator.java dbb6f64b87a553ffbcfeb92160d84b63073dfd89 YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
index 42fa7691b..dbb6f64b8 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/ToolingBaseUIActivator.java
@@ -15,6 +15,8 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.base.ui;
+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 ToolingBaseUIActivator extends AbstractUIPlugin {
/** Returns image descriptor of the image in the kernel plugin. */
public static ImageDescriptor getImageDescriptor(String iconPath) {
- return imageDescriptorFromPlugin(PLUGIN_ID, iconPath);
+ return imageDescriptorFromBundle(PLUGIN_ID, iconPath).orElse(null);
}
}
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/.ratings
index a43153e7e..c7735d19c 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/.ratings
@@ -1 +1 @@
-ToolingCommonUIActivator.java cce1178fb9941ee2d4d97cfdbe6af8cf94170fd3 GREEN
+ToolingCommonUIActivator.java 0e00121865e18435bb9f130e23eea6e07b43af46 YELLOW
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/ToolingCommonUIActivator.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/ToolingCommonUIActivator.java
index cce1178fb..0e0012186 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/ToolingCommonUIActivator.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/ToolingCommonUIActivator.java
@@ -15,6 +15,8 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.common.ui;
+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 ToolingCommonUIActivator extends AbstractUIPlugin {
/** Returns the image descriptor for the given icon file. */
public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
}
}
diff --git a/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/.ratings b/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/.ratings
index c6edc8e23..00858ce6d 100644
--- a/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/.ratings
+++ b/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/.ratings
@@ -1 +1 @@
-ToolingGraphicsGLUIActivator.java 278f2896961a12211d7b48daf6ec6e685e105dc8 GREEN
+ToolingGraphicsGLUIActivator.java d8e45ba22affcad57dc7f194004aa110f11590fc YELLOW
diff --git a/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java b/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
index 278f28969..d8e45ba22 100644
--- a/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
+++ b/org.fortiss.tooling.graphicsGL.ui/src/org/fortiss/tooling/graphicsGL/ui/ToolingGraphicsGLUIActivator.java
@@ -17,6 +17,7 @@ package org.fortiss.tooling.graphicsGL.ui;
import static java.lang.System.mapLibraryName;
import static org.eclipse.core.runtime.FileLocator.toFileURL;
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
import static org.fortiss.tooling.base.utils.SystemUtils.isOs64BitArch;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -93,6 +94,6 @@ public class ToolingGraphicsGLUIActivator extends AbstractUIPlugin {
/** Returns the image descriptor for the given icon file. */
public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
}
}
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
index fbd0cab32..ced0addf3 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/.ratings
@@ -1,3 +1,3 @@
ESharedImages.java dd65be1d1ee807db8460064d9b970847e6303ff0 GREEN
ToolingKernelUI.java 250e5dde230272e286aa8d327fd597cf542774fe GREEN
-ToolingKernelUIActivator.java 1c6ac50477a78cd77d9e4daf36f423d4b4dbdf63 GREEN
+ToolingKernelUIActivator.java fc281e60592e54bd606d0b6667168afdfde8389e YELLOW
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
index 1c6ac5047..fc281e605 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/ToolingKernelUIActivator.java
@@ -15,6 +15,8 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.kernel.ui;
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
+
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -81,7 +83,7 @@ public class ToolingKernelUIActivator extends AbstractUIPlugin {
/** Returns image descriptor of the image in the kernel plugin. */
public static ImageDescriptor getImageDescriptor(String iconPath) {
- return imageDescriptorFromPlugin(PLUGIN_ID, iconPath);
+ return imageDescriptorFromBundle(PLUGIN_ID, iconPath).orElse(null);
}
/** {@inheritDoc} */
--
GitLab