From 5c23c13bf904ba93a5ff0a691e170b774992da6a Mon Sep 17 00:00:00 2001 From: Servicepoint Date: Tue, 2 Dec 2014 15:21:55 +0100 Subject: [PATCH] Icons werden nun auch aus der Jar-Datei heraus angezeigt. --- .classpath | 1 + src/de/katho/kBorrow/Util.java | 2 ++ src/de/katho/kBorrow/db/SqliteConnector.java | 1 + src/de/katho/kBorrow/gui/MainWindow.java | 5 +++-- .../katho/kBorrow/listener/ArticleDeleteTableButton.java | 7 ++++--- src/de/katho/kBorrow/listener/ArticleEditTableButton.java | 7 ++++--- .../katho/kBorrow/listener/LendingReturnTableButton.java | 8 ++++---- src/de/katho/kBorrow/listener/NewLendingTableButton.java | 7 ++++--- src/de/katho/kBorrow/listener/UserDeleteTableButton.java | 7 ++++--- src/de/katho/kBorrow/listener/UserEditTableButton.java | 7 ++++--- 10 files changed, 31 insertions(+), 21 deletions(-) diff --git a/.classpath b/.classpath index 41b220a..814eb33 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,7 @@ + diff --git a/src/de/katho/kBorrow/Util.java b/src/de/katho/kBorrow/Util.java index 4fbdcb8..5579ceb 100644 --- a/src/de/katho/kBorrow/Util.java +++ b/src/de/katho/kBorrow/Util.java @@ -3,6 +3,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import de.katho.kBorrow.db.DbConnector; + public class Util { public static String getCurrentDate(){ diff --git a/src/de/katho/kBorrow/db/SqliteConnector.java b/src/de/katho/kBorrow/db/SqliteConnector.java index 7a6f032..9efb242 100644 --- a/src/de/katho/kBorrow/db/SqliteConnector.java +++ b/src/de/katho/kBorrow/db/SqliteConnector.java @@ -104,6 +104,7 @@ public class SqliteConnector implements DbConnector { for (Entry pEntry : pScheme.entrySet()){ st.executeUpdate(pEntry.getValue()); } + return true; } catch (SQLException e){ diff --git a/src/de/katho/kBorrow/gui/MainWindow.java b/src/de/katho/kBorrow/gui/MainWindow.java index 0c29180..2a4fdf7 100644 --- a/src/de/katho/kBorrow/gui/MainWindow.java +++ b/src/de/katho/kBorrow/gui/MainWindow.java @@ -8,6 +8,7 @@ import javax.swing.UnsupportedLookAndFeelException; import org.jdesktop.swingx.JXErrorPane; import org.jdesktop.swingx.error.ErrorInfo; + import java.awt.BorderLayout; import java.io.IOException; import java.sql.SQLException; @@ -45,7 +46,7 @@ public class MainWindow { * @throws ClassNotFoundException * @throws IOException */ - public MainWindow() { + public MainWindow() throws IOException { set = new Settings(); frame = new JFrame(); frame.setResizable(false); @@ -87,7 +88,7 @@ public class MainWindow { this.frame.setVisible(true); } - public static void main(String[] args){ + public static void main(String[] args) throws IOException{ new MainWindow(); } } diff --git a/src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java b/src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java index a4c95b3..d2c796e 100644 --- a/src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java +++ b/src/de/katho/kBorrow/listener/ArticleDeleteTableButton.java @@ -2,13 +2,13 @@ package de.katho.kBorrow.listener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.io.IOException; +import java.net.URL; -import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JTable; +import sun.tools.jar.Main; import de.katho.kBorrow.controller.ArticleController; import de.katho.kBorrow.gui.ArticlePanel; @@ -21,7 +21,8 @@ public class ArticleDeleteTableButton extends TableButton { public ArticleDeleteTableButton(String pLabel, final JTable pTable, final ArticlePanel pPanel, final ArticleController pController) throws IOException { super(pLabel); - ImageIcon icon = new ImageIcon(ImageIO.read(new File("assets/icons/edit-delete.png"))); + URL url = Main.class.getResource("/icons/edit-delete.png"); + ImageIcon icon = new ImageIcon(url); this.buttonE.setIcon(icon); this.buttonR.setIcon(icon); diff --git a/src/de/katho/kBorrow/listener/ArticleEditTableButton.java b/src/de/katho/kBorrow/listener/ArticleEditTableButton.java index 80d8ec4..82387c5 100644 --- a/src/de/katho/kBorrow/listener/ArticleEditTableButton.java +++ b/src/de/katho/kBorrow/listener/ArticleEditTableButton.java @@ -2,13 +2,13 @@ package de.katho.kBorrow.listener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.io.IOException; +import java.net.URL; -import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JTable; +import sun.tools.jar.Main; import de.katho.kBorrow.gui.ArticlePanel; public class ArticleEditTableButton extends TableButton { @@ -20,7 +20,8 @@ public class ArticleEditTableButton extends TableButton { public ArticleEditTableButton(String pLabel, final JTable pTable, final ArticlePanel articleTab) throws IOException { super(pLabel); - ImageIcon icon = new ImageIcon(ImageIO.read(new File("assets/icons/accessories-text-editor.png"))); + URL url = Main.class.getResource("/icons/accessories-text-editor.png"); + ImageIcon icon = new ImageIcon(url); this.buttonE.setIcon(icon); this.buttonR.setIcon(icon); diff --git a/src/de/katho/kBorrow/listener/LendingReturnTableButton.java b/src/de/katho/kBorrow/listener/LendingReturnTableButton.java index 424a7cf..e37e71e 100644 --- a/src/de/katho/kBorrow/listener/LendingReturnTableButton.java +++ b/src/de/katho/kBorrow/listener/LendingReturnTableButton.java @@ -2,13 +2,13 @@ package de.katho.kBorrow.listener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.io.IOException; +import java.net.URL; -import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JTable; +import sun.tools.jar.Main; import de.katho.kBorrow.controller.ManageLendingsController; public class LendingReturnTableButton extends TableButton { @@ -20,8 +20,8 @@ public class LendingReturnTableButton extends TableButton { public LendingReturnTableButton(String pLabel, final JTable pTable, final ManageLendingsController pController) throws IOException { super(pLabel); - - ImageIcon icon = new ImageIcon(ImageIO.read(new File("assets/icons/edit-undo.png"))); + URL url = Main.class.getResource("/icons/edit-undo.png"); + ImageIcon icon = new ImageIcon(url); this.buttonE.setIcon(icon); this.buttonR.setIcon(icon); diff --git a/src/de/katho/kBorrow/listener/NewLendingTableButton.java b/src/de/katho/kBorrow/listener/NewLendingTableButton.java index 52a4299..61ebeaa 100644 --- a/src/de/katho/kBorrow/listener/NewLendingTableButton.java +++ b/src/de/katho/kBorrow/listener/NewLendingTableButton.java @@ -2,13 +2,13 @@ package de.katho.kBorrow.listener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.io.IOException; +import java.net.URL; -import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JTable; +import sun.tools.jar.Main; import de.katho.kBorrow.gui.NewLendingPanel; public class NewLendingTableButton extends TableButton { @@ -20,7 +20,8 @@ public class NewLendingTableButton extends TableButton { public NewLendingTableButton(String pLabel, final JTable pTable, final NewLendingPanel pPanel) throws IOException { super(pLabel); - ImageIcon icon = new ImageIcon(ImageIO.read(new File("assets/icons/go-down.png"))); + URL url = Main.class.getResource("/icons/go-down.png"); + ImageIcon icon = new ImageIcon(url); this.buttonE.setIcon(icon); this.buttonR.setIcon(icon); diff --git a/src/de/katho/kBorrow/listener/UserDeleteTableButton.java b/src/de/katho/kBorrow/listener/UserDeleteTableButton.java index c74ec81..4addb15 100644 --- a/src/de/katho/kBorrow/listener/UserDeleteTableButton.java +++ b/src/de/katho/kBorrow/listener/UserDeleteTableButton.java @@ -2,13 +2,13 @@ package de.katho.kBorrow.listener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.io.IOException; +import java.net.URL; -import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JTable; +import sun.tools.jar.Main; import de.katho.kBorrow.controller.UserController; import de.katho.kBorrow.gui.UserPanel; @@ -18,7 +18,8 @@ public class UserDeleteTableButton extends TableButton { public UserDeleteTableButton(String pLabel, final JTable pTable, final UserPanel pPanel, final UserController pController ) throws IOException{ super(pLabel); - ImageIcon icon = new ImageIcon(ImageIO.read(new File("assets/icons/edit-delete.png"))); + URL url = Main.class.getResource("/icons/edit-delete.png"); + ImageIcon icon = new ImageIcon(url); this.buttonE.setIcon(icon); this.buttonR.setIcon(icon); diff --git a/src/de/katho/kBorrow/listener/UserEditTableButton.java b/src/de/katho/kBorrow/listener/UserEditTableButton.java index b0f57a7..53e8f5d 100644 --- a/src/de/katho/kBorrow/listener/UserEditTableButton.java +++ b/src/de/katho/kBorrow/listener/UserEditTableButton.java @@ -2,13 +2,13 @@ package de.katho.kBorrow.listener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import java.io.IOException; +import java.net.URL; -import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JTable; +import sun.tools.jar.Main; import de.katho.kBorrow.gui.UserPanel; public class UserEditTableButton extends TableButton { @@ -20,7 +20,8 @@ public class UserEditTableButton extends TableButton { public UserEditTableButton(String pLabel, final JTable pTable, final UserPanel pPanel) throws IOException{ super(pLabel); - ImageIcon icon = new ImageIcon(ImageIO.read(new File("assets/icons/accessories-text-editor.png"))); + URL url = Main.class.getResource("/icons/accessories-text-editor.png"); + ImageIcon icon = new ImageIcon(url); this.buttonE.setIcon(icon); this.buttonR.setIcon(icon);