From ba6c905c02a09b0b1e608a48ccb46011fadeae05 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 17 Aug 2016 16:45:07 +0200 Subject: [PATCH] Please cherry-pick: - fixed wrong MobileConverter usage on fax/land-line converter - renamed (Fax|LandLine|Mobile)Converter with "Number" in it MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...axConverter.java => LandingFaxNumberConverter.java} | 6 +++--- ...verter.java => LandingLandLineNumberConverter.java} | 6 +++--- .../jjobs/beans/contact/JobsContactWebSessionBean.java | 2 +- .../beans/contact/JobsContactWebSessionController.java | 4 ++-- .../jjobs/beans/helper/JobsWebRequestHelper.java | 2 +- .../jjobs/beans/phone/JobsPhoneWebApplicationBean.java | 6 +++--- .../{cellphone => mobile}/JobsMobileConverter.java | 2 +- .../org/mxchange/localization/bundle_de_DE.properties | 2 +- .../org/mxchange/localization/bundle_en_US.properties | 10 +++++----- .../templates/admin/fax/admin_form_add_contact_fax.tpl | 4 ++-- .../admin/landline/admin_form_add_contact_landline.tpl | 4 ++-- .../admin/mobile/admin_form_add_contact_mobile.tpl | 8 ++++---- web/admin/contact/admin_contact_export.xhtml | 2 +- .../contact/unlink/admin_contact_fax_unlink.xhtml | 2 +- .../contact/unlink/admin_contact_landline_unlink.xhtml | 2 +- .../contact/unlink/admin_contact_mobile_unlink.xhtml | 2 +- web/admin/fax/admin_fax_delete.xhtml | 2 +- web/admin/fax/admin_fax_edit.xhtml | 2 +- web/admin/fax/admin_fax_show.xhtml | 2 +- web/admin/landline/admin_landline_delete.xhtml | 2 +- web/admin/landline/admin_landline_edit.xhtml | 2 +- web/admin/landline/admin_landline_show.xhtml | 2 +- web/admin/mobile/admin_mobile_delete.xhtml | 2 +- web/admin/mobile/admin_mobile_edit.xhtml | 2 +- web/admin/mobile/admin_mobile_show.xhtml | 2 +- web/admin/user/admin_user_export.xhtml | 2 +- 26 files changed, 42 insertions(+), 42 deletions(-) rename src/java/de/chotime/landingpage/converter/fax/{LandingFaxConverter.java => LandingFaxNumberConverter.java} (96%) rename src/java/de/chotime/landingpage/converter/landline/{LandingLandLineConverter.java => LandingLandLineNumberConverter.java} (96%) rename src/java/org/mxchange/jjobs/converter/{cellphone => mobile}/JobsMobileConverter.java (98%) diff --git a/src/java/de/chotime/landingpage/converter/fax/LandingFaxConverter.java b/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java similarity index 96% rename from src/java/de/chotime/landingpage/converter/fax/LandingFaxConverter.java rename to src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java index 28a6c52e..f133ea0a 100644 --- a/src/java/de/chotime/landingpage/converter/fax/LandingFaxConverter.java +++ b/src/java/de/chotime/landingpage/converter/fax/LandingFaxNumberConverter.java @@ -37,8 +37,8 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote; *

* @author Roland Haeder */ -@FacesConverter (value = "FaxConverter") -public class LandingFaxConverter implements Converter { +@FacesConverter (value = "FaxNumberConverter") +public class LandingFaxNumberConverter implements Converter { /** * Logger instance @@ -54,7 +54,7 @@ public class LandingFaxConverter implements Converter { /** * Initialization of this converter */ - public LandingFaxConverter () { + public LandingFaxNumberConverter () { // Try to get it try { // Get initial context diff --git a/src/java/de/chotime/landingpage/converter/landline/LandingLandLineConverter.java b/src/java/de/chotime/landingpage/converter/landline/LandingLandLineNumberConverter.java similarity index 96% rename from src/java/de/chotime/landingpage/converter/landline/LandingLandLineConverter.java rename to src/java/de/chotime/landingpage/converter/landline/LandingLandLineNumberConverter.java index fdf2758d..2630663b 100644 --- a/src/java/de/chotime/landingpage/converter/landline/LandingLandLineConverter.java +++ b/src/java/de/chotime/landingpage/converter/landline/LandingLandLineNumberConverter.java @@ -37,8 +37,8 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote; *

* @author Roland Haeder */ -@FacesConverter (value = "LandLineConverter") -public class LandingLandLineConverter implements Converter { +@FacesConverter (value = "LandLineNumberConverter") +public class LandingLandLineNumberConverter implements Converter { /** * Logger instance @@ -54,7 +54,7 @@ public class LandingLandLineConverter implements Converter { /** * Initialization of this converter */ - public LandingLandLineConverter () { + public LandingLandLineNumberConverter () { // Try to get it try { // Get initial context diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java index f0e11841..0fe1152a 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java @@ -175,7 +175,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job private boolean isMobileUnlinked; /** - * Cellphone number + * Mobile number */ private Long mobileNumber; diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java index 889e5407..bdc31008 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java @@ -172,14 +172,14 @@ public interface JobsContactWebSessionController extends Serializable { /** * Getter for mobile number *

- * @return Cellphone number + * @return Mobile number */ Long getMobileNumber (); /** * Setter for mobile number *

- * @param mobileNumber Cellphone number + * @param mobileNumber Mobile number */ void setMobileNumber (final Long mobileNumber); diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java index 5f70dd18..85acc7ed 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java @@ -71,7 +71,7 @@ public class JobsWebRequestHelper implements JobsWebRequestController { private DialableLandLineNumber landLineNumber; /** - * Cell phone number + * Mobile number */ private DialableMobileNumber mobileNumber; diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java index 56b137ed..d473e4dc 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java @@ -206,9 +206,9 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J * Uniquely add given mobile number to this bean's list. First remove the * old instance (by id number), then re-add it again. *

- * @param mobileNumber Cellphone number to add + * @param mobileNumber Mobile number to add */ - private void uniqueAddCellphoneNumber (final DialableMobileNumber mobileNumber) { + private void uniqueAddMobileNumber (final DialableMobileNumber mobileNumber) { // Make sure the parameter is valid if (null == mobileNumber) { // Throw NPE @@ -330,7 +330,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J // Is mobile set? if (contact.getContactMobileNumber() instanceof DialableMobileNumber) { // Unique-add it - this.uniqueAddCellphoneNumber(contact.getContactMobileNumber()); + this.uniqueAddMobileNumber(contact.getContactMobileNumber()); } // Is land-line set? diff --git a/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileConverter.java similarity index 98% rename from src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java rename to src/java/org/mxchange/jjobs/converter/mobile/JobsMobileConverter.java index 74bd6a2e..56869c78 100644 --- a/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java +++ b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jjobs.converter.cellphone; +package org.mxchange.jjobs.converter.mobile; import java.text.MessageFormat; import javax.faces.component.UIComponent; diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 37d91d33..89cce75e 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -597,7 +597,7 @@ PAGE_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren CONTENT_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren: ERROR_BEAN_HELPER_USER_NOT_SET=Fehler: Instanz 'user' im Bean-Helper nicht gesetzt. ERROR_BEAN_HELPER_CONTACT_NOT_SET=Fehler: Instanz 'contact' im Bean-Helper nicht gesetzt. -ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Fehler: Instanz 'cellPhone' in Bean-Helper nicht gesetzt. +ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Fehler: Instanz 'mobile' in Bean-Helper nicht gesetzt. CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE=Mobiltelefonnummern auflisten: ADMIN_LIST_MOBILE_EMPTY=Es sind keine Mobilfunknummern gespeichert. ADMIN_MENU_PHONE_NUMBERS_TITLE=Telefonnummern: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 0586d99f..f9e28eea 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -506,7 +506,7 @@ ADMIN_MENU_CONTACT_TITLE=Manage contact data LINK_ADMIN_LIST_CONTACT=List contact data LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. ADMIN_CONTACT_COUNTRY_CODE=Country code: -ADMIN_CONTACT_MOBILE_NUMBER=Cellphone number: +ADMIN_CONTACT_MOBILE_NUMBER=Mobile number: ADMIN_CONTACT_LANDLINE_NUMBER=Phone number: ADMIN_CONTACT_FAX_NUMBER=Fax number: PAGE_TITLE_ADMIN_EXPORT_CONTACT=Export contact data @@ -532,7 +532,7 @@ ADMIN_EXPORT_CONTACT_ZIP_CODE=ZIP code ADMIN_EXPORT_CONTACT_CITY=City ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email address ADMIN_EXPORT_CONTACT_BIRTHDAY=Birthday -ADMIN_EXPORT_CONTACT_MOBILE_NUMBER=Cellphone number +ADMIN_EXPORT_CONTACT_MOBILE_NUMBER=Mobile number ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Land-line number ADMIN_EXPORT_CONTACT_FAX_NUMBER=Fax number ADMIN_EXPORT_CONTACT_CREATED=Entry created @@ -597,11 +597,11 @@ PAGE_TITLE_ADMIN_LOCK_USER=Lock user account CONTENT_TITLE_ADMIN_LOCK_USER=Lock user account: ERROR_BEAN_HELPER_USER_NOT_SET=Error: Instance 'user' not set in bean helper. ERROR_BEAN_HELPER_CONTACT_NOT_SET=Error: Instance 'contact' not set in bean helper. -ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Error: Instance 'cellPhone' in bean helper not set. +ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Error: Instance 'mobile' in bean helper not set. CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE=List mobile phone numbers: ADMIN_LIST_MOBILE_EMPTY=No mobile numbers are saved. ADMIN_MENU_PHONE_NUMBERS_TITLE=Phone numbers: -LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS=Cell phone numbers ... +LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS=Mobile numbers ... LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE=List all mobile numbers. ADMIN_SHOW_PHONE_CREATED=Created: ADMIN_SHOW_PHONE_UPDATED=Last changed: @@ -640,7 +640,7 @@ ERROR_USER_PASSWORD_MISMATCH=You have entered a wrong password. ERROR_USER_NAME_ALREADY_USED=User name already used. Please enter another name. ERROR_EMAIL_ADDRESSES_MISMATCHING=Both entered email addresses are not the same. ERROR_EMAIL_ADDRESS_ALREADY_USED=Your entered email address is already used. Please enter another and try again. -ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED=Error: Cell phone id {0} is not linked with contact id {1}. +ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED=Error: Mobile id {0} is not linked with contact id {1}. ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE=Add mobile number to this contact ADMIN_SELECT_MOBILE_NUMBER=Choose mobile number: BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER=Add mobile number to contact diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl index 8b1cd7a4..51a19182 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl @@ -24,7 +24,7 @@

- + @@ -49,7 +49,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl index ed187a1a..db3e6c81 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl @@ -24,7 +24,7 @@
- + @@ -49,7 +49,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl index bb26071e..cf8286e4 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl @@ -19,12 +19,12 @@
- +
- - + + @@ -49,7 +49,7 @@
- +
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index f4daf63c..687aac11 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -123,7 +123,7 @@ - + diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index 010c67a1..68ae1074 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml index 7a4ca02c..cb177c4d 100644 --- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml index 717388eb..80116b69 100644 --- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml index 9f9ec096..fa603a2f 100644 --- a/web/admin/fax/admin_fax_delete.xhtml +++ b/web/admin/fax/admin_fax_delete.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index cef2bdfd..af133657 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 347e5350..f610b2db 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index faae7ca8..d9c359fd 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index edb64ce5..c44d9e2e 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index dba6795f..773e8aa1 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index e0192800..f98c0c41 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index 8b51bc60..33a13144 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index c511af26..77639b32 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 05b93c00..2039cccb 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -141,7 +141,7 @@ - + -- 2.39.5