X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Forg%2Fmxchange%2Fjcore%2Fcontact%2FBaseContact.java;h=a26027a24b672bbcb224c666ba8b7c109c23ac9b;hb=1cdd3f874cc93f3ea767c52efd5a1a47bee5fd64;hp=71a7d30021e3531f0526a87fd5661fc1643d6fc6;hpb=6ad4f22216705fa8a91ad3389ede7e0ce074fad4;p=jcore.git diff --git a/src/org/mxchange/jcore/contact/BaseContact.java b/src/org/mxchange/jcore/contact/BaseContact.java index 71a7d30..a26027a 100644 --- a/src/org/mxchange/jcore/contact/BaseContact.java +++ b/src/org/mxchange/jcore/contact/BaseContact.java @@ -78,6 +78,11 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { */ private String faxNumber; + /** + * First name + */ + private String firstName; + /** * Gender instance */ @@ -103,11 +108,6 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { */ private String street; - /** - * Surname - */ - private String surname; - /** * ZIP code */ @@ -143,7 +143,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { // Now test some data @todo Definedly needs improvement return ((this.getGender().equals(contact.getGender())) - && (this.getSurname().toLowerCase().equals(contact.getSurname().toLowerCase())) + && (this.getFirstName().toLowerCase().equals(contact.getFirstName().toLowerCase())) && (this.getFamilyName().toLowerCase().equals(contact.getFamilyName().toLowerCase()))); } @@ -305,7 +305,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { */ @Override public final void setFamilyName (final String familyName) { - /* NOISY-DEBUG: */ this.getLogger().trace(MessageFormat.format("familyName={0} - CALLED!", familyName)); + /* NOISY-DEBUG: */ this.getLogger().trace(MessageFormat.format("familyName={0} - CALLED!", familyName)); //NOI18N this.familyName = familyName; } @@ -329,6 +329,26 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { this.faxNumber = faxNumber; } + /** + * First name + * + * @return the firstName + */ + @Override + public final String getFirstName () { + return this.firstName; + } + + /** + * First name + * + * @param firstName the firstName to set + */ + @Override + public final void setFirstName (final String firstName) { + this.firstName = firstName; + } + /** * Gender of the contact * @@ -409,26 +429,6 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { this.street = street; } - /** - * Surname - * - * @return the surname - */ - @Override - public final String getSurname () { - return this.surname; - } - - /** - * Surname - * - * @param surname the surname to set - */ - @Override - public final void setSurname (final String surname) { - this.surname = surname; - } - /** * Some "getter" for a translated/human-readable gender * @@ -453,34 +453,34 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { @Override public Object getValueFromColumn (final String columnName) throws IllegalArgumentException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { // Trace message - this.getLogger().trace(MessageFormat.format("columnName={0} - CALLED!", columnName)); + this.getLogger().trace(MessageFormat.format("columnName={0} - CALLED!", columnName)); //NOI18N // A '$' means not our field - if (columnName.startsWith("$")) { + if (columnName.startsWith("$")) { //NOI18N // Don't handle these - throw new IllegalArgumentException("columnsName contains $"); + throw new IllegalArgumentException("columnsName contains $"); //NOI18N } // Determine if the given column is boolean - if (this.isBooleanField(this, "BaseContact", columnName)) { + if (this.isBooleanField(this, "BaseContact", columnName)) { //NOI18N // Debug message - this.getLogger().debug("Column " + columnName + " represents a boolean field."); + this.getLogger().debug(MessageFormat.format("Column {0} represents a boolean field.", columnName)); //NOI18N // Yes, then call other method - return this.getBooleanField(this, "BaseContact", this.convertColumnNameToGetterMethod(columnName, true)); + return this.getBooleanField(this, "BaseContact", this.convertColumnNameToGetterMethod(columnName, true)); //NOI18N } // Convert column name to field name String methodName = this.convertColumnNameToGetterMethod(columnName, false); // Debug message - this.getLogger().debug(MessageFormat.format("field={0}", methodName)); + this.getLogger().debug(MessageFormat.format("field={0}", methodName)); //NOI18N // Get field - Object value = this.getField(this, "BaseContact", methodName); + Object value = this.getField(this, "BaseContact", methodName); //NOI18N // Trace message - this.getLogger().trace("value=" + value + " - EXIT!"); + this.getLogger().trace(MessageFormat.format("value={0} - EXIT!", value)); //NOI18N // Return it return value; @@ -509,25 +509,15 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { @Override public int hashCode () { // Validate gender instance - assert (this.getGender() instanceof Gender) : "gender is not set."; + assert (this.getGender() instanceof Gender) : "gender is not set."; //NOI18N int hash = 7; hash = 79 * hash + Objects.hashCode(this.getFamilyName()); hash = 79 * hash + this.getGender().hashCode(); - hash = 79 * hash + Objects.hashCode(this.getSurname()); + hash = 79 * hash + Objects.hashCode(this.getFirstName()); return hash; } - /** - * Checks whether the contact is user's own data - * - * @return Own data? - */ - @Override - public final boolean isOwnContact () { - return this.ownContact; - } - /** * Checks if given boolean field is available and set to same value * @@ -538,37 +528,59 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { @Override public boolean isFieldValueEqual (final String columnName, final boolean bool) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { // Trace message - this.getLogger().trace(MessageFormat.format("columnName={0},bool={1} - CALLED!", columnName, bool)); + this.getLogger().trace(MessageFormat.format("columnName={0},bool={1} - CALLED!", columnName, bool)); //NOI18N // Convert column name to field name String methodName = this.convertColumnNameToGetterMethod(columnName, true); // Debug message - this.getLogger().debug(MessageFormat.format("field={0}", methodName)); + this.getLogger().debug(MessageFormat.format("field={0}", methodName)); //NOI18N // Init class instance - boolean value = this.getBooleanField(this, "BaseContact", methodName); + boolean value = this.getBooleanField(this, "BaseContact", methodName); //NOI18N // Debug message - this.getLogger().debug(MessageFormat.format("value={0}", value)); + this.getLogger().debug(MessageFormat.format("value={0}", value)); //NOI18N // Compare it boolean isFound = (bool == value); // Trace message - this.getLogger().trace(MessageFormat.format("isFound={0} - EXIT!", isFound)); + this.getLogger().trace(MessageFormat.format("isFound={0} - EXIT!", isFound)); //NOI18N // Return result return isFound; } + /** + * Checks whether the contact is user's own data + * + * @return Own data? + */ + @Override + public final boolean isOwnContact () { + return this.ownContact; + } + /** * Returns an iterator of all values from this object * @return An iterator */ @Override public Iterator> iterator () throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { - return this.fieldIterator(this, "BaseContact"); + return this.fieldIterator(this, "BaseContact"); //NOI18N + } + + @Override + public void setValueFromColumn (final String columnName, final Object value) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { + // Trace message + this.getLogger().trace(MessageFormat.format("columnName={0},value={1} - CALLED!", columnName, value)); //NOI18N + + // Call super method + this.setValueInStoreableFromColumn(this, "BaseContact", columnName, value); //NOI18N + + // Trace message + this.getLogger().trace("EXIT!"); //NOI18N } /** @@ -584,7 +596,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { // The client must be set if (client == null) { // Not set - throw new NullPointerException("client is null"); + throw new NullPointerException("client is null"); //NOI18N } // Display name "box" @@ -604,16 +616,4 @@ public class BaseContact extends BaseFrameworkSystem implements Contact { protected final void enableFlagOwnContact () { this.ownContact = true; } - - @Override - public void setValueFromColumn (final String columnName, final Object value) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { - // Trace message - this.getLogger().trace(MessageFormat.format("columnName={0},value={1} - CALLED!", columnName, value)); - - // Call super method - this.setValueInStoreableFromColumn(this, "BaseContact", columnName, value); - - // Trace message - this.getLogger().trace("EXIT!"); - } }