From 1b7ae604fc79500e7ada6dbef2e1833425db3659 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 10 Mar 2014 14:15:38 +0000
Subject: [PATCH] Handle missing resource in loadSwtImage

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2241 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/ui/tray/SwtGatewayTray.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/java/davmail/ui/tray/SwtGatewayTray.java b/src/java/davmail/ui/tray/SwtGatewayTray.java
index 01c6866c..ac3899ed 100644
--- a/src/java/davmail/ui/tray/SwtGatewayTray.java
+++ b/src/java/davmail/ui/tray/SwtGatewayTray.java
@@ -160,6 +160,9 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
         try {
             ClassLoader classloader = DavGatewayTray.class.getClassLoader();
             URL imageUrl = classloader.getResource(fileName);
+            if (imageUrl == null) {
+                throw new IOException(fileName);
+            }
             result = new Image(display, imageUrl.openStream());
         } catch (IOException e) {
             DavGatewayTray.warn(new BundleMessage("LOG_UNABLE_TO_LOAD_IMAGE"), e);
@@ -180,7 +183,7 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
         final String systemLookAndFeelClassName = UIManager.getSystemLookAndFeelClassName();
         try {
             // workaround for bug when SWT and AWT both try to access Gtk
-            if (systemLookAndFeelClassName.indexOf("gtk") >= 0) {
+            if (systemLookAndFeelClassName.contains("gtk")) {
                 System.setProperty("swing.defaultlaf", UIManager.getCrossPlatformLookAndFeelClassName());
             } else {
                 System.setProperty("swing.defaultlaf", systemLookAndFeelClassName);