From 9227238b2555cc4ce94b549d082d21953748e38a Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Fri, 26 Jul 2024 02:18:47 +0200
Subject: [PATCH] Moved (Year/Month/Week)Values classes form htmlize to
 properties package.

---
 src/fr/devinsy/statoolinfos/core/Federation.java            | 6 +++---
 src/fr/devinsy/statoolinfos/core/Organization.java          | 6 +++---
 src/fr/devinsy/statoolinfos/core/Service.java               | 2 +-
 src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java      | 6 +++---
 .../statoolinfos/htmlize/FederationMetricHtmlizer.java      | 6 +++---
 .../statoolinfos/htmlize/OrganizationMetricHtmlizer.java    | 6 +++---
 .../devinsy/statoolinfos/htmlize/ServiceMetricHtmlizer.java | 6 +++---
 src/fr/devinsy/statoolinfos/metrics/Metric.java             | 2 +-
 .../{htmlize/charts => properties}/MonthValues.java         | 2 +-
 .../devinsy/statoolinfos/properties/PathPropertyList.java   | 3 ---
 .../{htmlize/charts => properties}/WeekValues.java          | 2 +-
 .../{htmlize/charts => properties}/YearValues.java          | 2 +-
 12 files changed, 23 insertions(+), 26 deletions(-)
 rename src/fr/devinsy/statoolinfos/{htmlize/charts => properties}/MonthValues.java (99%)
 rename src/fr/devinsy/statoolinfos/{htmlize/charts => properties}/WeekValues.java (99%)
 rename src/fr/devinsy/statoolinfos/{htmlize/charts => properties}/YearValues.java (99%)

diff --git a/src/fr/devinsy/statoolinfos/core/Federation.java b/src/fr/devinsy/statoolinfos/core/Federation.java
index 98405c6..5c91b4e 100644
--- a/src/fr/devinsy/statoolinfos/core/Federation.java
+++ b/src/fr/devinsy/statoolinfos/core/Federation.java
@@ -29,11 +29,11 @@ import org.apache.commons.lang3.StringUtils;
 
 import fr.devinsy.statoolinfos.checker.PropertyChecks;
 import fr.devinsy.statoolinfos.crawl.CrawlJournal;
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
-import fr.devinsy.statoolinfos.htmlize.charts.WeekValues;
-import fr.devinsy.statoolinfos.htmlize.charts.YearValues;
+import fr.devinsy.statoolinfos.properties.MonthValues;
 import fr.devinsy.statoolinfos.properties.PathProperties;
 import fr.devinsy.statoolinfos.properties.PathPropertyList;
+import fr.devinsy.statoolinfos.properties.WeekValues;
+import fr.devinsy.statoolinfos.properties.YearValues;
 import fr.devinsy.statoolinfos.uptime.URLSet;
 import fr.devinsy.statoolinfos.util.URLUtils;
 
diff --git a/src/fr/devinsy/statoolinfos/core/Organization.java b/src/fr/devinsy/statoolinfos/core/Organization.java
index 9545e33..e21eb87 100644
--- a/src/fr/devinsy/statoolinfos/core/Organization.java
+++ b/src/fr/devinsy/statoolinfos/core/Organization.java
@@ -29,11 +29,11 @@ import org.apache.commons.lang3.StringUtils;
 
 import fr.devinsy.statoolinfos.checker.PropertyChecks;
 import fr.devinsy.statoolinfos.crawl.CrawlJournal;
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
-import fr.devinsy.statoolinfos.htmlize.charts.WeekValues;
-import fr.devinsy.statoolinfos.htmlize.charts.YearValues;
+import fr.devinsy.statoolinfos.properties.MonthValues;
 import fr.devinsy.statoolinfos.properties.PathProperties;
 import fr.devinsy.statoolinfos.properties.PathPropertyList;
+import fr.devinsy.statoolinfos.properties.WeekValues;
+import fr.devinsy.statoolinfos.properties.YearValues;
 import fr.devinsy.statoolinfos.uptime.URLSet;
 import fr.devinsy.statoolinfos.util.URLUtils;
 
diff --git a/src/fr/devinsy/statoolinfos/core/Service.java b/src/fr/devinsy/statoolinfos/core/Service.java
index d93d92f..46b03a2 100644
--- a/src/fr/devinsy/statoolinfos/core/Service.java
+++ b/src/fr/devinsy/statoolinfos/core/Service.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 
 import fr.devinsy.statoolinfos.checker.PropertyChecks;
 import fr.devinsy.statoolinfos.crawl.CrawlJournal;
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
+import fr.devinsy.statoolinfos.properties.MonthValues;
 import fr.devinsy.statoolinfos.properties.PathProperties;
 import fr.devinsy.statoolinfos.properties.PathPropertyList;
 import fr.devinsy.statoolinfos.uptime.URLSet;
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java
index c17c36e..61b8ddf 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ChartHtmlizer.java
@@ -43,17 +43,17 @@ import fr.devinsy.statoolinfos.htmlize.charts.BarChartView;
 import fr.devinsy.statoolinfos.htmlize.charts.ChartColor;
 import fr.devinsy.statoolinfos.htmlize.charts.ChartColors;
 import fr.devinsy.statoolinfos.htmlize.charts.DoughnutChartView;
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
 import fr.devinsy.statoolinfos.htmlize.charts.PieChart;
 import fr.devinsy.statoolinfos.htmlize.charts.PieChart.Position;
 import fr.devinsy.statoolinfos.htmlize.charts.PieChartView;
-import fr.devinsy.statoolinfos.htmlize.charts.WeekValues;
-import fr.devinsy.statoolinfos.htmlize.charts.YearValues;
 import fr.devinsy.statoolinfos.metrics.StringCounter;
 import fr.devinsy.statoolinfos.metrics.StringCounterList;
 import fr.devinsy.statoolinfos.metrics.StringCounters;
+import fr.devinsy.statoolinfos.properties.MonthValues;
 import fr.devinsy.statoolinfos.properties.PathProperty;
 import fr.devinsy.statoolinfos.properties.PathPropertyList;
+import fr.devinsy.statoolinfos.properties.WeekValues;
+import fr.devinsy.statoolinfos.properties.YearValues;
 import fr.devinsy.statoolinfos.stats.StatAgent;
 import fr.devinsy.statoolinfos.stats.categories.CategoryStat;
 import fr.devinsy.statoolinfos.stats.categories.CategoryStats;
diff --git a/src/fr/devinsy/statoolinfos/htmlize/FederationMetricHtmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/FederationMetricHtmlizer.java
index 7c6a862..f243d43 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/FederationMetricHtmlizer.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/FederationMetricHtmlizer.java
@@ -29,9 +29,9 @@ import fr.devinsy.statoolinfos.core.StatoolInfosException;
 import fr.devinsy.statoolinfos.htmlize.FederationMetricMenuView.PeriodMenu;
 import fr.devinsy.statoolinfos.htmlize.FederationMetricMenuView.ViewMenu;
 import fr.devinsy.statoolinfos.htmlize.charts.ChartColor;
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
-import fr.devinsy.statoolinfos.htmlize.charts.WeekValues;
-import fr.devinsy.statoolinfos.htmlize.charts.YearValues;
+import fr.devinsy.statoolinfos.properties.MonthValues;
+import fr.devinsy.statoolinfos.properties.WeekValues;
+import fr.devinsy.statoolinfos.properties.YearValues;
 import fr.devinsy.xidyn.data.TagDataManager;
 
 /**
diff --git a/src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricHtmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricHtmlizer.java
index 2d53871..ed44dd5 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricHtmlizer.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricHtmlizer.java
@@ -29,9 +29,9 @@ import fr.devinsy.statoolinfos.core.StatoolInfosException;
 import fr.devinsy.statoolinfos.htmlize.OrganizationMetricMenuView.PeriodMenu;
 import fr.devinsy.statoolinfos.htmlize.OrganizationMetricMenuView.ViewMenu;
 import fr.devinsy.statoolinfos.htmlize.charts.ChartColor;
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
-import fr.devinsy.statoolinfos.htmlize.charts.WeekValues;
-import fr.devinsy.statoolinfos.htmlize.charts.YearValues;
+import fr.devinsy.statoolinfos.properties.MonthValues;
+import fr.devinsy.statoolinfos.properties.WeekValues;
+import fr.devinsy.statoolinfos.properties.YearValues;
 import fr.devinsy.xidyn.data.TagDataManager;
 
 /**
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricHtmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricHtmlizer.java
index 6f2505b..c4bb622 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricHtmlizer.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricHtmlizer.java
@@ -29,9 +29,9 @@ import fr.devinsy.statoolinfos.core.StatoolInfosException;
 import fr.devinsy.statoolinfos.htmlize.ServiceMetricMenuView.PeriodMenu;
 import fr.devinsy.statoolinfos.htmlize.ServiceMetricMenuView.ViewMenu;
 import fr.devinsy.statoolinfos.htmlize.charts.ChartColor;
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
-import fr.devinsy.statoolinfos.htmlize.charts.WeekValues;
-import fr.devinsy.statoolinfos.htmlize.charts.YearValues;
+import fr.devinsy.statoolinfos.properties.MonthValues;
+import fr.devinsy.statoolinfos.properties.WeekValues;
+import fr.devinsy.statoolinfos.properties.YearValues;
 import fr.devinsy.xidyn.data.TagDataManager;
 
 /**
diff --git a/src/fr/devinsy/statoolinfos/metrics/Metric.java b/src/fr/devinsy/statoolinfos/metrics/Metric.java
index b88a156..35a32de 100644
--- a/src/fr/devinsy/statoolinfos/metrics/Metric.java
+++ b/src/fr/devinsy/statoolinfos/metrics/Metric.java
@@ -23,7 +23,7 @@ import java.time.YearMonth;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
+import fr.devinsy.statoolinfos.properties.MonthValues;
 import fr.devinsy.strings.StringList;
 
 /**
diff --git a/src/fr/devinsy/statoolinfos/htmlize/charts/MonthValues.java b/src/fr/devinsy/statoolinfos/properties/MonthValues.java
similarity index 99%
rename from src/fr/devinsy/statoolinfos/htmlize/charts/MonthValues.java
rename to src/fr/devinsy/statoolinfos/properties/MonthValues.java
index e474fa8..e9d3563 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/charts/MonthValues.java
+++ b/src/fr/devinsy/statoolinfos/properties/MonthValues.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with StatoolInfos.  If not, see <http://www.gnu.org/licenses/>.
  */
-package fr.devinsy.statoolinfos.htmlize.charts;
+package fr.devinsy.statoolinfos.properties;
 
 import java.time.YearMonth;
 import java.util.HashMap;
diff --git a/src/fr/devinsy/statoolinfos/properties/PathPropertyList.java b/src/fr/devinsy/statoolinfos/properties/PathPropertyList.java
index af9bce2..33c2374 100644
--- a/src/fr/devinsy/statoolinfos/properties/PathPropertyList.java
+++ b/src/fr/devinsy/statoolinfos/properties/PathPropertyList.java
@@ -36,9 +36,6 @@ import org.slf4j.LoggerFactory;
 import org.threeten.extra.YearWeek;
 
 import fr.devinsy.statoolinfos.core.StatoolInfosUtils;
-import fr.devinsy.statoolinfos.htmlize.charts.MonthValues;
-import fr.devinsy.statoolinfos.htmlize.charts.WeekValues;
-import fr.devinsy.statoolinfos.htmlize.charts.YearValues;
 import fr.devinsy.statoolinfos.metrics.Metric;
 import fr.devinsy.strings.StringList;
 import fr.devinsy.strings.StringSet;
diff --git a/src/fr/devinsy/statoolinfos/htmlize/charts/WeekValues.java b/src/fr/devinsy/statoolinfos/properties/WeekValues.java
similarity index 99%
rename from src/fr/devinsy/statoolinfos/htmlize/charts/WeekValues.java
rename to src/fr/devinsy/statoolinfos/properties/WeekValues.java
index 3335072..b9c7d92 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/charts/WeekValues.java
+++ b/src/fr/devinsy/statoolinfos/properties/WeekValues.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with StatoolInfos.  If not, see <http://www.gnu.org/licenses/>.
  */
-package fr.devinsy.statoolinfos.htmlize.charts;
+package fr.devinsy.statoolinfos.properties;
 
 import java.util.HashMap;
 
diff --git a/src/fr/devinsy/statoolinfos/htmlize/charts/YearValues.java b/src/fr/devinsy/statoolinfos/properties/YearValues.java
similarity index 99%
rename from src/fr/devinsy/statoolinfos/htmlize/charts/YearValues.java
rename to src/fr/devinsy/statoolinfos/properties/YearValues.java
index d79956b..60b7852 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/charts/YearValues.java
+++ b/src/fr/devinsy/statoolinfos/properties/YearValues.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with StatoolInfos.  If not, see <http://www.gnu.org/licenses/>.
  */
-package fr.devinsy.statoolinfos.htmlize.charts;
+package fr.devinsy.statoolinfos.properties;
 
 import java.time.Year;
 import java.util.HashMap;