From a19a8423c8b18466652dbb1e66aadbdfda2ed333 Mon Sep 17 00:00:00 2001 From: Roland Haeder <roland@mxchange.org> Date: Thu, 20 Aug 2015 13:54:05 +0200 Subject: [PATCH] =?utf8?q?Renamed=20surname=20to=20first=20name=20+=20upda?= =?utf8?q?ted=20jcore.jar=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mx?= =?utf8?q?change.org>?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore.jar | Bin 108307 -> 113277 bytes .../client/console/ConsoleClient.java | 10 +++++----- .../addressbook/contact/user/UserContact.java | 8 ++++---- .../ContactAlreadyAddedException.java | 2 +- .../contact/AddressbookContactManager.java | 4 ++-- .../contact/ManageableAddressbookContact.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/jcore.jar b/lib/jcore.jar index 7ad4d6ddbbeb94968781b5f967b48c9c6a0cd651..f4f6a200f1248dbeab9edb32638ff954da5ab5a7 100644 GIT binary patch delta 15816 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 G^#1_3*zJ4( delta 13652 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 diff --git a/src/org/mxchange/addressbook/client/console/ConsoleClient.java b/src/org/mxchange/addressbook/client/console/ConsoleClient.java index 6ed15fb..a9c81cb 100644 --- a/src/org/mxchange/addressbook/client/console/ConsoleClient.java +++ b/src/org/mxchange/addressbook/client/console/ConsoleClient.java @@ -119,10 +119,10 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC if ((companyName == null) || (companyName.isEmpty())) { // Now put all together: gender, surname, family name // @todo Use mask - this.outputMessage(MessageFormat.format("Anrede, Vorname, Name: {0} {1} {2}", gender, contact.getSurname(), contact.getFamilyName())); + this.outputMessage(MessageFormat.format("Anrede, Vorname, Name: {0} {1} {2}", gender, contact.getFirstName(), contact.getFamilyName())); } else { // Company contact - this.outputMessage(MessageFormat.format("Firma: {0}\nAnsprechpartner: {1} {2} {3}", companyName, gender, contact.getSurname(), contact.getFamilyName())); + this.outputMessage(MessageFormat.format("Firma: {0}\nAnsprechpartner: {1} {2} {3}", companyName, gender, contact.getFirstName(), contact.getFamilyName())); } // Trace message @@ -218,7 +218,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC Gender gender = manager.enterOwnGender(); // Surname - String surname = manager.enterOwnSurname(); + String firstName = manager.enterOwnFirstName(); // Family name String familyName = manager.enterOwnFamilyName(); @@ -228,7 +228,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC // Update contact instance contact.setGender(gender); - contact.setSurname(surname); + contact.setFirstName(firstName); contact.setFamilyName(familyName); contact.setCompanyName(companyName); @@ -294,7 +294,7 @@ public class ConsoleClient extends BaseAddressbookClient implements AddressbookC Gender gender = manager.enterOwnGender(); // 2nd for surname - String surname = manager.enterOwnSurname(); + String surname = manager.enterOwnFirstName(); // And 3rd for family name String familyName = manager.enterOwnFamilyName(); diff --git a/src/org/mxchange/addressbook/contact/user/UserContact.java b/src/org/mxchange/addressbook/contact/user/UserContact.java index 1ca7f89..0b7af77 100644 --- a/src/org/mxchange/addressbook/contact/user/UserContact.java +++ b/src/org/mxchange/addressbook/contact/user/UserContact.java @@ -33,21 +33,21 @@ public class UserContact extends BookContact implements Contact { * Creates own contact entry * * @param gender Gender to be set - * @param surname Surname 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 surname, final String familyName, final String companyName) { + 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},surname={1},familyName={2},companyName={3} - CALLED!", gender, surname, familyName, companyName)); //NOI18N + 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.setSurname(surname); + this.setFirstName(firstName); this.setFamilyName(familyName); this.setCompanyName(companyName); diff --git a/src/org/mxchange/addressbook/exceptions/ContactAlreadyAddedException.java b/src/org/mxchange/addressbook/exceptions/ContactAlreadyAddedException.java index 634f4b4..fa6ac12 100644 --- a/src/org/mxchange/addressbook/exceptions/ContactAlreadyAddedException.java +++ b/src/org/mxchange/addressbook/exceptions/ContactAlreadyAddedException.java @@ -32,7 +32,7 @@ public class ContactAlreadyAddedException extends Exception { * @param contact Contact that is already added */ public ContactAlreadyAddedException (final Contact contact) { - super(MessageFormat.format("Contact with gender={0}, surname={1} and familyName={2} already added.", contact.getGender(), contact.getSurname(), contact.getFamilyName())); + super(MessageFormat.format("Contact with gender={0}, firstName={1} and familyName={2} already added.", contact.getGender(), contact.getFirstName(), contact.getFamilyName())); } /** diff --git a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java index ef41687..3def29d 100644 --- a/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java +++ b/src/org/mxchange/addressbook/manager/contact/AddressbookContactManager.java @@ -531,7 +531,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable * @return Surname of the user */ @Override - public String enterOwnSurname () { + public String enterOwnFirstName () { // Trace message this.getLogger().trace("CALLED!"); //NOI18N @@ -685,7 +685,7 @@ public class AddressbookContactManager extends BaseManager implements Manageable } // Debug message - /* NOISY-DEBUG: */ this.getLogger().debug(MessageFormat.format("Adding '{0}' '{1}' at pos '{2}' ...", contact.getSurname(), contact.getFamilyName(), this.size())); //NOI18N + /* NOISY-DEBUG: */ this.getLogger().debug(MessageFormat.format("Adding '{0}' '{1}' at pos '{2}' ...", contact.getFirstName(), contact.getFamilyName(), this.size())); //NOI18N try { // Check if contact is found if (this.getContactDatabase().isContactFound(contact)) { diff --git a/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java b/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java index 77d39d3..be13daa 100644 --- a/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java +++ b/src/org/mxchange/addressbook/manager/contact/ManageableAddressbookContact.java @@ -110,7 +110,7 @@ public interface ManageableAddressbookContact extends ManageableDatabase { * * @return Surname */ - public String enterOwnSurname (); + public String enterOwnFirstName (); /** * Allows the user to enter own ZIP code. -- 2.39.5