From 8fc2656abec12fa579346820f0c0b03e8fd1063a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 8 Jun 2017 22:43:10 +0200 Subject: [PATCH] Continued a bit: - fixed copyright (no email address) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../addressbook/client/console/ConsoleClient.java | 4 ++-- .../addressbook/client/gui/AddressbookFrame.java | 2 +- .../facade/contact/AddressbookContactFacade.java | 10 +++++----- .../addressbook/facade/contact/ContactFacade.java | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java index 19d9c74..935a347 100644 --- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -34,7 +34,7 @@ import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcontacts.contact.gender.GenderUtils; -import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; +import org.mxchange.jcontactsbusiness.exceptions.BusinessContactAlreadyAddedException; import org.mxchange.jcore.application.Application; import org.mxchange.jcore.exceptions.MenuInitializationException; import org.mxchange.jcore.exceptions.UnhandledUserChoiceException; @@ -317,7 +317,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC try { // Enter/add own data manager.doEnterOwnData(); - } catch (final ContactAlreadyAddedException ex) { + } catch (final BusinessContactAlreadyAddedException ex) { // Already added this.outputMessage("Sie haben bereits Ihre eigenen Daten eingegeben."); } diff --git a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java index ec47bf2..975c032 100644 --- a/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -709,7 +709,7 @@ public class AddressbookFrame extends BaseAddressbookSystem implements ClientFra ((ContactFacade) self.getClient().getFacade()).doEnterOwnData(); } catch (final ContactAlreadyAddedException ex) { // Already added, log away - // TODO maybe output message here? + // @TODO maybe output message here? self.logException(ex); } } diff --git a/src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java b/src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java index ffb36ca..01f8be0 100644 --- a/src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java +++ b/src/org/mxchange/addressbook/facade/contact/AddressbookContactFacade.java @@ -26,7 +26,7 @@ import java.util.List; import org.mxchange.addressbook.client.AddressbookClient; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.gender.Gender; -import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; +import org.mxchange.jcontactsbusiness.exceptions.BusinessContactAlreadyAddedException; import org.mxchange.jcore.client.Client; import org.mxchange.jcore.exceptions.UnhandledUserChoiceException; import org.mxchange.jcore.facade.BaseFacade; @@ -94,7 +94,7 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad } @Override - public void addContact (final Contact contact) throws ContactAlreadyAddedException { + public void addContact (final Contact contact) throws BusinessContactAlreadyAddedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("contact={0} - CALLED!", contact)); //NOI18N @@ -261,14 +261,14 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad } @Override - public void doEnterOwnData () throws ContactAlreadyAddedException { + public void doEnterOwnData () throws BusinessContactAlreadyAddedException { // Trace message this.getLoggerBeanLocal().logTrace("CALLED!"); //NOI18N // Is own contact already added? if (this.isOwnContactAdded()) { // Don't continue here - throw new ContactAlreadyAddedException(); + throw new BusinessContactAlreadyAddedException(); } // Get and cast client instance @@ -533,7 +533,7 @@ public class AddressbookContactFacade extends BaseFacade implements ContactFacad // Add contact to internal list this.addContact(contact); - } catch (final ContactAlreadyAddedException ex) { + } catch (final BusinessContactAlreadyAddedException ex) { // Abort here this.abortProgramWithException(ex); } diff --git a/src/org/mxchange/addressbook/facade/contact/ContactFacade.java b/src/org/mxchange/addressbook/facade/contact/ContactFacade.java index bba8162..290ebfc 100644 --- a/src/org/mxchange/addressbook/facade/contact/ContactFacade.java +++ b/src/org/mxchange/addressbook/facade/contact/ContactFacade.java @@ -19,7 +19,7 @@ package org.mxchange.addressbook.facade.contact; import java.io.IOException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.gender.Gender; -import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; +import org.mxchange.jcontactsbusiness.exceptions.BusinessContactAlreadyAddedException; import org.mxchange.jcore.facade.Facade; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; @@ -38,10 +38,10 @@ public interface ContactFacade extends Facade { *

* @param contact Contact instance to add *

- * @throws org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException If + * @throws org.mxchange.jcontactsbusiness.exceptions.BusinessContactAlreadyAddedException If * the contact is already added */ - void addContact (final Contact contact) throws ContactAlreadyAddedException; + void addContact (final Contact contact) throws BusinessContactAlreadyAddedException; /** * Let the user add a new other address @@ -90,10 +90,10 @@ public interface ContactFacade extends Facade { /** * Asks user for own data *

- * @throws org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException If + * @throws org.mxchange.jcontactsbusiness.exceptions.BusinessContactAlreadyAddedException If * own contact is already added */ - void doEnterOwnData () throws ContactAlreadyAddedException; + void doEnterOwnData () throws BusinessContactAlreadyAddedException; /** * List all contacts -- 2.39.5