Description: Adjust to newer jfreechart API
Author: Julien Plissonneau Duquène <sre4ever@free.fr>
Bug-Debian: https://bugs.debian.org/1099222
Forwarded: no
Last-Update: 2025-03-29

Some renaming and removals occured with newer releases of jfreechart.
--- a/src/ca/spaz/cron/metrics/BiomarkerPanel.java
+++ b/src/ca/spaz/cron/metrics/BiomarkerPanel.java
@@ -18,7 +18,7 @@
 import org.jfree.chart.renderer.xy.XYItemRenderer;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.data.time.*;
-import org.jfree.ui.RectangleInsets;
+import org.jfree.chart.ui.RectangleInsets;
 
 import ca.spaz.cron.user.UserManager;
 
@@ -86,7 +86,7 @@
    ///////////////////////////////////////////////////////////////////////////////////////////
    
    
-   private TimeSeries actualData = new TimeSeries("Weight", Minute.class);
+   private TimeSeries actualData = new TimeSeries("Weight"/*, Minute.class */);
    
    private void regenerateGraphData() {
       List metrics = UserManager.getCurrentUser().getBiometricsHistory().getMetricsOfType("Weight");
@@ -130,8 +130,8 @@
          XYItemRenderer r = plot.getRenderer();
          if (r instanceof XYLineAndShapeRenderer) {
             XYLineAndShapeRenderer renderer = (XYLineAndShapeRenderer) r;
-            renderer.setBaseShapesVisible(true);
-            renderer.setBaseShapesFilled(true);
+            renderer.setDefaultShapesVisible(true);
+            renderer.setDefaultShapesFilled(true);
          }
 
          DateAxis axis = (DateAxis) plot.getDomainAxis();
--- a/src/ca/spaz/cron/metrics/MetricChart.java
+++ b/src/ca/spaz/cron/metrics/MetricChart.java
@@ -19,7 +19,7 @@
 import org.jfree.chart.renderer.xy.XYItemRenderer;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.data.time.*;
-import org.jfree.ui.RectangleInsets;
+import org.jfree.chart.ui.RectangleInsets;
 
 import ca.spaz.cron.user.UserManager;
 import ca.spaz.gui.DateChooser;
@@ -78,7 +78,7 @@
     * @return The dataset.
     */
    private void createDataset() {
-      actualData = new TimeSeries(metricName, Day.class);
+      actualData = new TimeSeries(metricName);
       dataset = new TimeSeriesCollection();
       getData();
       dataset.addSeries(actualData);
@@ -139,8 +139,8 @@
       XYItemRenderer r = plot.getRenderer();
       if (r instanceof XYLineAndShapeRenderer) {
          XYLineAndShapeRenderer renderer = (XYLineAndShapeRenderer) r;
-         renderer.setBaseShapesVisible(true);
-         renderer.setBaseShapesFilled(true);
+         renderer.setDefaultShapesVisible(true);
+         renderer.setDefaultShapesFilled(true);
       }
 
       DateAxis axis = (DateAxis) plot.getDomainAxis();
--- a/src/ca/spaz/cron/metrics/MetricEditorOld.java
+++ b/src/ca/spaz/cron/metrics/MetricEditorOld.java
@@ -8,7 +8,7 @@
 
 import javax.swing.*;
 
-import org.jfree.ui.RefineryUtilities;
+import org.jfree.chart.ui.UIUtils;
 
 import ca.spaz.cron.CRONOMETER;
 import ca.spaz.cron.user.UserManager;
@@ -102,7 +102,7 @@
          chart.setBiomarker(biomarker);
          chart.pack();
          chart.setIconImage(CRONOMETER.getWindowIcon());
-         RefineryUtilities.centerFrameOnScreen(chart);
+         UIUtils.centerFrameOnScreen(chart);
          chart.setVisible(true);
       } catch (Exception e) {
          ErrorReporter.showError(e, this);