From: Roland Haeder Date: Fri, 4 Sep 2015 19:51:46 +0000 (+0200) Subject: updated jcore X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f05826bd6d3d93169e95244e6aa70baadad27052;p=jaddressbook-share-lib.git updated jcore Signed-off-by:Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index 7a77632..f9fd3c4 100644 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 79fd0a2..9147fd9 100644 --- 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 61ff2f7..0df415e 100644 --- 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 7c85fc4..bd0f448 100644 --- 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 b66b07c..db75caf 100644 --- 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 fa6ac12..3eda782 100644 --- 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 24bc39f..072ff62 100644 --- 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 71977e3..21b3671 100644 --- 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 0ee136f..c34066f 100644 --- 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 7b47c0e..ef51cb4 100644 --- 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 {