From d0d42ffaf10421604418d6af0eb19d6e985da7b4 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com> Date: Fri, 26 Aug 2022 03:35:54 +0200 Subject: [PATCH] IDEMPIERE-5361 : Jasper reports with Charts are not working (#1452) * IDEMPIERE-5361 : Jasper reports with Charts are not working * IDEMPIERE-5361 : patch from hengsin --- org.adempiere.base/META-INF/MANIFEST.MF | 10 +++++++++- .../src/org/adempiere/apps/graph/ChartBuilder.java | 2 -- .../src/org/adempiere/apps/graph/GraphBuilder.java | 2 -- .../org/adempiere/webui/dashboard/CalendarWindow.java | 1 - org.idempiere.p2.targetplatform/maven.locations.xml | 2 +- .../org.idempiere.p2.targetplatform.target | 4 ++-- .../org.idempiere.p2.targetplatform.tpd | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index eb4864a4a2..3660c8c871 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -125,6 +125,14 @@ Import-Package: com.google.zxing, org.eclipse.core.runtime;version="3.4.0", org.eclipse.osgi.framework.console;version="1.1.0", org.eclipse.osgi.service.datalocation, + org.jfree.chart;version="[1.0.19,1.0.19]", + org.jfree.chart.axis;version="[1.0.19,1.0.19]", + org.jfree.chart.plot;version="[1.0.19,1.0.19]", + org.jfree.chart.renderer.category;version="[1.0.19,1.0.19]", + org.jfree.data.category;version="[1.0.19,1.0.19]", + org.jfree.data.general;version="[1.0.19,1.0.19]", + org.jfree.data.time;version="[1.0.19,1.0.19]", + org.jfree.data.xy;version="[1.0.19,1.0.19]", org.krysalis.barcode4j;version="2.1.0", org.krysalis.barcode4j.impl;version="2.1.0", org.krysalis.barcode4j.impl.upcean;version="2.1.0", @@ -166,7 +174,7 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", wrapped.org.apache.poi.poi-ooxml;bundle-version="4.1.2", wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0", wrapped.org.jfree.jcommon;bundle-version="1.0.24", - wrapped.org.jfree.jfreechart;bundle-version="1.5.3", + wrapped.org.jfree.jfreechart;bundle-version="[1.0.19,1.0.19]", wrapped.com.google.http-client.google-http-client-gson;bundle-version="1.39.2", wrapped.com.google.zxing.javase;bundle-version="3.4.1", wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1", diff --git a/org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java b/org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java index 03899472d0..b7bbd9eac8 100644 --- a/org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java +++ b/org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java @@ -153,7 +153,6 @@ public class ChartBuilder { } } - @SuppressWarnings({ "unchecked", "rawtypes" }) private void addData(MChartDatasource ds) { String value = ds.getValueColumn(); @@ -370,7 +369,6 @@ public class ChartBuilder { return (IntervalXYDataset) dataset; } - @SuppressWarnings("rawtypes") public PieDataset getPieDataset() { dataset = new DefaultPieDataset(); loadData(); diff --git a/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java b/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java index 2a10b2bb30..2f8263974b 100644 --- a/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java +++ b/org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java @@ -45,7 +45,6 @@ public class GraphBuilder { protected String m_Y_AxisLabel = "Y Axis"; protected DefaultCategoryDataset dataset = new DefaultCategoryDataset(); protected DefaultCategoryDataset linearDataset = new DefaultCategoryDataset(); - @SuppressWarnings("rawtypes") protected DefaultPieDataset pieDataset = new DefaultPieDataset(); private static final CLogger log = CLogger.getCLogger(GraphBuilder.class); @@ -251,7 +250,6 @@ public class GraphBuilder { return list; } - @SuppressWarnings({ "rawtypes", "unchecked" }) public void loadDataSet(List list) { pieDataset = new DefaultPieDataset(); dataset = new DefaultCategoryDataset(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java index b26b0deb76..52d45efb33 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java @@ -329,7 +329,6 @@ public class CalendarWindow extends Window implements EventListener, ITab } } - @SuppressWarnings({ "rawtypes", "unchecked" }) private void syncModel() { Hashtable ht = new Hashtable(); diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml index df6a40fdb4..70ead9efd4 100644 --- a/org.idempiere.p2.targetplatform/maven.locations.xml +++ b/org.idempiere.p2.targetplatform/maven.locations.xml @@ -1139,7 +1139,7 @@ Export-Package: *;version="${version}";-noimport:=true org.jfree jfreechart - 1.5.3 + 1.0.19 jar - + @@ -1279,7 +1279,7 @@ Export-Package: *;version="${version}";-noimport:=true org.jfree jfreechart - 1.5.3 + 1.0.19 jar