Skip to content

Bump jfreechart from 1.0.19 to 1.5.6 #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump jfreechart from 1.0.19 to 1.5.6 #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jsprit-analysis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>1.0.19</version>
<version>1.5.6</version>
</dependency>

<dependency>
Expand Down
16 changes: 8 additions & 8 deletions jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
import org.jfree.chart.renderer.xy.XYItemRenderer;
import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
import org.jfree.chart.title.LegendTitle;
import org.jfree.chart.ui.RectangleEdge;
import org.jfree.chart.util.ShapeUtils;
import org.jfree.data.Range;
import org.jfree.data.xy.XYDataItem;
import org.jfree.data.xy.XYSeries;
import org.jfree.data.xy.XYSeriesCollection;
import org.jfree.ui.RectangleEdge;
import org.jfree.util.ShapeUtilities;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -90,7 +90,7 @@ private static class MyActivityRenderer extends XYLineAndShapeRenderer {
public Shape getItemShape(int seriesIndex, int itemIndex) {
XYDataItem dataItem = seriesCollection.getSeries(seriesIndex).getDataItem(itemIndex);
if (firstActivities.contains(dataItem)) {
return ShapeUtilities.createUpTriangle(4.0f);
return ShapeUtils.createUpTriangle(4.0f);
}
return ELLIPSE;
}
Expand Down Expand Up @@ -331,7 +331,7 @@ public LegendItemCollection getLegendItems() {
}
if (routes != null) {
LegendItem item = new LegendItem("firstActivity", Color.BLACK);
Shape upTriangle = ShapeUtilities.createUpTriangle(3.0f);
Shape upTriangle = ShapeUtils.createUpTriangle(3.0f);
item.setShape(upTriangle);
item.setOutlinePaint(Color.BLACK);

Expand Down Expand Up @@ -377,12 +377,12 @@ private XYItemRenderer getShipmentRenderer(XYSeriesCollection shipments) {

private MyActivityRenderer getProblemRenderer(final XYSeriesCollection problem) {
MyActivityRenderer problemRenderer = new MyActivityRenderer(problem, activitiesByDataItem, firstActivities);
problemRenderer.setBaseItemLabelGenerator((arg0, arg1, arg2) -> {
problemRenderer.setDefaultItemLabelGenerator((arg0, arg1, arg2) -> {
XYDataItem item = problem.getSeries(arg1).getDataItem(arg2);
return labelsByDataItem.get(item);
});
problemRenderer.setBaseItemLabelsVisible(true);
problemRenderer.setBaseItemLabelPaint(Color.BLACK);
problemRenderer.setDefaultItemLabelsVisible(true);
problemRenderer.setDefaultItemLabelPaint(Color.BLACK);

return problemRenderer;
}
Expand Down Expand Up @@ -446,7 +446,7 @@ private XYItemRenderer getRouteRenderer(XYSeriesCollection solutionColl) {

private void save(JFreeChart chart, String pngFile) {
try {
ChartUtilities.saveChartAsPNG(new File(pngFile), chart, 1000, 600);
ChartUtils.saveChartAsPNG(new File(pngFile), chart, 1000, 600);
} catch (IOException e) {
log.error("cannot plot");
log.error(e.toString());
Expand Down
4 changes: 2 additions & 2 deletions ...it-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/XYLineChartBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.graphhopper.jsprit.analysis.toolbox;

import org.jfree.chart.ChartFactory;
import org.jfree.chart.ChartUtilities;
import org.jfree.chart.ChartUtils;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.plot.XYPlot;
Expand All @@ -43,7 +43,7 @@ public class XYLineChartBuilder {
*/
public static void saveChartAsPNG(JFreeChart chart, String pngFilename) {
try {
ChartUtilities.saveChartAsPNG(new File(pngFilename), chart, 1000, 600);
ChartUtils.saveChartAsPNG(new File(pngFilename), chart, 1000, 600);
} catch (IOException e) {
e.printStackTrace();
}
Expand Down