Moves ImageLoader into new Utility class

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/util/Utility.java

@@ -0,0 +1,55 @@
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.InputStream;
+
+import javax.imageio.ImageIO;
+
+/**
+ * Class for various helper methods.
+ *
+ * @author Andreas T. Meyer-Berg
+ */
+public class Utility {
+
+	/**
+	 * Loads resource image from the given path (resources/path). Returns default
+	 * image, if loading failed
+	 * 
+	 * @param path
+	 *            path where the image is located
+	 * @return Image from path, or default image if it failed
+	 */
+	public static BufferedImage loadFile(String path) {
+		try {
+			// Try loading Image from jar/resources
+			InputStream i = path.getClass().getClassLoader()
+					.getResourceAsStream(path);
+			return ImageIO.read(i);
+		} catch (Exception e) {
+			// Try loading from absolute path, if it failed (e.g. starting the
+			// program from eclipse or jvm)
+			// extend path with path to resources
+			path = "src/main/resources/" + path;
+			try {
+				return ImageIO.read(new File(path));
+			} catch (Exception e2) {
+				/**
+				 * return default Image (red cross on white background)
+				 */
+				BufferedImage def = new BufferedImage(64, 64,
+						BufferedImage.TYPE_INT_RGB);
+				for (int i = 0; i < 64; i++)
+					for (int j = 0; j < 64; j++) {
+						if (i * (64 - i) - j * (64 - j) == 0)
+							def.setRGB(i, j, Color.RED.getRGB());
+						else
+							def.setRGB(i, j, Color.white.getRGB());
+					}
+				return def;
+			}
+		}
+	}
+}

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/MainFrame.java

@@ -1,25 +1,21 @@
 package de.tu_darmstadt.tk.SmartHomeNetworkSim.view;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowStateListener;
-import java.awt.image.BufferedImage;
 
-import javax.imageio.ImageIO;
 import javax.swing.JFrame;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 
 import java.awt.BorderLayout;
-import java.io.File;
-import java.io.InputStream;
 
 import javax.swing.SwingConstants;
 
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.Utility;
 
 /**
  * Main class of the GUI, which combines the UserInterface and visualisation of the simulation.
@@ -70,7 +66,7 @@ public class MainFrame extends JFrame {
 			 */	
 			String path = "images/SmartHomeNetworkSim_icon.jpeg";
 			//this.setIconImage(ImageIO.read(new File("src/main/resources/images/SmartHomeNetworkSim_icon.jpeg")));
-			this.setIconImage(loadFile(path));
+			this.setIconImage(Utility.loadFile(path));
 		} catch (Exception e) {
 			System.err.println("WARNING: Failed to load Icon image in MainFrame.java");
 			e.printStackTrace();
@@ -110,38 +106,4 @@ public class MainFrame extends JFrame {
 		});
 		panel.requestFocusInWindow();
 	}
-	
-	/**
-	 * Loads resource image from the given path (resources/path).
-	 * Return default image, if loading failed
-	 * @param path pathe where the image is located
-	 * @return Image from path
-	 */
-	public BufferedImage loadFile(String path){
-		try {
-			//Try loading Image from jar/resources
-			InputStream i = this.getClass().getClassLoader().getResourceAsStream(path);
-			return ImageIO.read(i);
-		} catch (Exception e) {
-			//Try loading from absolute path, if it failed (e.g. starting the program from eclipse or jvm) 
-			//extend path with path to resources
-			path = "src/main/resources/"+ path;
-			try {
-				return ImageIO.read(new File(path));
-			} catch (Exception e2) {
-				/**
-				 * return default Image (red cross on white background)
-				 */
-				BufferedImage def = new BufferedImage(64, 64, BufferedImage.TYPE_INT_RGB);
-				for(int i = 0; i<64; i++)
-					for(int j = 0; j<64; j++){
-						if(i*(64-i)-j*(64-j)==0)
-							def.setRGB(i, j, Color.RED.getRGB());
-						else
-							def.setRGB(i, j, Color.white.getRGB());
-					}
-				return def;
-			}
-		}
-	}
 }