From: Roland Haeder Date: Mon, 7 Sep 2015 14:23:48 +0000 (+0200) Subject: updated jcore.jar + jswingcore.jar + removed BaseAddressbookSystem X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8eae125e777194074b19ed1b7fb5ad2be4c3a461;p=jaddressbook-lib.git updated jcore.jar + jswingcore.jar + removed BaseAddressbookSystem Signed-off-by:Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index ad765c65..636db5cb 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jswingcore.jar b/lib/jswingcore.jar index 960b58d5..f478143d 100644 Binary files a/lib/jswingcore.jar and b/lib/jswingcore.jar differ diff --git a/src/org/mxchange/addressbook/BaseAddressbookSystem.java b/src/org/mxchange/addressbook/BaseAddressbookSystem.java deleted file mode 100644 index aa8c235a..00000000 --- a/src/org/mxchange/addressbook/BaseAddressbookSystem.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2015 Roland Haeder - * - * 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 3 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, see . - */ -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 485e7a5b..2e16df4e 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 1d0e3b9a..9afac98d 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 b59b13e0..7f7cc353 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 207a9b31..3e9f79b1 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 d5f46952..ee03267c 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 4bb1cf9e..a750aaf7 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 { }