From 8f3a4d130abd6ed81c2eefebc0fe643ade78fa2b Mon Sep 17 00:00:00 2001
From: Lazar Mitrovic <lazar.mitrovic996@gmail.com>
Date: Thu, 6 Feb 2020 03:31:48 +0100
Subject: [PATCH] Fixes to make project JDK11 compatible

---
 .../main/java/net/devbase/jfreesteel/viewer/EidViewer.java   | 4 ++--
 jfreesteel/pom.xml                                           | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/eidviewer/src/main/java/net/devbase/jfreesteel/viewer/EidViewer.java b/eidviewer/src/main/java/net/devbase/jfreesteel/viewer/EidViewer.java
index 26d62c1..aca5189 100644
--- a/eidviewer/src/main/java/net/devbase/jfreesteel/viewer/EidViewer.java
+++ b/eidviewer/src/main/java/net/devbase/jfreesteel/viewer/EidViewer.java
@@ -171,9 +171,9 @@ private static void createAndShowGUI() {
         List<Image> icons = new ArrayList<Image>();
         for (String iconFile : ICON_FILES) {
             try {
-                icons.add(ImageIO.read(frame.getClass().getResource(
+                icons.add(ImageIO.read(EidViewer.class.getResource(
                     "/net/devbase/jfreesteel/viewer/" + iconFile)));
-            } catch (IOException e) {
+            } catch (IOException | IllegalArgumentException e) {
                 logger.error("Could not find icon file "+iconFile, e);
             }
         }
diff --git a/jfreesteel/pom.xml b/jfreesteel/pom.xml
index f193ef0..f420053 100644
--- a/jfreesteel/pom.xml
+++ b/jfreesteel/pom.xml
@@ -49,6 +49,11 @@
           <version>3.2</version>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.3.0</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>