altoslib: Move 'state_name' API to AltosCalData

That's where state lives.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index 7b16ae3911abb45ab30f767542dec8ddd80d33b5..98f6b5b1c06f47340e27df6d46c7222efebc9c8c 100644 (file)
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -247,6 +247,10 @@ public class AltosCalData {
 
        public int              state = AltosLib.MISSING;
 
+       public String state_name() {
+               return AltosLib.state_name(state);
+       }
+
        public void set_state(int state) {
                if (state >= AltosLib.ao_flight_boost && boost_tick == AltosLib.MISSING)
                        set_boost_tick();

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index 496235c3c843fa5f2595a6b74d7f12ced91f35bc..52aeb5d5d8a692c55142c23a94f3b7e385504ffc 100644 (file)
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -70,6 +70,10 @@ public abstract class AltosDataListener {
                return time;
        }
 
+       public String state_name() {
+               return cal_data().state_name();
+       }
+
        public void set_state(int state) {
                cal_data().set_state(state);
        }

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index b3bcff925cfe9ed390cbb0ae46ad4d0ebccfed0d..3ab2c0eb5dd4a4fdcefa95b4c60c7cb3922fdfdb 100644 (file)
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -860,10 +860,6 @@ public class AltosState extends AltosDataListener {
                }
        }
 
-       public String state_name() {
-               return AltosLib.state_name(state());
-       }
-
        public void set_state(int state) {
                super.set_state(state);
                ascent = (AltosLib.ao_flight_boost <= state() &&