From c1a98d590bc8a8f4d2e53a092046a8d74474adb1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 26 Aug 2012 22:24:15 +0200 Subject: [PATCH] Use IconLoader from utils. --- src/main/java/de/todesbaum/jsite/main/Main.java | 2 +- .../java/de/todesbaum/util/image/IconLoader.java | 53 ---------------------- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 src/main/java/de/todesbaum/util/image/IconLoader.java 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 David Roden - * @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; - } - -} -- 2.7.4