have AltosGraph use new AltosPressure to get imperial_units working

[fw/altos] / altosuilib / AltosGraph.java

diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index ceb730f9cff062f86301835ecbf39655285f965d..2dbd1612cad13ffd10959720605a6107e6be996a 100644 (file)
--- a/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.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_9;
+package org.altusmetrum.altosuilib_11;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_9.*;
+import org.altusmetrum.altoslib_11.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -80,29 +81,6 @@ class AltosNsat extends AltosUnits {
        }
 }
 
-class AltosPressure extends AltosUnits {
-
-       public double value(double p, boolean imperial_units) {
-               return p;
-       }
-
-       public double inverse(double p, boolean imperial_units) {
-               return p;
-       }
-
-       public String show_units(boolean imperial_units) {
-               return "Pa";
-       }
-
-       public String say_units(boolean imperial_units) {
-               return "pascals";
-       }
-
-       public int show_fraction(int width, boolean imperial_units) {
-               return 0;
-       }
-}
-
 class AltosDbm extends AltosUnits {
 
        public double value(double d, boolean imperial_units) {