Upgrade XChart to 3.8.4 (#3291)

Signed-off-by: Jan N. Klug <github@klug.nrw>
openhab · Jun 17, 2023 · c2e81a1 · c2e81a1
1 parent 8eddad5
commit c2e81a1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/bundles/org.openhab.core.ui/NOTICE b/bundles/org.openhab.core.ui/NOTICE
@@ -15,10 +15,10 @@ https://github.com/openhab/openhab-core
 
 == Third-party Content
 
-xchart-2.6.1
+xchart-3.8.4
 * License: Apache License, 2.0
 * Project: http://knowm.org/open-source/xchart
-* Source: https://github.com/timmolter/XChart/tree/xchart-2.6.1
+* Source: https://github.com/timmolter/XChart/tree/xchart-3.8.4
 
 == Third-party license(s)
 

diff --git a/bundles/org.openhab.core.ui/bnd.bnd b/bundles/org.openhab.core.ui/bnd.bnd
@@ -4,4 +4,7 @@ Private-Package: \
  org.knowm.xchart.*
 Import-Package: \
  de.erichseifert.vectorgraphics2d.*;resolution:=optional,\
+ de.rototor.pdfbox.*;resolution:=optional,\
+ com.madgag.*;resolution:=optional,\
+ org.apache.pdfbox.*;resolution:=optional,\
  *
diff --git a/bundles/org.openhab.core.ui/pom.xml b/bundles/org.openhab.core.ui/pom.xml
@@ -18,8 +18,7 @@
  <dependency>
  <groupId>org.knowm.xchart</groupId>
  <artifactId>xchart</artifactId>
- <!-- Newer versions have issues with customized grid lines, see: https://github.com/knowm/XChart/issues/628 -->
- <version>3.1.0</version>
+ <version>3.8.4</version>
  </dependency>
  <dependency>
  <groupId>org.openhab.core.bundles</groupId>

diff --git a/...in/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java b/...in/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
@@ -32,7 +32,7 @@
 import org.knowm.xchart.XYChart;
 import org.knowm.xchart.XYChartBuilder;
 import org.knowm.xchart.XYSeries;
-import org.knowm.xchart.style.Styler;
+import org.knowm.xchart.style.AxesChartStyler;
 import org.knowm.xchart.style.Styler.LegendPosition;
 import org.knowm.xchart.style.XYStyler;
 import org.knowm.xchart.style.markers.None;
@@ -195,7 +195,7 @@ public BufferedImage createChart(@Nullable String serviceId, @Nullable String th
  styler.setYAxisDecimalPattern(yAxisDecimalPattern);
  }
  styler.setYAxisTickMarkSpacingHint(yAxisSpacing);
- styler.setYAxisLabelAlignment(Styler.TextAlignment.Right);
+ styler.setYAxisLabelAlignment(AxesChartStyler.TextAlignment.Right);
  // chart
  styler.setChartBackgroundColor(chartTheme.getChartBackgroundColor());
  styler.setChartFontColor(chartTheme.getChartFontColor());