summaryrefslogtreecommitdiff
path: root/altoslib/AltosSpeed.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2013-05-16 00:36:23 -0600
committerBdale Garbee <bdale@gag.com>2013-05-16 00:36:23 -0600
commit02d111b1b53ef01fc6e9ab6c4bc60b8af1be0067 (patch)
tree8356f4a019969ee99a45e264c87d38555cf316cc /altoslib/AltosSpeed.java
parent7a2e1f05adad990a6b161865267abf07ffec7a7e (diff)
parent7699a55aed3a9a7daeb4c6a5a9a280f43edf455f (diff)
Merge branch 'branch-1.2' into debian
Diffstat (limited to 'altoslib/AltosSpeed.java')
-rw-r--r--altoslib/AltosSpeed.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index af63ed17..6fb624fb 100644
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -15,29 +15,29 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
public class AltosSpeed extends AltosUnits {
public double value(double v) {
if (AltosConvert.imperial_units)
- return AltosConvert.meters_to_feet(v);
+ return AltosConvert.meters_to_mph(v);
return v;
}
public String show_units() {
if (AltosConvert.imperial_units)
- return "ft/s";
+ return "mph";
return "m/s";
}
public String say_units() {
if (AltosConvert.imperial_units)
- return "feet per second";
+ return "miles per hour";
return "meters per second";
}
- int show_fraction(int width) {
+ public int show_fraction(int width) {
return width / 9;
}
} \ No newline at end of file