Bump java library versions

[fw/altos] / altosuilib / AltosUISeries.java

diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index ff430d1a1384820983d3c2cade3fe9364af71a57..3a1dde03c73c24a76367c5210085f3a2824a9b6d 100644 (file)
--- a/altosuilib/AltosUISeries.java
+++ b/altosuilib/AltosUISeries.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_11;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_11.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -35,17 +35,21 @@ import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
 class AltosUITime extends AltosUnits {
-       public double value(double v) { return v; }
-       public String show_units() { return "s"; }
-       public String say_units() { return "seconds"; }
+       public double value(double v, boolean imperial_units) { return v; }
 
-       public int show_fraction(int width) {
+       public double inverse(double v, boolean imperial_unis) { return v; }
+
+       public String show_units(boolean imperial_units) { return "s"; }
+
+       public String say_units(boolean imperial_units) { return "seconds"; }
+
+       public int show_fraction(int width, boolean imperial_units) {
                if (width < 5)
                        return 0;
                return width - 5;
        }
 
-       public int say_fraction() { return 0; }
+       public int say_fraction(boolean imperial_units) { return 0; }
 }
 
 public class AltosUISeries extends XYSeries implements AltosUIGrapher {
@@ -56,7 +60,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
        XYItemRenderer  renderer;
        int             fetch;
        boolean         enable;
-       
+
        public void set_units() {
                axis.set_units();
                StandardXYToolTipGenerator      ttg;
@@ -65,7 +69,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
                String  example = units.graph_format(7);
 
                ttg = new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})",
-                                                                  units.show_units()),
+                                                                  units.graph_units()),
                                                     new java.text.DecimalFormat(time_example),
                                                     new java.text.DecimalFormat(example));
                renderer.setBaseToolTipGenerator(ttg);
@@ -81,7 +85,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
 
        public void add(AltosUIDataPoint dataPoint) {
                try {
-                       super.add(dataPoint.x(), units.value(dataPoint.y(fetch)));
+                       super.add(dataPoint.x(), units.graph_value(dataPoint.y(fetch)));
                } catch (AltosUIDataMissing dm) {
                }
        }
@@ -100,6 +104,7 @@ public class AltosUISeries extends XYSeries implements AltosUIGrapher {
 
                renderer = new XYLineAndShapeRenderer(true, false);
                renderer.setSeriesPaint(0, color);
+               renderer.setSeriesStroke(0, new BasicStroke(2, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
                renderer.setSeriesVisible(0, enable);
                set_units();
        }