midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5361 : Jasper reports with Charts are not working (#1452) 

* IDEMPIERE-5361 : Jasper reports with Charts are not working

* IDEMPIERE-5361 : patch from hengsin
This commit is contained in:
Nicolas Micoud 2022-08-26 03:35:54 +02:00 committed by GitHub
parent 0034ebd517
commit d0d42ffaf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -125,6 +125,14 @@ Import-Package: com.google.zxing,
org.eclipse.core.runtime;version="3.4.0", org.eclipse.core.runtime;version="3.4.0",
org.eclipse.osgi.framework.console;version="1.1.0", org.eclipse.osgi.framework.console;version="1.1.0",
org.eclipse.osgi.service.datalocation, 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;version="2.1.0",
org.krysalis.barcode4j.impl;version="2.1.0", org.krysalis.barcode4j.impl;version="2.1.0",
org.krysalis.barcode4j.impl.upcean;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.poi.poi-ooxml;bundle-version="4.1.2",
wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0", wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0",
wrapped.org.jfree.jcommon;bundle-version="1.0.24", 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.http-client.google-http-client-gson;bundle-version="1.39.2",
wrapped.com.google.zxing.javase;bundle-version="3.4.1", wrapped.com.google.zxing.javase;bundle-version="3.4.1",
wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1", wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1",

2
org.adempiere.base/src/org/adempiere/apps/graph/ChartBuilder.java
View File

@ -153,7 +153,6 @@ public class ChartBuilder {
} }
} }
@SuppressWarnings({ "unchecked", "rawtypes" })
private void addData(MChartDatasource ds) { private void addData(MChartDatasource ds) {
String value = ds.getValueColumn(); String value = ds.getValueColumn();
@ -370,7 +369,6 @@ public class ChartBuilder {
return (IntervalXYDataset) dataset; return (IntervalXYDataset) dataset;
} }
@SuppressWarnings("rawtypes")
public PieDataset getPieDataset() { public PieDataset getPieDataset() {
dataset = new DefaultPieDataset(); dataset = new DefaultPieDataset();
loadData(); loadData();

2
org.adempiere.base/src/org/adempiere/apps/graph/GraphBuilder.java
View File

@ -45,7 +45,6 @@ public class GraphBuilder {
protected String m_Y_AxisLabel = "Y Axis"; protected String m_Y_AxisLabel = "Y Axis";
protected DefaultCategoryDataset dataset = new DefaultCategoryDataset(); protected DefaultCategoryDataset dataset = new DefaultCategoryDataset();
protected DefaultCategoryDataset linearDataset = new DefaultCategoryDataset(); protected DefaultCategoryDataset linearDataset = new DefaultCategoryDataset();
@SuppressWarnings("rawtypes")
protected DefaultPieDataset pieDataset = new DefaultPieDataset(); protected DefaultPieDataset pieDataset = new DefaultPieDataset();
private static final CLogger log = CLogger.getCLogger(GraphBuilder.class); private static final CLogger log = CLogger.getCLogger(GraphBuilder.class);
@ -251,7 +250,6 @@ public class GraphBuilder {
return list; return list;
} }
@SuppressWarnings({ "rawtypes", "unchecked" })
public void loadDataSet(List<GraphColumn> list) { public void loadDataSet(List<GraphColumn> list) {
pieDataset = new DefaultPieDataset(); pieDataset = new DefaultPieDataset();
dataset = new DefaultCategoryDataset(); dataset = new DefaultCategoryDataset();

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
View File

@ -329,7 +329,6 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
} }
} }
@SuppressWarnings({ "rawtypes", "unchecked" })
private void syncModel() { private void syncModel() {
Hashtable<String,BigDecimal> ht = new Hashtable<String,BigDecimal>(); Hashtable<String,BigDecimal> ht = new Hashtable<String,BigDecimal>();

2
org.idempiere.p2.targetplatform/maven.locations.xml
View File

@ -1139,7 +1139,7 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.jfree</groupId> <groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId> <artifactId>jfreechart</artifactId>
<version>1.5.3</version> <version>1.0.19</version>
<type>jar</type> <type>jar</type>
<instructions><![CDATA[Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion} <instructions><![CDATA[Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}} version: ${version_cleanup;${mvnVersion}}

4
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="idempiere-220525" sequenceNumber="1653486593"> <target name="idempiere-220825" sequenceNumber="1661415971">
<locations> <locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="zcommon" version="9.6.2"/> <unit id="zcommon" version="9.6.2"/>
@ -1279,7 +1279,7 @@ Export-Package: *;version="${version}";-noimport:=true
<location includeSource="true" missingManifest="generate" type="Maven"> <location includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.jfree</groupId> <groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId> <artifactId>jfreechart</artifactId>
<version>1.5.3</version> <version>1.0.19</version>
<type>jar</type> <type>jar</type>
<instructions><![CDATA[Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion} <instructions><![CDATA[Bundle-Name: Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
version: ${version_cleanup;${mvnVersion}} version: ${version_cleanup;${mvnVersion}}

2
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
View File

@ -1,5 +1,5 @@
target "idempiere-220525" target "idempiere-220825"
with source configurePhase allEnvironments with source configurePhase allEnvironments