From 9ab8c48b376fba3cdc0b848c2fee760d727315ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 16 Aug 2016 11:41:10 +0200 Subject: [PATCH] Renamed more: (please cherry-pick) - renamed mobileId -> mobileNumberId - renamed faxId -> faxNumberId --- .../JobsAdminContactWebRequestBean.java | 54 +++++++++---------- .../JobsAdminContactWebRequestController.java | 16 +++--- .../JobsAdminContactPhoneWebRequestBean.java | 2 +- .../cellphone/JobsMobileConverter.java | 4 +- .../admin/cellphone/admin_cellphone_data.tpl | 6 +-- .../cellphone/admin_form_cellphone_data.tpl | 4 +- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index 8b8cd79a..83e517dc 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -90,11 +90,6 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement */ private Date birthday; - /** - * Mobile id number - */ - private Long mobileId; - /** * City */ @@ -154,14 +149,14 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement private Country faxCountry; /** - * Fax id number + * Fax number */ - private Long faxId; + private Long faxNumber; /** - * Fax number + * Fax id number */ - private Long faxNumber; + private Long faxNumberId; /** * First name @@ -208,6 +203,11 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement */ private Long mobileNumber; + /** + * Mobile id number + */ + private Long mobileNumberId; + /** * Mobile provider */ @@ -374,14 +374,14 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement // ... mobile data if (contact.getContactMobileNumber() instanceof DialableMobileNumber) { - this.setMobileId(contact.getContactMobileNumber().getPhoneId()); + this.setMobileNumberId(contact.getContactMobileNumber().getPhoneId()); this.setMobileProvider(contact.getContactMobileNumber().getMobileProvider()); this.setMobileNumber(contact.getContactMobileNumber().getPhoneNumber()); } // ... fax data if (contact.getContactFaxNumber() instanceof DialableFaxNumber) { - this.setFaxId(contact.getContactFaxNumber().getPhoneId()); + this.setFaxNumberId(contact.getContactFaxNumber().getPhoneId()); this.setFaxAreaCode(contact.getContactFaxNumber().getPhoneAreaCode()); this.setFaxCountry(contact.getContactFaxNumber().getPhoneCountry()); this.setFaxNumber(contact.getContactFaxNumber().getPhoneNumber()); @@ -609,23 +609,23 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement } @Override - public Long getFaxId () { - return this.faxId; + public Long getFaxNumber () { + return this.faxNumber; } @Override - public void setFaxId (final Long faxId) { - this.faxId = faxId; + public void setFaxNumber (final Long faxNumber) { + this.faxNumber = faxNumber; } @Override - public Long getFaxNumber () { - return this.faxNumber; + public Long getFaxNumberId () { + return this.faxNumberId; } @Override - public void setFaxNumber (final Long faxNumber) { - this.faxNumber = faxNumber; + public void setFaxNumberId (final Long faxNumberId) { + this.faxNumberId = faxNumberId; } @Override @@ -679,23 +679,23 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement } @Override - public Long getMobileId () { - return this.mobileId; + public Long getMobileNumber () { + return this.mobileNumber; } @Override - public void setMobileId (final Long mobileId) { - this.mobileId = mobileId; + public void setMobileNumber (Long mobileNumber) { + this.mobileNumber = mobileNumber; } @Override - public Long getMobileNumber () { - return this.mobileNumber; + public Long getMobileNumberId () { + return this.mobileNumberId; } @Override - public void setMobileNumber (Long mobileNumber) { - this.mobileNumber = mobileNumber; + public void setMobileNumberId (final Long mobileNumberId) { + this.mobileNumberId = mobileNumberId; } @Override diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java index 8e154ec4..127f1218 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java @@ -83,28 +83,28 @@ public interface JobsAdminContactWebRequestController extends Serializable { *

* @return Mobile id */ - Long getMobileId (); + Long getMobileNumberId (); /** - * Setter for mobile id + * Setter for mobile number id *

- * @param mobileId Mobile id + * @param mobileNumberId Mobile number id */ - void setMobileId (final Long mobileId); + void setMobileNumberId (final Long mobileNumberId); /** * Getter for fax id *

* @return Fax id */ - Long getFaxId (); + Long getFaxNumberId (); /** - * Setter for fax id + * Setter for fax number id *

- * @param faxId Fax id + * @param faxNumberId Fax number id */ - void setFaxId (final Long faxId); + void setFaxNumberId (final Long faxNumberId); /** * Getter for land-line id diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java index d36f4093..77c20420 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java @@ -196,7 +196,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl updatedContact = this.adminPhoneBean.unlinkMobileDataFromContact(this.beanHelper.getContact(), this.beanHelper.getMobileNumber()); } catch (final MobileNumberNotLinkedException ex) { // Did not work - this.showFacesMessage("form_unlink_contact_mobile:mobileId", ex); //NOI18N + this.showFacesMessage("form_unlink_contact_mobile:mobileNumberId", ex); //NOI18N return ""; //NOI18N } diff --git a/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java b/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java index abc5831d..74bd6a2e 100644 --- a/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java +++ b/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java @@ -90,10 +90,10 @@ public class JobsMobileConverter implements Converter { try { // Try to parse the value as long - Long mobileId = Long.valueOf(submittedValue); + Long mobileNumberId = Long.valueOf(submittedValue); // Try to get mobile instance from it - mobileNumber = this.phoneBean.findMobileNumberById(mobileId); + mobileNumber = this.phoneBean.findMobileNumberById(mobileNumberId); } catch (final NumberFormatException ex) { // Throw again throw new ConverterException(ex); diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl index 96ccac25..3735c905 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl @@ -14,11 +14,11 @@ - + - + - + diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl index 9a46cc1e..59e5b24f 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl @@ -15,11 +15,11 @@

- +
- +
-- 2.39.5