Please cherry-pick:

[jjobs-ejb.git] / src / java / org / mxchange / jcontactsbusiness / model / department / JobsAdminDepartmentSessionBean.java

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
index 875ecb27786a40dd44d8b1e2ae58df239ee91300..5b91505aa60ae5346cefa22f75144c3e4742e6d0 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Roland Häder
+ * Copyright (C) 2017 - 2020 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -22,12 +22,12 @@ import java.util.List;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import org.mxchange.jcontactsbusiness.exceptions.department.DepartmentAlreadyAddedException;
+import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData;
-import org.mxchange.jjobs.database.BaseJobsDatabaseBean;
-import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jcontactsbusiness.model.employee.Employable;
-import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
+import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
+import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * A stateless session bean for administrative department purposes
@@ -35,7 +35,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
  * @author Roland Häder<roland@mxchange.org>
  */
 @Stateless (name = "adminDepartment", description = "An administrative statless bean for handling department data (all)")
-public class JobsAdminDepartmentSessionBean extends BaseJobsDatabaseBean implements AdminDepartmentSessionBeanRemote {
+public class JobsAdminDepartmentSessionBean extends BaseJobsEnterpriseBean implements AdminDepartmentSessionBeanRemote {
 
        /**
         * Serial number
@@ -89,7 +89,7 @@ public class JobsAdminDepartmentSessionBean extends BaseJobsDatabaseBean impleme
                }
 
                // Set created timestamp
-               department.setDepartmentCreated(new Date());
+               department.setDepartmentEntryCreated(new Date());
 
                // Get managed basic data instance
                final BasicData managedBasicData = this.createManaged(department.getDepartmentCompany());
@@ -106,13 +106,13 @@ public class JobsAdminDepartmentSessionBean extends BaseJobsDatabaseBean impleme
                        department.setDepartmentBranchOffice(managedBranchOffice);
                }
 
-               // Is headquarters set?
-               if (department.getDepartmentHeadquarters() instanceof HeadquartersData) {
-                       // Get managed headquarters
-                       final HeadquartersData managedHeadquarters = this.createManaged(department.getDepartmentHeadquarters());
+               // Is headquarter set?
+               if (department.getDepartmentHeadquarter() instanceof Headquarter) {
+                       // Get managed headquarter
+                       final Headquarter managedHeadquarter = this.createManaged(department.getDepartmentHeadquarter());
 
                        // Set it back
-                       department.setDepartmentHeadquarters(managedHeadquarters);
+                       department.setDepartmentHeadquarter(managedHeadquarter);
                }
 
                // Is lead employee set?
@@ -154,7 +154,7 @@ public class JobsAdminDepartmentSessionBean extends BaseJobsDatabaseBean impleme
         */
        private boolean isDepartmentFound (final Department department) {
                // Get whole list
-               final List<Department> departments = this.departmentBean.allDepartments();
+               final List<Department> departments = this.departmentBean.fetchAllDepartments();
 
                // Default is not found
                boolean isFound = false;