From 115063184af8119a7d1c5e9ed414084242d50bce 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 + .../FinancialsAdminBranchOfficeWebRequestBean.java | 2 +- .../FinancialsAdminHeadquarterWebRequestBean.java | 2 +- .../FinancialsAdminOpeningTimeWebRequestBean.java | 2 +- .../beans/data/FinancialsDataWebApplicationBean.java | 11 ++++++----- .../dayofweek/FinancialsDayOfTheWeekConverter.java | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 7b26c59c..fdbca916 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -121,6 +121,7 @@ javadoc.notree=false javadoc.preview=true javadoc.private=true javadoc.reference.cdi-api.jar=https://docs.oracle.com/javaee/7/api/ +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/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.java index 65a8311a..c5d603e4 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.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.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.business.branchoffice.list.FinancialsBranchOfficeListWebViewController; diff --git a/src/java/org/mxchange/jfinancials/beans/business/headquarter/FinancialsAdminHeadquarterWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/headquarter/FinancialsAdminHeadquarterWebRequestBean.java index 05e12cd3..5b68f1a8 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/headquarter/FinancialsAdminHeadquarterWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/headquarter/FinancialsAdminHeadquarterWebRequestBean.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.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.business.headquarter.list.FinancialsHeadquarterListWebViewController; diff --git a/src/java/org/mxchange/jfinancials/beans/business/opening_time/FinancialsAdminOpeningTimeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/opening_time/FinancialsAdminOpeningTimeWebRequestBean.java index bbdc934c..f518cc54 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/opening_time/FinancialsAdminOpeningTimeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/opening_time/FinancialsAdminOpeningTimeWebRequestBean.java @@ -28,7 +28,7 @@ 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.jcoreee.dates.DayOfTheWeek; import org.mxchange.jfinancials.beans.BaseFinancialsBean; /** diff --git a/src/java/org/mxchange/jfinancials/beans/data/FinancialsDataWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/data/FinancialsDataWebApplicationBean.java index 65803e2d..2e8f5568 100644 --- a/src/java/org/mxchange/jfinancials/beans/data/FinancialsDataWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/data/FinancialsDataWebApplicationBean.java @@ -19,7 +19,7 @@ package org.mxchange.jfinancials.beans.data; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; -import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek; +import org.mxchange.jcoreee.dates.DayOfTheWeek; import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jproduct.model.payment.PaymentType; import org.mxchange.jproduct.model.product.agegroup.AgeGroup; @@ -53,7 +53,7 @@ public class FinancialsDataWebApplicationBean extends BaseFinancialsBean { *

* @return An array with all age groups */ - public AgeGroup[] getAgeGroups() { + public AgeGroup[] getAgeGroups () { return AgeGroup.values(); } @@ -85,9 +85,10 @@ public class FinancialsDataWebApplicationBean extends BaseFinancialsBean { } /** - * 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/jfinancials/converter/dayofweek/FinancialsDayOfTheWeekConverter.java b/src/java/org/mxchange/jfinancials/converter/dayofweek/FinancialsDayOfTheWeekConverter.java index c2a37c17..2f6329af 100644 --- a/src/java/org/mxchange/jfinancials/converter/dayofweek/FinancialsDayOfTheWeekConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/dayofweek/FinancialsDayOfTheWeekConverter.java @@ -18,14 +18,14 @@ package org.mxchange.jfinancials.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 FinancialsDayOfTheWeekConverter extends EnumConverter { /** -- 2.39.5