From: Roland Haeder <roland@mxchange.org>
Date: Thu, 20 Aug 2015 11:54:05 +0000 (+0200)
Subject: Renamed surname to first name + updated jcore.jar
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a19a8423c8b18466652dbb1e66aadbdfda2ed333;p=addressbook-swing.git

Renamed surname to first name + updated jcore.jar
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 7ad4d6d..f4f6a20 100644
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
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.