X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Forg%2Fmxchange%2Fjcore%2Fcontact%2FBaseContact.java;h=71a7d30021e3531f0526a87fd5661fc1643d6fc6;hb=10598f2ffeebd25b659f61e4e528f2ec9d25f41e;hp=9085faa92c51f39ed415da4788e99fd7669ea024;hpb=d4f6e8da5bd065f28515f68539782d2bab679827;p=jcore.git

diff --git a/src/org/mxchange/jcore/contact/BaseContact.java b/src/org/mxchange/jcore/contact/BaseContact.java
index 9085faa..71a7d30 100644
--- a/src/org/mxchange/jcore/contact/BaseContact.java
+++ b/src/org/mxchange/jcore/contact/BaseContact.java
@@ -16,14 +16,17 @@
  */
 package org.mxchange.jcore.contact;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.text.MessageFormat;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Objects;
 import org.mxchange.jcore.BaseFrameworkSystem;
 import org.mxchange.jcore.client.Client;
 
 /**
- * A general contact
+ * A general contact class which should only be extended.
  *
  * @author Roland Haeder
  * @version 0.0
@@ -83,7 +86,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	/**
 	 * House number
 	 */
-	private long houseNumber;
+	private Long houseNumber;
 
 	/**
 	 * Flag whether this contact is user's own data
@@ -108,10 +111,11 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	/**
 	 * ZIP code
 	 */
-	private long zipCode;
+	private Long zipCode;
 
 	/**
-	 * No instances can be created of this class
+	 * No instances should be created of this class. Better extend this class
+	 * and provide proper constructors.
 	 */
 	protected BaseContact () {
 	}
@@ -169,7 +173,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 * @return the cellphoneNumber
 	 */
 	@Override
-	public String getCellphoneNumber () {
+	public final String getCellphoneNumber () {
 		return this.cellphoneNumber;
 	}
 
@@ -263,41 +267,6 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 		this.countryCode = countryCode;
 	}
 
-	/**
-	 * "Serializes" this object into a CSV string (this time with semicolons)
-	 *
-	 * @return "CSV-serialized" version of the stored data
-	 * @deprecated Don't use this anymore
-	 */
-	@Deprecated
-	public String getCsvStringFromStoreableObject () {
-		// Trace message
-		this.getLogger().trace("CALLED!"); //NOI18N
-
-		// Get all together
-		String csvString = String.format(
-				"\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";\"%s\"", //NOI18N
-				this.isOwnContact(),
-				this.getGender().getDatabaseValue(),
-				this.getSurname(),
-				this.getFamilyName(),
-				this.getCompanyName(),
-				this.getStreet(),
-				this.getZipCode(),
-				this.getCity(),
-				this.getCountryCode(),
-				this.getPhoneNumber(),
-				this.getFaxNumber(),
-				this.getCellphoneNumber(),
-				this.getEmailAddress(),
-				this.getBirthday(),
-				this.getComment()
-		);
-
-		// Then return it
-		return csvString;
-	}
-
 	/**
 	 * Email address
 	 *
@@ -325,6 +294,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 */
 	@Override
 	public String getFamilyName () {
+		//* NOISY-DEBUG: */ this.getLogger().trace("CALLED!");
 		return this.familyName;
 	}
 
@@ -335,6 +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));
 		this.familyName = familyName;
 	}
 
@@ -384,7 +355,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 * @return the houseNumber
 	 */
 	@Override
-	public long getHouseNumber () {
+	public Long getHouseNumber () {
 		return this.houseNumber;
 	}
 
@@ -394,7 +365,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 * @param houseNumber the houseNumber to set
 	 */
 	@Override
-	public final void setHouseNumber (final long houseNumber) {
+	public final void setHouseNumber (final Long houseNumber) {
 		this.houseNumber = houseNumber;
 	}
 
@@ -480,14 +451,23 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 * @return Value from field
 	 */
 	@Override
-	public Object getValueFromColumn (final String columnName) {
+	public Object getValueFromColumn (final String columnName) throws IllegalArgumentException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 		// Trace message
 		this.getLogger().trace(MessageFormat.format("columnName={0} - CALLED!", columnName));
 
+		// A '$' means not our field
+		if (columnName.startsWith("$")) {
+			// Don't handle these
+			throw new IllegalArgumentException("columnsName contains $");
+		}
+
 		// Determine if the given column is boolean
 		if (this.isBooleanField(this, "BaseContact", columnName)) {
+			// Debug message
+			this.getLogger().debug("Column " + columnName + " represents a boolean field.");
+
 			// Yes, then call other method
-			return this.getBooleanField(this, "BaseContact", columnName);
+			return this.getBooleanField(this, "BaseContact", this.convertColumnNameToGetterMethod(columnName, true));
 		}
 
 		// Convert column name to field name
@@ -512,7 +492,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 * @return the zipCode
 	 */
 	@Override
-	public final long getZipCode () {
+	public final Long getZipCode () {
 		return this.zipCode;
 	}
 
@@ -522,7 +502,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 * @param zipCode the zipCode to set
 	 */
 	@Override
-	public final void setZipCode (final long zipCode) {
+	public final void setZipCode (final Long zipCode) {
 		this.zipCode = zipCode;
 	}
 
@@ -556,7 +536,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 * @return Whether all conditions are met
 	 */
 	@Override
-	public boolean isValueEqual (final String columnName, final boolean bool) {
+	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));
 
@@ -587,7 +567,7 @@ public class BaseContact extends BaseFrameworkSystem implements Contact {
 	 * @return An iterator
 	 */
 	@Override
-	public Iterator<Object> iterator () {
+	public Iterator<Map.Entry<Field, Object>> iterator () throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 		return this.fieldIterator(this, "BaseContact");
 	}
 
@@ -624,4 +604,16 @@ 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!");
+	}
 }