diff --git a/src/org/dclermonte/siba/gui/AboutDialog.java b/src/org/dclermonte/siba/gui/AboutDialog.java index c4a4c51..a23239e 100644 --- a/src/org/dclermonte/siba/gui/AboutDialog.java +++ b/src/org/dclermonte/siba/gui/AboutDialog.java @@ -29,6 +29,7 @@ import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; +import java.net.URL; import java.util.Locale; import javax.swing.Box; @@ -119,7 +120,8 @@ public class AboutDialog extends JDialog { resource = "/org/dclermonte/siba/gui/about_en.html"; } - txtpnSimpleBackupDveloppeur.setText(SibaUtils.readResource(resource)); + URL url = AboutDialog.class.getResource(resource); + txtpnSimpleBackupDveloppeur.setText(SibaUtils.readResource(resource, url)); panel.add(txtpnSimpleBackupDveloppeur); { JLabel lblNewLabel = new JLabel(""); diff --git a/src/org/dclermonte/siba/model/SibaUtils.java b/src/org/dclermonte/siba/model/SibaUtils.java index 921a8d3..3c85506 100644 --- a/src/org/dclermonte/siba/model/SibaUtils.java +++ b/src/org/dclermonte/siba/model/SibaUtils.java @@ -33,7 +33,6 @@ import java.security.NoSuchAlgorithmException; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.io.IOUtils; -import org.dclermonte.siba.gui.AboutDialog; /** * @@ -230,21 +229,13 @@ public class SibaUtils * @return * @throws IOException */ - public static String readResource(final String resource) throws IOException + public static String readResource(final String resource, final URL url) throws IOException { String result; InputStream inputStream = null; - try - { - URL url = AboutDialog.class.getResource(resource); - inputStream = url.openStream(); - result = IOUtils.toString(inputStream, (String) null); - inputStream.close(); - } - finally - { - IOUtils.closeQuietly(inputStream); - } + + result = IOUtils.toString(url, (String) null); + return result; }