From e3551a6bd488a3d8cf24f97a8fcbce078e8c4c69 Mon Sep 17 00:00:00 2001
From: Albertus82 <albertus82@gmail.com>
Date: Tue, 21 Jul 2015 19:23:47 +0200
Subject: [PATCH] Minor fixes.

---
 .../it/albertus/router/gui/GuiImages.java     | 26 ++++++++++++-------
 .../java/it/albertus/router/gui/GuiTable.java |  1 -
 .../java/it/albertus/router/gui/GuiTray.java  |  3 +--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/it/albertus/router/gui/GuiImages.java b/src/main/java/it/albertus/router/gui/GuiImages.java
index 2c9b40f1..9ab1eb7b 100644
--- a/src/main/java/it/albertus/router/gui/GuiImages.java
+++ b/src/main/java/it/albertus/router/gui/GuiImages.java
@@ -1,5 +1,8 @@
 package it.albertus.router.gui;
 
+import java.io.IOException;
+import java.io.InputStream;
+
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageLoader;
@@ -7,16 +10,21 @@
 
 public class GuiImages {
 
-	public static final Image[] ICONS;
-	
-	static {
-		ImageLoader loader = new ImageLoader();
-		ImageData[] images = loader.load(GuiImages.class.getResourceAsStream("router.ico"));
-		ICONS = new Image[images.length];
+	public static final Image[] ICONS = initIcons();
+
+	private static Image[] initIcons() {
+		InputStream is = GuiImages.class.getResourceAsStream("router.ico");
+		ImageData[] images = new ImageLoader().load(is);
+		try {
+			is.close();
+		}
+		catch (IOException ioe) {}
+		Image[] icons = new Image[images.length];
 		int i = 0;
-		for(ImageData id : images) {
-			ICONS[i++] = new Image(Display.getCurrent(), id);
+		for (ImageData id : images) {
+			icons[i++] = new Image(Display.getCurrent(), id);
 		}
+		return icons;
 	}
-	
+
 }
diff --git a/src/main/java/it/albertus/router/gui/GuiTable.java b/src/main/java/it/albertus/router/gui/GuiTable.java
index a199ae2c..be68d696 100644
--- a/src/main/java/it/albertus/router/gui/GuiTable.java
+++ b/src/main/java/it/albertus/router/gui/GuiTable.java
@@ -108,7 +108,6 @@ public void run() {
 					catch (IllegalArgumentException iae) {}
 					catch (SWTException se) {}
 				}
-
 			});
 		}
 	}
diff --git a/src/main/java/it/albertus/router/gui/GuiTray.java b/src/main/java/it/albertus/router/gui/GuiTray.java
index 81903bf2..54ee2fe9 100644
--- a/src/main/java/it/albertus/router/gui/GuiTray.java
+++ b/src/main/java/it/albertus/router/gui/GuiTray.java
@@ -23,7 +23,7 @@ public static GuiTray getInstance() {
 	}
 
 	private GuiTray() {}
-	
+
 	private TrayItem trayItem = null;
 	private Menu menu = null;
 
@@ -101,7 +101,6 @@ public void handleEvent(Event event) {
 					}
 				});
 			}
-
 		}
 	}