Merge branch 'refactor/maven' into feature/multimeter3

2026-11-11 01:32:08 +10:00 · 2025-03-18 20:18:23 +01:00
parent 8b2f39c165 31ee2b93c3
commit 4203ffa9ec
521 changed files with 10370 additions and 38 deletions
@@ -76,7 +76,7 @@
            <artifactId>app-framework</artifactId>
            <version>1.0</version>
            <scope>system</scope>
-            <systemPath>${project.basedir}/../lib/app-framework.jar</systemPath>
+            <systemPath>${project.basedir}/../lib/app-framework-1.0.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>org.diylc.local</groupId>
@@ -59,7 +59,7 @@ public enum IconLoader {
  }

  public Icon getIcon() {
-    java.net.URL imgURL = getClass().getResource("/images/" + name);
+    java.net.URL imgURL = getClass().getResource("/diylc-core-images/" + name);
    if (imgURL != null) {
      return new ImageIcon(imgURL, name);
    } else {
@@ -71,8 +71,8 @@ public enum IconLoader {
  public Image getImage() {
    BufferedImage img = null;
    try {
-      img = ImageIO.read(getClass().getResourceAsStream("/images/" + name));
-    } catch (Exception e) {
+      img = ImageIO.read(getClass().getResourceAsStream("/diylc-core-images/" + name));
+    } catch (IOException e) {
      Logger.getLogger(IconLoader.class).error("Couldn't find file: " + name);
    }
    return img;