altosui: Finish moving AltosConfigData to altoslib

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

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index e1950ba740b9eb1448fb76779e8ab4985209e94a..67e9ca73dd3f7293cb58fa213703f1c9b83d37dd 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -22,7 +22,6 @@ altosui_JAVA = \
        AltosChannelMenu.java \
        AltosCompanionInfo.java \
        AltosConfig.java \
-       AltosConfigData.java \
        AltosConfigFreqUI.java \
        AltosConfigUI.java \
        AltosConfigureUI.java \

diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
index 07eb14d8cee6afec98be01470bb4bf2de67d5e59..bb2efebfc27e7b90df5c3918a0712a346e5ade34 100644 (file)
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.io.*;
 import java.util.*;
@@ -81,7 +81,7 @@ public class AltosConfigData implements Iterable<String> {
 
        public int log_available() {
                switch (log_format) {
-               case Altos.AO_LOG_FORMAT_TINY:
+               case AltosLib.AO_LOG_FORMAT_TINY:
                        if (stored_flight == 0)
                                return 1;
                        return 0;