altoslib: Add imperial units conversion support

[fw/altos] / altoslib / AltosPreferences.java

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 43c7088df46076cbfb69d0021d35bbd5b85aa0a8..065b6e997cadfc4d3cc5c00043494039bc735a20 100644 (file)
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -19,11 +19,7 @@ package org.altusmetrum.AltosLib;
 
 import java.io.*;
 import java.util.*;
-import java.text.*;
 import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.awt.Component;
-import javax.swing.*;
 import javax.swing.filechooser.FileSystemView;
 
 public class AltosPreferences {
@@ -97,6 +93,10 @@ public class AltosPreferences {
        public final static String      frequency_format = "FREQUENCY-%d";
        public final static String      description_format = "DESCRIPTION-%d";
 
+       /* Units preference */
+
+       public final static String      unitsPreference = "IMPERIAL-UNITS";
+
        public static AltosFrequency[] load_common_frequencies() {
                AltosFrequency[] frequencies = null;
                boolean existing = false;
@@ -180,6 +180,7 @@ public class AltosPreferences {
 
                common_frequencies = load_common_frequencies();
 
+               AltosConvert.imperial_units = preferences.getBoolean(unitsPreference, false);
        }
 
        static { init(); }
@@ -306,7 +307,6 @@ public class AltosPreferences {
 
        public static void set_launcher_serial(int new_launcher_serial) {
                launcher_serial = new_launcher_serial;
-               System.out.printf("set launcher serial to %d\n", new_launcher_serial);
                synchronized (preferences) {
                        preferences.putInt(launcherSerialPreference, launcher_serial);
                        flush_preferences();
@@ -319,7 +319,6 @@ public class AltosPreferences {
 
        public static void set_launcher_channel(int new_launcher_channel) {
                launcher_channel = new_launcher_channel;
-               System.out.printf("set launcher channel to %d\n", new_launcher_channel);
                synchronized (preferences) {
                        preferences.putInt(launcherChannelPreference, launcher_channel);
                        flush_preferences();
@@ -362,4 +361,16 @@ public class AltosPreferences {
                        new_frequencies[i+1] = common_frequencies[i];
                set_common_frequencies(new_frequencies);
        }
+
+       public static boolean imperial_units() {
+               return AltosConvert.imperial_units;
+       }
+
+       public static void set_imperial_units(boolean imperial_units) {
+               AltosConvert.imperial_units = imperial_units;
+               synchronized (preferences) {
+                       preferences.putBoolean(unitsPreference, imperial_units);
+                       flush_preferences();
+               }
+       }
 }