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 cfe453022f5082b028497ab2d36e92e0dd62a5a1..4005d16dda97cda51aaee9fc694c30d59965eb4c 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -22,7 +22,6 @@ altosui_JAVA = \
        AltosChannelMenu.java \
        AltosCompanionInfo.java \
        AltosConfig.java \
        AltosChannelMenu.java \
        AltosCompanionInfo.java \
        AltosConfig.java \

-       AltosConfigData.java \

        AltosConfigFreqUI.java \
        AltosConfigUI.java \
        AltosConfigureUI.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 0bc5d5a80a8b9ca1659ba3b8c18308b0d2c8c5c6..fec1a04254feace44db8cb66f799d79aca69cade 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.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package altosui;
+package org.altusmetrum.AltosLib;

 
 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;


@@ -82,7 +82,7 @@ public class AltosConfigData implements Iterable<String> {
 
        public int log_available() {
                switch (log_format) {
 
        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;
                        if (stored_flight == 0)
                                return 1;
                        return 0;