X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Fjjobs%2Fbeans%2Fcontact%2FJobsAdminContactWebRequestBean.java;h=ea6ad9664b990d3593b53259cfb0edd2c33814a4;hb=a231e9a11ec7bde003846d8143033229aca2e6a4;hp=683b06dcdc7bded354eafdb813538002bceb3039;hpb=cee84cd0360fa3c82382d440902232f723b7d205;p=jjobs-war.git

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
index 683b06dc..ea6ad966 100644
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
@@ -41,6 +41,7 @@ import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jjobs.beans.BaseJobsController;
+import org.mxchange.jjobs.beans.helper.JobsWebRequestController;
 import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber;
 import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
@@ -49,7 +50,6 @@ import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jjobs.beans.helper.JobsWebRequestController;
 
 /**
  * An administrative user bean (controller)
@@ -214,6 +214,11 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
 	 */
 	private String street;
 
+	/**
+	 * Title
+	 */
+	private String title;
+
 	/**
 	 * An event fired when the administrator has updated contact data
 	 */
@@ -310,6 +315,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
 
 		// Set all fields: contact
 		this.setContactId(contact.getContactId());
+		this.setTitle(contact.getContactTitle());
 		this.setBirthday(contact.getContactBirthday());
 		this.setCity(contact.getContactCity());
 		this.setComment(contact.getContactComment());
@@ -319,25 +325,32 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
 		this.setFirstName(contact.getContactFirstName());
 		this.setGender(contact.getContactGender());
 		this.setHouseNumber(contact.getContactHouseNumber());
+		this.setHouseNumberExtension(contact.getContactHouseNumberExtension());
 		this.setStreet(contact.getContactStreet());
 		this.setZipCode(contact.getContactZipCode());
 
 		// ... cellphone data
-		this.setCellphoneId(contact.getContactCellphoneNumber().getPhoneId());
-		this.setCellphoneCarrier(contact.getContactCellphoneNumber().getCellphoneProvider());
-		this.setCellphoneNumber(contact.getContactCellphoneNumber().getPhoneNumber());
+		if (contact.getContactCellphoneNumber() instanceof DialableCellphoneNumber) {
+			this.setCellphoneId(contact.getContactCellphoneNumber().getPhoneId());
+			this.setCellphoneCarrier(contact.getContactCellphoneNumber().getCellphoneProvider());
+			this.setCellphoneNumber(contact.getContactCellphoneNumber().getPhoneNumber());
+		}
 
 		// ... fax data
-		this.setFaxId(contact.getContactFaxNumber().getPhoneId());
-		this.setFaxAreaCode(contact.getContactFaxNumber().getPhoneAreaCode());
-		this.setFaxCountry(contact.getContactFaxNumber().getPhoneCountry());
-		this.setFaxNumber(contact.getContactFaxNumber().getPhoneNumber());
+		if (contact.getContactFaxNumber() instanceof DialableFaxNumber) {
+			this.setFaxId(contact.getContactFaxNumber().getPhoneId());
+			this.setFaxAreaCode(contact.getContactFaxNumber().getPhoneAreaCode());
+			this.setFaxCountry(contact.getContactFaxNumber().getPhoneCountry());
+			this.setFaxNumber(contact.getContactFaxNumber().getPhoneNumber());
+		}
 
 		// .. land-line data
-		this.setLandLineId(contact.getContactLandLineNumber().getPhoneId());
-		this.setPhoneAreaCode(contact.getContactLandLineNumber().getPhoneAreaCode());
-		this.setPhoneCountry(contact.getContactLandLineNumber().getPhoneCountry());
-		this.setPhoneNumber(contact.getContactLandLineNumber().getPhoneNumber());
+		if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) {
+			this.setLandLineId(contact.getContactLandLineNumber().getPhoneId());
+			this.setPhoneAreaCode(contact.getContactLandLineNumber().getPhoneAreaCode());
+			this.setPhoneCountry(contact.getContactLandLineNumber().getPhoneCountry());
+			this.setPhoneNumber(contact.getContactLandLineNumber().getPhoneNumber());
+		}
 	}
 
 	@Override
@@ -673,6 +686,16 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
 		this.street = street;
 	}
 
+	@Override
+	public String getTitle () {
+		return this.title;
+	}
+
+	@Override
+	public void setTitle (final String title) {
+		this.title = title;
+	}
+
 	@Override
 	public Integer getZipCode () {
 		return this.zipCode;
@@ -696,11 +719,13 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
 	private void clear () {
 		// Clear all data
 		// - personal data
-		this.setGender(Gender.UNKNOWN);
+		this.setGender(null);
+		this.setTitle(null);
 		this.setFirstName(null);
 		this.setFamilyName(null);
 		this.setStreet(null);
 		this.setHouseNumber(null);
+		this.setHouseNumberExtension(null);
 		this.setZipCode(null);
 		this.setCity(null);
 		this.setCountry(null);
@@ -772,6 +797,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
 
 		// Update all fields
 		contact.setContactGender(this.getGender());
+		contact.setContactTitle(this.getTitle());
 		contact.setContactFirstName(this.getFirstName());
 		contact.setContactFamilyName(this.getFamilyName());
 		contact.setContactStreet(this.getStreet());