From c4c75aae6f956b84e18867f125f1f8ec628b1cd3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 22 Jun 2017 21:58:44 +0200 Subject: [PATCH] Don't cherry-pick: - moved bean to proper package as it is user-specific registration - fixed imports and method calls MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../beans/customer/PizzaAdminCustomerWebRequestBean.java | 8 ++++---- .../register/PizzaUserRegisterWebSessionBean.java | 2 +- .../register/PizzaUserRegisterWebSessionController.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/java/org/mxchange/pizzaapplication/beans/{ => user}/register/PizzaUserRegisterWebSessionBean.java (99%) rename src/java/org/mxchange/pizzaapplication/beans/{ => user}/register/PizzaUserRegisterWebSessionController.java (95%) diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java index 819d6a3c..c54df4fa 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java @@ -28,18 +28,18 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.gender.PersonalTitle; +import org.mxchange.jcontacts.contact.title.PersonalTitle; import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcustomercore.events.customer.added.AdminAddedCustomerEvent; +import org.mxchange.jcustomercore.events.customer.added.ObservableAdminAddedCustomerEvent; import org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException; import org.mxchange.jcustomercore.model.customer.Customer; import org.mxchange.jcustomercore.model.customer.status.CustomerAccountStatus; import org.mxchange.pizzaapplication.beans.BasePizzaController; import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController; +import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperController; import org.mxchange.pizzaapplication.model.customer.PizzaAdminCustomerSessionBeanRemote; import org.mxchange.pizzaapplication.model.customer.PizzaCustomer; -import org.mxchange.jcustomercore.events.customer.added.ObservableAdminAddedCustomerEvent; -import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperController; /** * Administrative customer bean (controller) @@ -195,7 +195,7 @@ public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implem */ private boolean isCustomerDataSet () { // Check all - return ((this.adminContactController.getGender() instanceof PersonalTitle) && + return ((this.adminContactController.getPersonalTitle() instanceof PersonalTitle) && (this.adminContactController.getFirstName() != null) && (!this.adminContactController.getFirstName().isEmpty()) && (this.adminContactController.getFamilyName() != null) && diff --git a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionBean.java similarity index 99% rename from src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java rename to src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionBean.java index 84aa05a4..16f67ce8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionBean.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.pizzaapplication.beans.register; +package org.mxchange.pizzaapplication.beans.user.register; import java.text.MessageFormat; import javax.annotation.PostConstruct; diff --git a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionController.java similarity index 95% rename from src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionController.java rename to src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionController.java index 4d387683..4dbedc46 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionController.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.pizzaapplication.beans.register; +package org.mxchange.pizzaapplication.beans.user.register; import java.io.Serializable; -- 2.39.5