From: Roland Haeder Date: Thu, 24 Sep 2015 13:34:10 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=86a851b2c7cb648be1efbed741377c6d6dd4ad92;p=addressbook-swing.git Continued: - got rid of old classes (need to redefine them) - updated jars Signed-off-by:Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index 57dc0a0..c0bdbee 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jswingcore.jar b/lib/jswingcore.jar index 15d1d73..0525b1a 100644 Binary files a/lib/jswingcore.jar and b/lib/jswingcore.jar differ diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java index 715a93a..18340b7 100644 --- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -32,10 +32,10 @@ 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.exceptions.UnhandledUserChoiceException; import org.mxchange.jcore.model.contact.Contact; +import org.mxchange.jcore.model.contact.UserContact; import org.mxchange.jcore.model.contact.gender.Gender; import org.mxchange.jcore.model.contact.gender.GenderUtils; @@ -278,8 +278,8 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC // First ask for gender Gender gender = manager.enterOwnGender(); - // 2nd for surname - String surname = manager.enterOwnFirstName(); + // 2nd for first name + String firstName = manager.enterOwnFirstName(); // And 3rd for family name String familyName = manager.enterOwnFamilyName(); @@ -288,7 +288,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC String companyName = manager.enterOwnCompanyName(); // Construct UserContact instance - Contact contact = new UserContact(gender, surname, familyName, companyName); + Contact contact = new UserContact(gender, firstName, familyName, companyName); // Trace message this.getLogger().trace(MessageFormat.format("contact={0} - EXIT!", contact)); //NOI18N diff --git a/src/org/mxchange/addressbook/model/contact/book/BookContact.java b/src/org/mxchange/addressbook/model/contact/book/BookContact.java deleted file mode 100644 index 65ef941..0000000 --- a/src/org/mxchange/addressbook/model/contact/book/BookContact.java +++ /dev/null @@ -1,40 +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.model.contact.book; - -import org.mxchange.jcore.model.contact.BaseContact; -import org.mxchange.jcore.model.contact.Contact; - -/** - * A contact that can be placed into "contact books" - * - * @author Roland Haeder - * @version 0.0 - */ -public class BookContact extends BaseContact implements Contact { - /** - * Serial number - */ - private static final long serialVersionUID = 27_834_738_781L; - - /** - * Default constructor, may only be used from database backend - */ - public BookContact () { - } - -} diff --git a/src/org/mxchange/addressbook/model/contact/user/UserContact.java b/src/org/mxchange/addressbook/model/contact/user/UserContact.java deleted file mode 100644 index 3ac444e..0000000 --- a/src/org/mxchange/addressbook/model/contact/user/UserContact.java +++ /dev/null @@ -1,67 +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.model.contact.user; - -import java.text.MessageFormat; -import org.mxchange.addressbook.model.contact.book.BookContact; -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 - */ -public class UserContact extends BookContact implements Contact { - /** - * Serial number - */ - private static final long serialVersionUID = 36_725_784_819_501L; - - /** - * Creates own contact entry - * - * @param gender Gender to be set - * @param firstName First name to be set - * @param familyName Family name to be set - * @param companyName Company name - * TODO Add validation of data - */ - public UserContact (final Gender gender, final String firstName, final String familyName, final String companyName) { - // Make sure all constructors are called - this(); - - // Trace message - this.getLogger().trace(MessageFormat.format("gender={0},firstName={1},familyName={2},companyName={3} - CALLED!", gender, firstName, familyName, companyName)); //NOI18N - - // Update all data - this.setGender(gender); - this.setFirstName(firstName); - this.setFamilyName(familyName); - this.setCompanyName(companyName); - - // Trace message - this.getLogger().trace("EXIT!"); //NOI18N - } - - /** - * Default constructor, may only be used from database backend - */ - public UserContact () { - this.setOwnContact(Boolean.TRUE); - } -}