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 46dc80f36e02b56defd2fa5a99d0e430c8a04bfe..393c8cc6bb965c3cdd7f3a6e019e5e236a78ebe6 100644 (file)
--- 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 75722d12bea000c34de25414e356ac91e7feb3e7..a31af5a2891df2fa3f613742dcdfe6bb0c0f744d 100644 (file)
--- 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 3806930171b7513a2221059576043448cc97717f..973117f36430fab03349e41d73bb064e42cbdf83 100644 (file)
--- 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 7e64cc2e2a26230428fbb2838a942eab9f556ba7..51f9c959f961eef9d4a83620b5d4f7e6477c564d 100644 (file)
--- 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 12176070f50ac441dd967d0126bd76fb355a09de..ca60e1a04477a37aeba9dfb8aab6dc35a72f99ca 100644 (file)
--- 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 9f5cd3f16bbc0771ed0eb34d76e59fcedfbd3c02..8310b1df68de4a93804a35185bf3028c71fa703e 100644 (file)
--- 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 5b0238becf26b6f5d5abecfa4cf9c6a41ef1fca0..a7bdbf45ca0995cd5947f7ac571f02af08246881 100644 (file)
--- 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 37ae2e85c93bb31d8062f1025613f286c2b59fe0..3f112faed3d085f8f0d5399fe9063a8ee9f3494b 100644 (file)
--- 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 63d5c0574c5a9e1aa940f8ae43ab9ce5580906b5..80669c2685dda410f042117b240c81318fc70b06 100644 (file)
--- 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();
        }