From 86a851b2c7cb648be1efbed741377c6d6dd4ad92 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 24 Sep 2015 15:34:10 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20got=20rid=20of=20old=20classes?= =?utf8?q?=20(need=20to=20redefine=20them)=20-=20updated=20jars=20Signed-o?= =?utf8?q?ff-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore.jar | Bin 31729 -> 32092 bytes lib/jswingcore.jar | Bin 7777 -> 7777 bytes .../client/console/ConsoleClient.java | 8 +-- .../model/contact/book/BookContact.java | 40 ----------- .../model/contact/user/UserContact.java | 67 ------------------ 5 files changed, 4 insertions(+), 111 deletions(-) delete mode 100644 src/org/mxchange/addressbook/model/contact/book/BookContact.java delete mode 100644 src/org/mxchange/addressbook/model/contact/user/UserContact.java diff --git a/lib/jcore.jar b/lib/jcore.jar index 57dc0a07e9ad739e6f82121851bb5ecdf7291de2..c0bdbee1e02a1d6bf6ef6af3c07a3bd7c43e06fe 100644 GIT binary patch delta 8715 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 delta 8587 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 E2VHT`9smFU diff --git a/lib/jswingcore.jar b/lib/jswingcore.jar index 15d1d735f377162535071a9b3efb699955973796..0525b1a54b917c45cab696b4bdabf3e6df491a9e 100644 GIT binary patch delta 210 zcmaE8^U#JTz?+$ci-CcIf#F8dL>^71>q!&Mr!xWB7ZgC`CruzZS(ecRLWkW&K H3)xBl4GB(A delta 210 zcmaE8^U#JTz?+$ci-CcIfx#zcB9A7Mcg#fd=}bWO1qBfKNfSs;mSr>nQNfJXAZh}m zJ&3x. - */ -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); - } -} -- 2.39.5