From eb136389464afd31028d653be8b4b5a2d92b3efa Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Mon, 16 Mar 2020 00:48:54 +0100
Subject: [PATCH] Make GraphicUtils::getURIString() private
* Use tooling.kernel's ResourceUtils::getResourceURI() instead
Issue-Ref: 3939
Issue-Url: https://af3-developer.fortiss.org/issues/3939
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../src/org/fortiss/tooling/common/ui/javafx/util/.ratings | 2 +-
.../fortiss/tooling/common/ui/javafx/util/GraphicUtils.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings
index d8aad1a69..b16c7a6de 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/.ratings
@@ -1,2 +1,2 @@
-GraphicUtils.java 46cfc991cd3ef787fec3f95751bc680d68479e26 GREEN
+GraphicUtils.java 9373a2c7a5ebb0d87284d0f6f983348812e5b90d YELLOW
JavaFXUtils.java db3cf28289109ffec64c8f96c7b2de779a977b3b GREEN
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/GraphicUtils.java b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/GraphicUtils.java
index 46cfc991c..9373a2c7a 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/GraphicUtils.java
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/util/GraphicUtils.java
@@ -32,7 +32,7 @@ public class GraphicUtils {
private static final HashMap<String, Image> imageCache = new HashMap<>();
/** Returns the plugin-local URI string for the given resource. */
- public static String getURIString(String pluginId, String localPath) {
+ private static String getURIString(String pluginId, String localPath) {
if(!pluginId.endsWith("/") && !localPath.startsWith("/")) {
localPath = "/" + localPath;
}
@@ -41,6 +41,9 @@ public class GraphicUtils {
/** Returns the Java FX Image loaded from the plugin's local path. */
public static Image getFXImage(String pluginId, String localPath) {
+ if(pluginId == null || localPath == null) {
+ return null;
+ }
String uri = getURIString(pluginId, localPath);
if(uri == null) {
return null;
--
GitLab