Merge remote-tracking branch 'mjb/altoslib_mjb'

diff --combined altoslib/AltosConfigData.java
index c143036c1a9e13ecc05837631ebb66d7b42a2966,c6e92e620d16b39e5ed3fe4e11f5a6b342f5ff3a..6f343639e72680120b6c064f4e82db4fa188ae28
--- 1/altoslib/AltosConfigData.java
--- 2/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@@ -17,12 -17,9 +17,9 @@@
  
  package org.altusmetrum.AltosLib;
  
- import java.io.*;
  import java.util.*;
  import java.text.*;
- import java.util.prefs.*;
  import java.util.concurrent.*;
- import org.altusmetrum.AltosLib.*;
  
  public class AltosConfigData implements Iterable<String> {
  
@@@ -170,7 -167,6 +167,7 @@@
                        try { callsign = get_string(line, "Callsign:"); } catch (Exception e) {}
                        try { version = get_string(line,"software-version"); } catch (Exception e) {}
                        try { product = get_string(line,"product"); } catch (Exception e) {}
 +                      try { manufacturer = get_string(line,"manufacturer"); } catch (Exception e) {}
  
                        try { get_int(line, "flight"); stored_flight++; }  catch (Exception e) {}
                        try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}

diff --combined altoslib/AltosLib.java
index d36b2ff789a313499c7655b5175ab1318548e09f,8d383f1219498def39161c055dbe7c4e5b530073..192c445e0c42dabe2b9e3c42a209fe8843e9269c
--- 1/altoslib/AltosLib.java
--- 2/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@@ -17,9 -17,7 +17,7 @@@
  
  package org.altusmetrum.AltosLib;
  
- import java.awt.*;
  import java.util.*;
- import java.text.*;
  import java.io.*;
  import java.nio.charset.Charset;
  
@@@ -111,7 -109,7 +109,7 @@@ public class AltosLib 
        public static final int ao_telemetry_0_8 = 3;
        public static final int ao_telemetry_max = 3;
  
 -      public static final String[] ao_telemetry_name = {
 +      private static final String[] ao_telemetry_name = {
                "Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
        };
  
@@@ -121,13 -119,13 +119,13 @@@
        public static final int ao_telemetry_0_9_len = 95;
        public static final int ao_telemetry_0_8_len = 94;
  
 -      public static final int[] ao_telemetry_len = {
 +      private static final int[] ao_telemetry_len = {
                0, 32, 95, 94
        };
  
 -      public static HashMap<String,Integer>   string_to_state = new HashMap<String,Integer>();
 +      private static HashMap<String,Integer>  string_to_state = new HashMap<String,Integer>();
  
 -      public static boolean map_initialized = false;
 +      private static boolean map_initialized = false;
  
        public static void initialize_map()
        {
@@@ -159,7 -157,7 +157,7 @@@
                                                                 telemetry));
        }
        
 -      public static String[] state_to_string = {
 +      private static String[] state_to_string = {
                "startup",
                "idle",
                "pad",
@@@ -172,7 -170,7 +170,7 @@@
                "invalid",
        };
  
 -      public static String[] state_to_string_capital = {
 +      private static String[] state_to_string_capital = {
                "Startup",
                "Idle",
                "Pad",
@@@ -199,12 -197,6 +197,12 @@@
                return state_to_string[state];
        }
  
 +      public static String state_name_capital(int state) {
 +              if (state < 0 || state_to_string.length <= state)
 +                      return "invalid";
 +              return state_to_string_capital[state];
 +      }
 +
        public static final int AO_GPS_VALID = (1 << 4);
        public static final int AO_GPS_RUNNING = (1 << 5);
        public static final int AO_GPS_DATE_VALID = (1 << 6);