]> git.mxchange.org Git - pizzaservice-ejb.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 24 Nov 2019 04:29:41 +0000 (05:29 +0100)
committerRoland Häder <roland@mxchange.org>
Wed, 15 Jan 2020 09:55:40 +0000 (10:55 +0100)
- renamed BaseFinancialsDatabaseBean to BaseFinancialsEnterpriseBean
- also moved it to proper "enterprise" package

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java
src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java
src/java/org/mxchange/jcontactsbusiness/model/headquarter/PizzaHeadquarterSessionBean.java
src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java
src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java

index ae96a0223f777c9c0f98057b19d123548b5bfa6d..2bb1168f6041fadff01bfc8fd010ab4a5b631817 100644 (file)
@@ -25,6 +25,7 @@ import javax.persistence.NoResultException;
 import javax.persistence.Query;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.pizzaaplication.enterprise.BasePizzaEnterpriseBean;
+
 /**
  * A contact EJB
  * <p>
index b87d8235f724870d8392a93413e9e2e538cd9d72..d20dae155744390fe81298cb9b86db10fbb77489 100644 (file)
@@ -25,7 +25,7 @@ import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeAlreadyAddedEx
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.department.Department;
 import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
-import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition;
+import org.mxchange.jcontactsbusiness.model.jobposition.HireableJobPosition;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jusercore.model.user.User;
@@ -177,9 +177,9 @@ public class PizzaAdminEmployeeSessionBean extends BasePizzaEnterpriseBean imple
                }
 
                // Is headquarter set?
-               if (employee.getEmployeeJobPosition() instanceof JobPosition) {
+               if (employee.getEmployeeJobPosition() instanceof HireableJobPosition) {
                        // Then make it managed
-                       final JobPosition jobPosition = this.createManaged(employee.getEmployeeJobPosition());
+                       final HireableJobPosition jobPosition = this.createManaged(employee.getEmployeeJobPosition());
 
                        // Set it back
                        employee.setEmployeeJobPosition(jobPosition);
index 83825830e12f276bbedcba71407581b286339377..aee7a0d947645aa94b8d3927f24bd1e96b9072fb 100644 (file)
@@ -20,6 +20,7 @@ import java.text.MessageFormat;
 import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.Query;
+import org.mxchange.jcontactsbusiness.model.headquarter.HeadquarterSessionBeanRemote;
 import org.mxchange.pizzaapplication.enterprise.BasePizzaEnterpriseBean;
 
 /**
index cdbad539580d56fc26a9864616541bc043968c24..4143ddd1e7de0c10e442e05408789e2fedf0496d 100644 (file)
@@ -19,7 +19,7 @@ package org.mxchange.jphone.model.phonenumbers.mobileprovider;
 import java.text.MessageFormat;
 import java.util.Date;
 import javax.ejb.Stateless;
-import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException;
+import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderAlreadyAddedException;
 import org.mxchange.pizzaaplication.enterprise.BasePizzaEnterpriseBean;
 
 /**
index bb20341344972dcb58a8ec3dd9e66ea42dc70379..bc9bea82e3067747df1c34f6b10c9b1a80fd57c7 100644 (file)
@@ -23,7 +23,7 @@ import javax.ejb.Stateless;
 import javax.jms.JMSException;
 import javax.jms.ObjectMessage;
 import javax.persistence.Query;
-import org.mxchange.jcoreee.enterprise.BaseEnterpriseBean;
+import org.mxchange.pizzaapplication.enterprise.BasePizzaEnterpriseBean;
 import org.mxchange.jusercore.model.user.User;
 
 /**
@@ -34,7 +34,7 @@ import org.mxchange.jusercore.model.user.User;
  * @author Roland Häder<roland@mxchange.org>
  */
 @Stateless (name = "userActivity", description = "A stateless, session-scored user-activity bean.")
-public class PizzaUserActivitySessionBean extends BaseEnterpiseBean implements UserActivityLogSessionBeanRemote {
+public class PizzaUserActivitySessionBean extends BasePizzaEnterpiseBean implements UserActivityLogSessionBeanRemote {
 
        /**
         * Serial number