updated jcore

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

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 7a77632a281c93f7ff19129f0a989e5c5f231abc..f9fd3c434859fde0ad2b8326dba269516959d78d 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/src/org/mxchange/addressbook/client/AddressbookClient.java b/src/org/mxchange/addressbook/client/AddressbookClient.java
index 79fd0a2481c55f2ff6354dcd7e2a2c83d57304ad..9147fd91c31ac62fa92250fad645ec33e77ae8a6 100644 (file)
--- a/src/org/mxchange/addressbook/client/AddressbookClient.java
+++ b/src/org/mxchange/addressbook/client/AddressbookClient.java
@@ -18,9 +18,9 @@ package org.mxchange.addressbook.client;
 
 import org.mxchange.addressbook.menu.item.SelectableMenuItem;
 import org.mxchange.jcore.client.Client;
-import org.mxchange.jcore.contact.Contact;
-import org.mxchange.jcore.contact.gender.Gender;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
+import org.mxchange.jcore.model.contact.Contact;
+import org.mxchange.jcore.model.contact.gender.Gender;
 
 /**
  * A special client interface for addressbook applications.

diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java
index 61ff2f70fddd3c8750ccd4cc0c8f817c9b74c358..0df415eef9200334410634006533d27895ba0b56 100644 (file)
--- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java
+++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java
@@ -25,7 +25,6 @@ import java.util.Scanner;
 import org.mxchange.addressbook.application.AddressbookApplication;
 import org.mxchange.addressbook.client.AddressbookClient;
 import org.mxchange.addressbook.client.BaseAddressbookClient;
-import org.mxchange.addressbook.model.contact.user.UserContact;
 import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException;
 import org.mxchange.addressbook.manager.contact.ManageableAddressbookContact;
 import org.mxchange.addressbook.menu.Menu;
@@ -33,10 +32,11 @@ import org.mxchange.addressbook.menu.MenuTools;
 import org.mxchange.addressbook.menu.console.ConsoleMenu;
 import org.mxchange.addressbook.menu.item.SelectableMenuItem;
 import org.mxchange.addressbook.menu.item.console.ConsoleMenuItem;
+import org.mxchange.addressbook.model.contact.user.UserContact;
 import org.mxchange.jcore.application.Application;
-import org.mxchange.jcore.contact.Contact;
-import org.mxchange.jcore.contact.gender.Gender;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
+import org.mxchange.jcore.model.contact.Contact;
+import org.mxchange.jcore.model.contact.gender.Gender;
 
 /**
  * A client for the console

diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
index 7c85fc453cfe705423a3fecd71005d237b981f8b..bd0f4480e4c999c45a85dd5eb499e5c53f1dd118 100644 (file)
--- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
+++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
@@ -52,9 +52,9 @@ import org.mxchange.addressbook.application.AddressbookApplication;
 import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException;
 import org.mxchange.addressbook.manager.contact.ManageableAddressbookContact;
 import org.mxchange.jcore.client.Client;
-import org.mxchange.jcore.contact.Contact;
-import org.mxchange.jcore.contact.gender.Gender;
 import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException;
+import org.mxchange.jcore.model.contact.Contact;
+import org.mxchange.jcore.model.contact.gender.Gender;
 import org.mxchange.jswingcore.client.gui.ClientFrame;
 import org.mxchange.jswingcore.model.swing.contact.ContactTableModel;
 

diff --git a/src/org/mxchange/addressbook/client/gui/SwingClient.java b/src/org/mxchange/addressbook/client/gui/SwingClient.java
index b66b07c0030bd33fbac8976fe548d2f97b60b029..db75caf024f6e32f647d5eb827e5b7712d3afce4 100644 (file)
--- a/src/org/mxchange/addressbook/client/gui/SwingClient.java
+++ b/src/org/mxchange/addressbook/client/gui/SwingClient.java
@@ -23,10 +23,10 @@ import org.mxchange.addressbook.client.BaseAddressbookClient;
 import org.mxchange.addressbook.menu.Menu;
 import org.mxchange.addressbook.menu.item.SelectableMenuItem;
 import org.mxchange.jcore.application.Application;
-import org.mxchange.jcore.contact.Contact;
-import org.mxchange.jcore.contact.gender.Gender;
 import org.mxchange.jcore.exceptions.FrameAlreadyInitializedException;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
+import org.mxchange.jcore.model.contact.Contact;
+import org.mxchange.jcore.model.contact.gender.Gender;
 import org.mxchange.jswingcore.client.gui.ClientFrame;
 
 /**

diff --git a/src/org/mxchange/addressbook/exceptions/ContactAlreadyAddedException.java b/src/org/mxchange/addressbook/exceptions/ContactAlreadyAddedException.java
index fa6ac123dcea0af35d333dccc6d6538e272e762d..3eda782414cf5521bc317b840c50a0fa8a69afba 100644 (file)
--- a/src/org/mxchange/addressbook/exceptions/ContactAlreadyAddedException.java
+++ b/src/org/mxchange/addressbook/exceptions/ContactAlreadyAddedException.java
@@ -17,7 +17,7 @@
 package org.mxchange.addressbook.exceptions;
 
 import java.text.MessageFormat;
-import org.mxchange.jcore.contact.Contact;
+import org.mxchange.jcore.model.contact.Contact;
 
 /**
  * Thrown if the given Contact instance is already added
@@ -25,6 +25,10 @@ import org.mxchange.jcore.contact.Contact;
  * @author Roland Haeder
  */
 public class ContactAlreadyAddedException extends Exception {
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 75844851467L;
 
        /**
         * Constructor with a Contact instance

diff --git a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java
index 24bc39f66a57bae8fc7a16fbb4e51a5785f8f868..072ff62dbdc0186cd3a9abb9c4ed5fdcac93fb3c 100644 (file)
--- a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java
+++ b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java
@@ -27,10 +27,10 @@ import java.util.List;
 import org.mxchange.addressbook.client.AddressbookClient;
 import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException;
 import org.mxchange.jcore.client.Client;
-import org.mxchange.jcore.contact.Contact;
-import org.mxchange.jcore.contact.gender.Gender;
 import org.mxchange.jcore.exceptions.UnhandledUserChoiceException;
 import org.mxchange.jcore.manager.BaseManager;
+import org.mxchange.jcore.model.contact.Contact;
+import org.mxchange.jcore.model.contact.gender.Gender;
 
 /**
  * A manager for contacts.

diff --git a/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java b/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java
index 71977e3b1cf500d7ab29949a3ac6e6866fa162e1..21b3671bfdb4dd4608c532712a4553e7351d754a 100644 (file)
--- a/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java
+++ b/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java
@@ -20,9 +20,9 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.SQLException;
 import org.mxchange.addressbook.exceptions.ContactAlreadyAddedException;
-import org.mxchange.jcore.contact.Contact;
-import org.mxchange.jcore.contact.gender.Gender;
 import org.mxchange.jcore.manager.Manageable;
+import org.mxchange.jcore.model.contact.Contact;
+import org.mxchange.jcore.model.contact.gender.Gender;
 
 /**
  *

diff --git a/src/org/mxchange/addressbook/model/contact/book/BookContact.java b/src/org/mxchange/addressbook/model/contact/book/BookContact.java
index 0ee136f81c71f01c1c18f3611d35e2b78a33ac03..c34066f48ec9bb33c15bd550de3225d74c742ecd 100644 (file)
--- a/src/org/mxchange/addressbook/model/contact/book/BookContact.java
+++ b/src/org/mxchange/addressbook/model/contact/book/BookContact.java
@@ -16,8 +16,8 @@
  */
 package org.mxchange.addressbook.model.contact.book;
 
-import org.mxchange.jcore.contact.BaseContact;
-import org.mxchange.jcore.contact.Contact;
+import org.mxchange.jcore.model.contact.BaseContact;
+import org.mxchange.jcore.model.contact.Contact;
 
 /**
  * A contact that can be placed into "contact books"

diff --git a/src/org/mxchange/addressbook/model/contact/user/UserContact.java b/src/org/mxchange/addressbook/model/contact/user/UserContact.java
index 7b47c0e3ad575f9e1f9488520ae62e5e085f4ab3..ef51cb4e45e7c2143854aaf4328a3629857277d5 100644 (file)
--- a/src/org/mxchange/addressbook/model/contact/user/UserContact.java
+++ b/src/org/mxchange/addressbook/model/contact/user/UserContact.java
@@ -18,14 +18,13 @@ package org.mxchange.addressbook.model.contact.user;
 
 import java.text.MessageFormat;
 import org.mxchange.addressbook.model.contact.book.BookContact;
-import org.mxchange.jcore.contact.Contact;
-import org.mxchange.jcore.contact.gender.Gender;
+import org.mxchange.jcore.model.contact.Contact;
+import org.mxchange.jcore.model.contact.gender.Gender;
 
 /**
  *
  * @author Roland Haeder
- * TODO After a Collection has been used in ContactManager, change to
- * BaseContact
+ * TODO After a Collection has been used in ContactManager, change to BaseContact
  */
 public class UserContact extends BookContact implements Contact {