From: Keith Packard <keithp@keithp.com>
Date: Tue, 25 Feb 2025 23:12:40 +0000 (-0800)
Subject: altosuilib: Adapt to jfreechart 1.5.5 update
X-Git-Tag: 1.9.20~1^2~12
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=733e0269e3a33a6795e1b98d0e15a0a239610252;p=fw%2Faltos

altosuilib: Adapt to jfreechart 1.5.5 update

Incompatible changes require source updates.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index 46dc80f3..393c8cc6 100644
--- a/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.java
@@ -25,7 +25,7 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 75722d12..a31af5a2 100644
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.java
@@ -25,7 +25,7 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
diff --git a/altosuilib/AltosUIEnable.java b/altosuilib/AltosUIEnable.java
index 38069301..973117f3 100644
--- a/altosuilib/AltosUIEnable.java
+++ b/altosuilib/AltosUIEnable.java
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
 import java.util.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
diff --git a/altosuilib/AltosUIFlightSeries.java b/altosuilib/AltosUIFlightSeries.java
index 7e64cc2e..51f9c959 100644
--- a/altosuilib/AltosUIFlightSeries.java
+++ b/altosuilib/AltosUIFlightSeries.java
@@ -19,7 +19,7 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
diff --git a/altosuilib/AltosUIGraph.java b/altosuilib/AltosUIGraph.java
index 12176070..ca60e1a0 100644
--- a/altosuilib/AltosUIGraph.java
+++ b/altosuilib/AltosUIGraph.java
@@ -26,7 +26,7 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
@@ -155,7 +155,7 @@ public class AltosUIGraph implements AltosUnitsListener, AltosShapeListener {
 		chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
 				       plot, true);
 
-		ChartUtilities.applyCurrentTheme(chart);
+		ChartUtils.applyCurrentTheme(chart);
 
 		plot.setDomainGridlinePaint(gridline_color);
 		plot.setRangeGridlinePaint(gridline_color);
diff --git a/altosuilib/AltosUIGrapher.java b/altosuilib/AltosUIGrapher.java
index 9f5cd3f1..8310b1df 100644
--- a/altosuilib/AltosUIGrapher.java
+++ b/altosuilib/AltosUIGrapher.java
@@ -25,7 +25,7 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
diff --git a/altosuilib/AltosUILineStyle.java b/altosuilib/AltosUILineStyle.java
index 5b0238be..a7bdbf45 100644
--- a/altosuilib/AltosUILineStyle.java
+++ b/altosuilib/AltosUILineStyle.java
@@ -21,7 +21,7 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
diff --git a/altosuilib/AltosUIMarker.java b/altosuilib/AltosUIMarker.java
index 37ae2e85..3f112fae 100644
--- a/altosuilib/AltosUIMarker.java
+++ b/altosuilib/AltosUIMarker.java
@@ -25,7 +25,7 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
diff --git a/altosuilib/AltosUITimeSeries.java b/altosuilib/AltosUITimeSeries.java
index 63d5c057..80669c26 100644
--- a/altosuilib/AltosUITimeSeries.java
+++ b/altosuilib/AltosUITimeSeries.java
@@ -25,7 +25,7 @@ import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.altoslib_14.*;
 
-import org.jfree.ui.*;
+import org.jfree.chart.ui.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.*;
@@ -141,7 +141,7 @@ public class AltosUITimeSeries extends AltosTimeSeries implements AltosUIGrapher
 									   units.graph_units()),
 							     new java.text.DecimalFormat(time_example),
 							     new java.text.DecimalFormat(example));
-			renderer.setBaseToolTipGenerator(ttg);
+			renderer.setSeriesToolTipGenerator(0, ttg);
 		}
 		set_data();
 	}