From cd5f9a1e6c67eae0702d6910afa13779f59301e2 Mon Sep 17 00:00:00 2001 From: catbref Date: Thu, 30 May 2019 11:23:53 +0100 Subject: [PATCH] Convert ClassLoader.getSystemResource* calls to class.getResource* variant for OSGi, etc. safety --- src/main/java/org/qora/controller/Controller.java | 2 +- src/main/java/org/qora/gui/Gui.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/qora/controller/Controller.java b/src/main/java/org/qora/controller/Controller.java index 1ef5da75..171da59d 100644 --- a/src/main/java/org/qora/controller/Controller.java +++ b/src/main/java/org/qora/controller/Controller.java @@ -80,7 +80,7 @@ public class Controller extends Thread { private Controller() { Properties properties = new Properties(); - try (InputStream in = ClassLoader.getSystemResourceAsStream("build.properties")) { + try (InputStream in = this.getClass().getResourceAsStream("/build.properties")) { properties.load(in); } catch (IOException e) { throw new RuntimeException("Can't read build.properties resource", e); diff --git a/src/main/java/org/qora/gui/Gui.java b/src/main/java/org/qora/gui/Gui.java index 89e38c1d..18e5f54b 100644 --- a/src/main/java/org/qora/gui/Gui.java +++ b/src/main/java/org/qora/gui/Gui.java @@ -42,9 +42,9 @@ public class Gui { } protected static BufferedImage loadImage(String resourceName) { - try (InputStream in = ClassLoader.getSystemResourceAsStream("images/" + resourceName)) { + try (InputStream in = Gui.class.getResourceAsStream("/images/" + resourceName)) { return ImageIO.read(in); - } catch (IOException e) { + } catch (IllegalArgumentException | IOException e) { LOGGER.warn(String.format("Couldn't locate image resource \"images/%s\"", resourceName)); return null; }