From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Sun, 26 Aug 2012 20:24:15 +0000 (+0200)
Subject: Use IconLoader from utils.
X-Git-Tag: 0.11^2~19^2~6
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=c1a98d590bc8a8f4d2e53a092046a8d74474adb1;p=jSite.git

Use IconLoader from utils.
---

diff --git a/src/main/java/de/todesbaum/jsite/main/Main.java b/src/main/java/de/todesbaum/jsite/main/Main.java
index edbf5e4..38a0f1c 100644
--- a/src/main/java/de/todesbaum/jsite/main/Main.java
+++ b/src/main/java/de/todesbaum/jsite/main/Main.java
@@ -46,6 +46,7 @@ import javax.swing.JRadioButtonMenuItem;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import net.pterodactylus.util.image.IconLoader;
 import de.todesbaum.jsite.application.Freenet7Interface;
 import de.todesbaum.jsite.application.Node;
 import de.todesbaum.jsite.application.Project;
@@ -63,7 +64,6 @@ import de.todesbaum.jsite.gui.ProjectPage;
 import de.todesbaum.jsite.i18n.I18n;
 import de.todesbaum.jsite.i18n.I18nContainer;
 import de.todesbaum.jsite.main.ConfigurationLocator.ConfigurationLocation;
-import de.todesbaum.util.image.IconLoader;
 import de.todesbaum.util.swing.TWizard;
 import de.todesbaum.util.swing.TWizardPage;
 import de.todesbaum.util.swing.WizardListener;
diff --git a/src/main/java/de/todesbaum/util/image/IconLoader.java b/src/main/java/de/todesbaum/util/image/IconLoader.java
deleted file mode 100644
index ff6441a..0000000
--- a/src/main/java/de/todesbaum/util/image/IconLoader.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * jSite - IconLoader.java - Copyright © 2006–2012 David Roden
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package de.todesbaum.util.image;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
-/**
- * @author <a href="mailto:droden@gmail.com">David Roden</a>
- * @version $Id$
- */
-public class IconLoader {
-
-	public static Icon loadIcon(String resourceName) {
-		try {
-			InputStream resourceStream = IconLoader.class.getResourceAsStream(resourceName);
-			if (resourceStream == null) {
-				return null;
-			}
-			ByteArrayOutputStream imageOutput = new ByteArrayOutputStream();
-			byte[] buffer = new byte[16384];
-			int r = 0;
-			while ((r = resourceStream.read(buffer)) != -1) {
-				imageOutput.write(buffer, 0, r);
-			}
-			imageOutput.flush();
-			return new ImageIcon(imageOutput.toByteArray());
-		} catch (IOException e) {
-		}
-		return null;
-	}
-
-}