From ca5adcd5809401d49642817f13de500d6db6c226 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 17 Aug 2016 17:10:05 +0200 Subject: [PATCH] Please cherry-pick: - also phoneAreaCode needs to be copied - ... and it is Integer, not Long --- .../mxchange/jjobs/beans/helper/JobsWebRequestHelper.java | 2 ++ .../jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java | 6 +++--- .../beans/phone/JobsAdminPhoneWebRequestController.java | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java index 32393096..cc6bb8f9 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java @@ -149,6 +149,7 @@ public class JobsWebRequestHelper implements JobsWebRequestController { } // Copy all (changeable) data fields to admin controller + this.adminPhoneController.setPhoneAreaCode(this.getFaxNumber().getPhoneAreaCode()); this.adminPhoneController.setPhoneCountry(this.getFaxNumber().getPhoneCountry()); this.adminPhoneController.setPhoneNumber(this.getFaxNumber().getPhoneNumber()); } @@ -189,6 +190,7 @@ public class JobsWebRequestHelper implements JobsWebRequestController { } // Copy all (changeable) data fields to admin controller + this.adminPhoneController.setPhoneAreaCode(this.getLandLineNumber().getPhoneAreaCode()); this.adminPhoneController.setPhoneCountry(this.getLandLineNumber().getPhoneCountry()); this.adminPhoneController.setPhoneNumber(this.getLandLineNumber().getPhoneNumber()); } diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index cb625680..e1de16d8 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -114,7 +114,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements /** * Area code (city dial prefix) */ - private Long phoneAreaCode; + private Integer phoneAreaCode; /** * Generic hone controller @@ -362,12 +362,12 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements } @Override - public Long getPhoneAreaCode () { + public Integer getPhoneAreaCode () { return this.phoneAreaCode; } @Override - public void setPhoneAreaCode (final Long phoneAreaCode) { + public void setPhoneAreaCode (final Integer phoneAreaCode) { this.phoneAreaCode = phoneAreaCode; } diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java index 45522ccc..5c6d95f0 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java @@ -144,14 +144,14 @@ public interface JobsAdminPhoneWebRequestController extends Serializable { *

* @return Phone area code */ - Long getPhoneAreaCode (); + Integer getPhoneAreaCode (); /** * Setter for phone area code *

* @param phoneAreaCode Phone area code */ - void setPhoneAreaCode (final Long phoneAreaCode); + void setPhoneAreaCode (final Integer phoneAreaCode); /** * Getter for phone country (for dial prefix) -- 2.39.5