From 7f436578d667cdf664a1a2bef6bda2d1eb9cf7f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Apr 2020 05:20:44 +0200 Subject: [PATCH] Please cherry-pick: - fixed new location of DayOfTheWeek enumeration (jcoreee.jar now) - added missing documentation links MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/project.properties | 1 + .../branchoffice/JobsAdminBranchOfficeWebRequestBean.java | 2 +- .../headquarter/JobsAdminHeadquarterWebRequestBean.java | 2 +- .../opening_time/JobsAdminOpeningTimeWebRequestBean.java | 2 +- .../jjobs/beans/data/JobsDataWebApplicationBean.java | 8 +++++--- .../converter/dayofweek/JobsDayOfTheWeekConverter.java | 4 ++-- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index cb9a46df..a078f235 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -118,6 +118,7 @@ javadoc.private=true javadoc.reference.poi-3.15.jar=https://poi.apache.org/apidocs/ javadoc.reference.poi-ooxml-3.15.jar=https://poi.apache.org/apidocs/ javadoc.reference.cdi-api.jar=https://docs.jboss.org/cdi/api/1.2/ +javadoc.reference.jcoreee.jar=https://docs.mxchange.org/javadoc/jcoreee. javadoc.splitindex=true javadoc.use=true javadoc.version=true diff --git a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java index 3ce8f59f..62a018db 100644 --- a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java @@ -38,7 +38,7 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BusinessBranchOffice; import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; -import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek; +import org.mxchange.jcoreee.dates.DayOfTheWeek; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController; diff --git a/src/java/org/mxchange/jjobs/beans/business/headquarter/JobsAdminHeadquarterWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/headquarter/JobsAdminHeadquarterWebRequestBean.java index 580f601c..79fd3c9a 100644 --- a/src/java/org/mxchange/jjobs/beans/business/headquarter/JobsAdminHeadquarterWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/headquarter/JobsAdminHeadquarterWebRequestBean.java @@ -36,7 +36,7 @@ import org.mxchange.jcontactsbusiness.model.headquarter.BusinessHeadquarter; import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; -import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek; +import org.mxchange.jcoreee.dates.DayOfTheWeek; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.business.headquarter.list.JobsHeadquarterListWebViewController; diff --git a/src/java/org/mxchange/jjobs/beans/business/opening_time/JobsAdminOpeningTimeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/opening_time/JobsAdminOpeningTimeWebRequestBean.java index cc8b0142..1499264c 100644 --- a/src/java/org/mxchange/jjobs/beans/business/opening_time/JobsAdminOpeningTimeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/opening_time/JobsAdminOpeningTimeWebRequestBean.java @@ -28,8 +28,8 @@ import org.mxchange.jcontactsbusiness.events.opening_time.added.OpeningTimeAdded import org.mxchange.jcontactsbusiness.model.opening_time.AdminOpeningTimeSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; -import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek; import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jcoreee.dates.DayOfTheWeek; /** * An administrative bean for openingTimes diff --git a/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java index e7a59b27..0bfeb8b8 100644 --- a/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java @@ -21,6 +21,7 @@ import javax.inject.Named; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek; import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jcoreee.dates.DayOfTheWeek; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; @@ -65,9 +66,10 @@ public class JobsDataWebApplicationBean extends BaseJobsBean { } /** - * Returns an array of all profile modes

- * @return An array of all profile modes + * Returns an array of all profile modes

+ * @ + * + * return An array of all profile modes */ public ProfileMode[] getProfileModes () { return ProfileMode.values(); diff --git a/src/java/org/mxchange/jjobs/converter/dayofweek/JobsDayOfTheWeekConverter.java b/src/java/org/mxchange/jjobs/converter/dayofweek/JobsDayOfTheWeekConverter.java index 2900fd07..22c14f4d 100644 --- a/src/java/org/mxchange/jjobs/converter/dayofweek/JobsDayOfTheWeekConverter.java +++ b/src/java/org/mxchange/jjobs/converter/dayofweek/JobsDayOfTheWeekConverter.java @@ -18,14 +18,14 @@ package org.mxchange.jjobs.converter.dayofweek; import javax.faces.convert.EnumConverter; import javax.faces.convert.FacesConverter; -import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek; +import org.mxchange.jcoreee.dates.DayOfTheWeek; /** * A converter for day of the week enumeration *

* @author Roland Häder */ -@FacesConverter("DayOfTheWeekConverter") +@FacesConverter ("DayOfTheWeekConverter") public class JobsDayOfTheWeekConverter extends EnumConverter { /** -- 2.39.5