Bump java lib versions in preparation for 1.9.2

[fw/altos] / altosuilib / AltosUIAxis.java

diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 40ee51615789f3d131bc1beb1f5d09dc729622a3..75722d12bea000c34de25414e356ac91e7feb3e7 100644 (file)
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.java
@@ -16,14 +16,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_14;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_14.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -36,12 +36,12 @@ import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
 public class AltosUIAxis extends NumberAxis {
-       String          label;
-       AltosUnits      units;
-       Color           color;
-       int             ref;
-       int             visible;
-       int             index;
+       String                  label;
+       AltosUnits              units;
+       AltosUILineStyle        line_style;
+       int                     ref;
+       int                     visible;
+       int                     index;
 
        public final static int axis_integer = 1;
        public final static int axis_include_zero = 2;
@@ -60,7 +60,6 @@ public class AltosUIAxis extends NumberAxis {
        }
 
        public void set_enable(boolean enable) {
-               System.out.printf("axis %s set enable visible %d ref %d\n", label, visible, ref);
                if (enable) {
                        visible++;
                        if (visible > ref)
@@ -83,21 +82,22 @@ public class AltosUIAxis extends NumberAxis {
                }
        }
 
-       public AltosUIAxis(String label, AltosUnits units, Color color, int index, int flags) {
+       public AltosUIAxis(String label, AltosUnits units, AltosUILineStyle line_style, int index, int flags) {
                this.label = label;
                this.units = units;
+               this.line_style = line_style;
                this.index = index;
                this.visible = 0;
                this.ref = 0;
-               setLabelPaint(color);
-               setTickLabelPaint(color);
+               setLabelPaint(line_style.color);
+               setTickLabelPaint(line_style.color);
                setVisible(false);
                if ((flags & axis_integer) != 0)
                        setStandardTickUnits(NumberAxis.createIntegerTickUnits());
                setAutoRangeIncludesZero((flags & axis_include_zero) != 0);
        }
 
-       public AltosUIAxis(String label, AltosUnits units, Color color, int index) {
-               this(label, units, color, index, axis_default);
+       public AltosUIAxis(String label, AltosUnits units, AltosUILineStyle line_style, int index) {
+               this(label, units, line_style, index, axis_default);
        }
 }