From 8eae125e777194074b19ed1b7fb5ad2be4c3a461 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 7 Sep 2015 16:23:48 +0200 Subject: [PATCH] =?utf8?q?updated=20jcore.jar=20+=20jswingcore.jar=20+=20r?= =?utf8?q?emoved=20BaseAddressbookSystem=20Signed-off-by:Roland=20H=C3=A4d?= =?utf8?q?er=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore.jar | Bin 29196 -> 29138 bytes lib/jswingcore.jar | Bin 8365 -> 7777 bytes .../addressbook/BaseAddressbookSystem.java | 32 ------------------ .../application/AddressbookApplication.java | 5 +-- .../client/gui/AddressbookFrame.java | 18 +++++----- .../addressbook/menu/AddressbookMenu.java | 3 +- .../mxchange/addressbook/menu/BaseMenu.java | 4 +-- .../mxchange/addressbook/menu/MenuTools.java | 4 +-- .../addressbook/menu/item/BaseMenuItem.java | 4 +-- 9 files changed, 17 insertions(+), 53 deletions(-) delete mode 100644 src/org/mxchange/addressbook/BaseAddressbookSystem.java diff --git a/lib/jcore.jar b/lib/jcore.jar index ad765c651eedef6a31b4c2d1ed677896302df52a..636db5cb817c5a8422435600d1eaa83f399dcde9 100644 GIT binary patch delta 1107 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 VkyCL|Gg}C$9iN*lrX6Je{s-9vSO)+A literal 8365 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. - */ -package org.mxchange.addressbook; - -import org.mxchange.jcore.BaseFrameworkSystem; - -/** - * General class for addressbook application - * - * @author Roland Haeder - */ -public class BaseAddressbookSystem extends BaseFrameworkSystem { - /** - * No instances can be created of this class - */ - protected BaseAddressbookSystem () { - } -} diff --git a/src/org/mxchange/addressbook/application/AddressbookApplication.java b/src/org/mxchange/addressbook/application/AddressbookApplication.java index 485e7a5..2e16df4 100644 --- a/src/org/mxchange/addressbook/application/AddressbookApplication.java +++ b/src/org/mxchange/addressbook/application/AddressbookApplication.java @@ -19,9 +19,6 @@ package org.mxchange.addressbook.application; import java.io.IOException; import java.sql.SQLException; import java.text.MessageFormat; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.mxchange.addressbook.BaseAddressbookSystem; import org.mxchange.addressbook.client.AddressbookClient; import org.mxchange.addressbook.client.console.ConsoleClient; import org.mxchange.addressbook.client.gui.SwingClient; @@ -121,7 +118,7 @@ import org.mxchange.jcore.manager.application.ApplicationManager; * @author Roland Haeder * @version 0.0 */ -public class AddressbookApplication extends BaseAddressbookSystem implements Application { +public class AddressbookApplication extends BaseFrameworkSystem implements Application { /** * Application title diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java index 1d0e3b9..9afac98 100644 --- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -47,10 +47,10 @@ import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.border.TitledBorder; import javax.swing.table.TableModel; -import org.mxchange.addressbook.BaseAddressbookSystem; import org.mxchange.addressbook.application.AddressbookApplication; import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException; import org.mxchange.addressbook.manager.contact.ManageableContactAddressbook; +import org.mxchange.jcore.BaseFrameworkSystem; import org.mxchange.jcore.client.Client; import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException; import org.mxchange.jcore.model.contact.Contact; @@ -62,7 +62,7 @@ import org.mxchange.jswingcore.model.swing.contact.ContactTableModel; * * @author Roland Haeder */ -public class AddressbookFrame extends BaseAddressbookSystem implements ClientFrame { +public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame { /** * Own instance @@ -589,16 +589,16 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra this.frame.setLocationRelativeTo(null); // Init menu system - initMenuSystem(); + this.initMenuSystem(); // Init table - initTable(); + this.initTable(); // Init status panel - initStatusPanel(); + this.initStatusPanel(); // Init other windows - initOtherDialogs(); + this.initOtherDialogs(); // Trace message this.getLogger().trace("EXIT!"); //NOI18N @@ -871,7 +871,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra this.getLogger().trace("CALLED!"); //NOI18N // Instance table model - this.dataModel = new ContactTableModel(this.getClient()); + this.dataModel = new ContactTableModel(this.getClient().getManager()); // Instance table this.dataTable = new JTable(this.dataModel); @@ -923,7 +923,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra /** * Class for "add address" button */ - private static class AddActionListener extends BaseAddressbookSystem implements ActionListener { + private static class AddActionListener extends BaseFrameworkSystem implements ActionListener { /** * Dialog instance */ @@ -960,7 +960,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra /** * Class for "cancel address" button */ - private static class CancelActionListener extends BaseAddressbookSystem implements ActionListener { + private static class CancelActionListener extends BaseFrameworkSystem implements ActionListener { /** * Dialog instance */ diff --git a/src/org/mxchange/addressbook/menu/AddressbookMenu.java b/src/org/mxchange/addressbook/menu/AddressbookMenu.java index b59b13e..7f7cc35 100644 --- a/src/org/mxchange/addressbook/menu/AddressbookMenu.java +++ b/src/org/mxchange/addressbook/menu/AddressbookMenu.java @@ -19,7 +19,6 @@ package org.mxchange.addressbook.menu; import java.text.MessageFormat; import java.util.List; import org.apache.logging.log4j.Logger; -import org.mxchange.addressbook.BaseAddressbookSystem; import org.mxchange.addressbook.client.AddressbookClient; import org.mxchange.addressbook.menu.item.SelectableMenuItem; import org.mxchange.jcore.client.Client; @@ -29,7 +28,7 @@ import org.mxchange.jcore.client.Client; * * @author Roland Haeder */ -public class AddressbookMenu extends BaseAddressbookSystem { +public class AddressbookMenu extends BaseMenu { /** * Copies entries for given type into the menu list diff --git a/src/org/mxchange/addressbook/menu/BaseMenu.java b/src/org/mxchange/addressbook/menu/BaseMenu.java index 207a9b3..3e9f79b 100644 --- a/src/org/mxchange/addressbook/menu/BaseMenu.java +++ b/src/org/mxchange/addressbook/menu/BaseMenu.java @@ -20,16 +20,16 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.mxchange.addressbook.BaseAddressbookSystem; import org.mxchange.addressbook.client.AddressbookClient; import org.mxchange.addressbook.menu.item.SelectableMenuItem; +import org.mxchange.jcore.BaseFrameworkSystem; import org.mxchange.jcore.client.Client; /** * * @author Roland Haeder */ -public class BaseMenu extends BaseAddressbookSystem { +public class BaseMenu extends BaseFrameworkSystem { /** * Menu list diff --git a/src/org/mxchange/addressbook/menu/MenuTools.java b/src/org/mxchange/addressbook/menu/MenuTools.java index d5f4695..ee03267 100644 --- a/src/org/mxchange/addressbook/menu/MenuTools.java +++ b/src/org/mxchange/addressbook/menu/MenuTools.java @@ -19,14 +19,14 @@ package org.mxchange.addressbook.menu; import java.util.Iterator; import java.util.Map; import org.apache.logging.log4j.Logger; -import org.mxchange.addressbook.BaseAddressbookSystem; import org.mxchange.addressbook.menu.item.SelectableMenuItem; +import org.mxchange.jcore.BaseFrameworkSystem; /** * * @author Roland Haeder */ -public class MenuTools extends BaseAddressbookSystem { +public class MenuTools extends BaseFrameworkSystem { /** * Gets an array with all available access keys back from given menu map. diff --git a/src/org/mxchange/addressbook/menu/item/BaseMenuItem.java b/src/org/mxchange/addressbook/menu/item/BaseMenuItem.java index 4bb1cf9..a750aaf 100644 --- a/src/org/mxchange/addressbook/menu/item/BaseMenuItem.java +++ b/src/org/mxchange/addressbook/menu/item/BaseMenuItem.java @@ -16,12 +16,12 @@ */ package org.mxchange.addressbook.menu.item; -import org.mxchange.addressbook.BaseAddressbookSystem; +import org.mxchange.jcore.BaseFrameworkSystem; /** * * @author Roland Haeder */ -public class BaseMenuItem extends BaseAddressbookSystem { +public class BaseMenuItem extends BaseFrameworkSystem { } -- 2.39.5