updated jcore.jar + jswingcore.jar + removed BaseAddressbookSystem

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/lib/jcore.jar b/lib/jcore.jar
index ad765c651eedef6a31b4c2d1ed677896302df52a..636db5cb817c5a8422435600d1eaa83f399dcde9 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jswingcore.jar b/lib/jswingcore.jar
index 960b58d575f620f5e04d8cc8273a13661e085b38..f478143db823186b7588e6249d50daadd58aa79d 100644 (file)
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 (file)
index aa8c235..0000000
--- 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 <http://www.gnu.org/licenses/>.
- */
-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 485e7a5b2c4797c280e5bc5f1cf4374e81d4eac0..2e16df4e97e8d90b547d2e4efed1304578d13ee2 100644 (file)
--- 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 1d0e3b9a854a662bfcd25a38c4245646879b63a3..9afac98d3401e330713422fb349d4097e93a3e8c 100644 (file)
--- 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 b59b13e04556b97cd939ebd7f963513ee74fb9d9..7f7cc3535e8b27cbce25fdd000fbc0f92598a7ea 100644 (file)
--- 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 207a9b319a7c5a24df4c1bb9de66f99083266b80..3e9f79b1d7474487dfcdec800faafc2bcbd9e992 100644 (file)
--- 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 d5f4695218ef02ae3ff8147958af94e94339109a..ee03267c4299383778f9cd6cb8d29611ae3d9b5e 100644 (file)
--- 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 4bb1cf9e37170d3b6d90417ad9691fd8da9f1553..a750aaf7a76dcaa944eab75445ed2d63895d257c 100644 (file)
--- 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 {
 
 }