Merge remote-tracking branch 'mjb/altoslib_mjb'

[fw/altos] / altosui / AltosFlightStatsTable.java

diff --git a/altosui/AltosFlightStatsTable.java b/altosui/AltosFlightStatsTable.java
index 3fecf921f1adf91c3d4e621f733ce239fdace238..14e3bf8f71ab7a995c9e3cab39443261768ca71d 100644 (file)
--- a/altosui/AltosFlightStatsTable.java
+++ b/altosui/AltosFlightStatsTable.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosFlightStatsTable extends JComponent {
        GridBagLayout   layout;
@@ -86,7 +87,7 @@ public class AltosFlightStatsTable extends JComponent {
                               String.format("%5.0f ft/s", AltosConvert.meters_to_feet(stats.max_speed)),
                               String.format("Mach %5.3f", AltosConvert.meters_to_mach(stats.max_speed)));
                if (stats.max_acceleration != AltosRecord.MISSING) {
-                       new FlightStat(layout, y++, "Maximum acceleration",
+                       new FlightStat(layout, y++, "Maximum boost acceleration",
                                       String.format("%5.0f m/s²", stats.max_acceleration),
                                       String.format("%5.0f ft/s²", AltosConvert.meters_to_feet(stats.max_acceleration)),
                                       String.format("%5.2f G", AltosConvert.meters_to_g(stats.max_acceleration)));
@@ -102,7 +103,7 @@ public class AltosFlightStatsTable extends JComponent {
                               String.format("%5.0f m/s", stats.state_baro_speed[Altos.ao_flight_main]),
                               String.format("%5.0f ft/s", AltosConvert.meters_to_feet(stats.state_baro_speed[Altos.ao_flight_main])));
                for (int s = Altos.ao_flight_boost; s <= Altos.ao_flight_main; s++) {
-                       new FlightStat(layout, y++, String.format("%s time", Altos.state_to_string_capital[s]),
+                       new FlightStat(layout, y++, String.format("%s time", AltosLib.state_name_capital(s)),
                                       String.format("%6.2f s", stats.state_end[s] - stats.state_start[s]));
                }
                new FlightStat(layout, y++, "Flight Time",