From a0e4a91b1fed6661b52d88ecc09ad92f51e9f483 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 27 Apr 2016 15:24:02 +0200 Subject: [PATCH] added clear() methods to clear beans MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../PizzaAdminContactWebRequestBean.java | 31 ++++++++++ .../contact/PizzaContactWebSessionBean.java | 61 ++++++++++--------- .../PizzaContactWebSessionController.java | 5 -- .../PizzaAdminCountryWebRequestBean.java | 16 +++++ .../login/PizzaUserLoginWebSessionBean.java | 8 +-- ...izzaAdminMobileProviderWebRequestBean.java | 2 +- .../PizzaAdminContactPhoneWebRequestBean.java | 11 ++++ .../user/PizzaAdminUserWebRequestBean.java | 13 ++++ 8 files changed, 106 insertions(+), 41 deletions(-) diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java index 43079c27..bbbc007a 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java @@ -671,6 +671,37 @@ public class PizzaAdminContactWebRequestBean implements PizzaAdminContactWebRequ public void init () { } + /** + * Clears this bean + */ + private void clear () { + // Clear all data + // - personal data + this.setGender(Gender.UNKNOWN); + this.setFirstName(null); + this.setFamilyName(null); + this.setStreet(null); + this.setHouseNumber(null); + this.setZipCode(null); + this.setCity(null); + this.setCountry(null); + + // - contact data + this.setEmailAddress(null); + this.setPhoneCountry(null); + this.setPhoneAreaCode(null); + this.setPhoneNumber(null); + this.setCellphoneCarrier(null); + this.setCellphoneNumber(null); + this.setFaxCountry(null); + this.setFaxAreaCode(null); + this.setFaxNumber(null); + + // - other data + this.setBirthday(null); + this.setComment(null); + } + /** * Updates all data in contact instance. *

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java index 591b52f2..28a37f4c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java @@ -353,7 +353,6 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl // Debug message //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactWebBean:afterRegistration: registeredContact={0}", registeredContact)); //NOI18N - // Copy all data from registered->user this.copyContact(registeredContact); @@ -399,34 +398,6 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl return this.contactList; } - /** - * Clears this bean - */ - @Override - public void clear () { - // Clear all data - // - personal data - this.setGender(Gender.UNKNOWN); - this.setFirstName(null); - this.setFamilyName(null); - this.setStreet(null); - this.setHouseNumber(null); - this.setZipCode(null); - this.setCity(null); - this.setCountry(null); - - // - contact data - this.setEmailAddress(null); - this.setEmailAddressRepeat(null); - this.setPhoneAreaCode(null); - this.setCellphoneCarrier(null); - this.setFaxAreaCode(null); - - // - other data - this.setBirthday(null); - this.setComment(null); - } - @Override public Contact createContactInstance () { // Required personal data must be set @@ -874,6 +845,38 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl this.emailAddressList.add(contact.getContactEmailAddress()); } + /** + * Clears this bean + */ + private void clear () { + // Clear all data + // - personal data + this.setGender(Gender.UNKNOWN); + this.setFirstName(null); + this.setFamilyName(null); + this.setStreet(null); + this.setHouseNumber(null); + this.setZipCode(null); + this.setCity(null); + this.setCountry(null); + + // - contact data + this.setEmailAddress(null); + this.setEmailAddressRepeat(null); + this.setPhoneCountry(null); + this.setPhoneAreaCode(null); + this.setPhoneNumber(null); + this.setCellphoneCarrier(null); + this.setCellphoneNumber(null); + this.setFaxCountry(null); + this.setFaxAreaCode(null); + this.setFaxNumber(null); + + // - other data + this.setBirthday(null); + this.setComment(null); + } + /** * Copies given contact into the controller *

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java index 381330ef..18a12e66 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java @@ -75,11 +75,6 @@ public interface PizzaContactWebSessionController extends Serializable { */ Contact lookupContactById (final Long contactId) throws ContactNotFoundException; - /** - * Clears this controller - */ - void clear (); - /** * Event observer for new user registrations *

diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java index 014bcbe6..10ce8b88 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java @@ -147,6 +147,9 @@ public class PizzaAdminCountryWebRequestBean implements PizzaAdminCountryWebRequ // Fire event this.addedCountryEvent.fire(new AdminEventCountryAdded(updatedCountry)); + // Clear this bean + this.clear(); + // Redirect to list return "admin_list_country"; //NOI18N } @@ -222,6 +225,19 @@ public class PizzaAdminCountryWebRequestBean implements PizzaAdminCountryWebRequ return (!this.allCountries().isEmpty()); } + /** + * Clears this bean + */ + private void clear () { + // Clear all fields + this.setCountryAbroadDialPrefix(null); + this.setCountryCode(null); + this.setCountryExternalDialPrefix(null); + this.setCountryI18nKey(null); + this.setCountryIsLocalPrefixRequired(Boolean.FALSE); + this.setCountryPhoneCode(null); + } + /** * Checks if given country is already added by iterating over the whole list * and try to find it. diff --git a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java index 79c3f00a..78c3da76 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.pizzaapplication.beans.login; +import de.chotime.jratecalc.beans.user.RateCalcUserWebSessionController; import java.util.Objects; import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Event; @@ -206,16 +207,11 @@ public class PizzaUserLoginWebSessionBean implements PizzaUserLoginWebSessionCon @Override public boolean isUserLoggedIn () { - // Trace message - // NOISY: System.out.println(MessageFormat.format("PizzaUserLoginWebSessionBean:isUserLoggedIn: this.loggedInUser={0},this.templateType={1} - CALLED!", this.getLoggedInUser(), this.getTemplateType())); - // Compare instance this.userLoggedIn = ((this.getLoggedInUser() instanceof User) && (Objects.equals(this.getLoggedInUser().getUserAccountStatus(), UserAccountStatus.CONFIRMED))); - // Trace message - // NOISY: System.out.println(MessageFormat.format("PizzaUserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); - // Return it return this.userLoggedIn; } + } diff --git a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java index a43f0631..056de736 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaAdminMobileProviderWebRequestBean.java @@ -191,7 +191,7 @@ public class PizzaAdminMobileProviderWebRequestBean implements PizzaAdminMobileP * Clears this bean */ private void clear () { - // Set all vaues to null + // Clear all fields this.setProviderCountry(null); this.setProviderDialPrefix(null); this.setProviderMailPattern(null); diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java index 4cde05e9..12ab8240 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java @@ -157,4 +157,15 @@ public class PizzaAdminContactPhoneWebRequestBean implements PizzaAdminContactPh this.landLine = landLine; } + /** + * Clears this bean + */ + private void clear () { + // Clear all fields + this.setCellPhone(null); + this.setContact(null); + this.setFax(null); + this.setLandLine(null); + } + } diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java index e1d40d32..556b9277 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java @@ -248,6 +248,9 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon // Fire event this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser)); + // Clear this bean + this.clear(); + // Return to user list (for now) return "admin_list_user"; //NOI18N } @@ -356,6 +359,16 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon public void init () { } + /** + * Clears this bean + */ + private void clear () { + // Clear all fields + this.setUserName(null); + this.setUserPassword(null); + this.setUserPasswordRepeat(null); + } + /** * Checks if same password is entered and that they are not empty. *

-- 2.39.5