X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIAxis.java;h=fe94f161f5543beb81494080757e0af0bc4be76e;hb=28a2db68e4806383cfaa7075d454c35cade9633a;hp=89f5493bd38910d55126262291390f82537cd124;hpb=4231d68bae69d9a7d1f52205002db452cd5f986d;p=fw%2Faltos

diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 89f5493b..fe94f161 100644
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,14 +16,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_6;
+package org.altusmetrum.altosuilib_12;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_12.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -48,11 +49,14 @@ public class AltosUIAxis extends NumberAxis {
 	public final static int axis_default = axis_include_zero;
 
 	public void set_units() {
-		String u = units.show_units();
-		if (u != null)
-			setLabel(String.format("%s (%s)", label, u));
-		else
-			setLabel(label);
+		if (units != null) {
+			String u = units.parse_units();
+			if (u != null) {
+				setLabel(String.format("%s (%s)", label, u));
+				return;
+			}
+		}
+		setLabel(label);
 	}
 
 	public void set_enable(boolean enable) {