Merge remote-tracking branch 'mjb/altosui_mjb'

[fw/altos] / altosui / AltosUIPreferences.java

diff --git a/altosui/AltosUIPreferences.java b/altosui/AltosUIPreferences.java
index 38af734e696fbb321e660620605ec247beb21707..a026d12302a27af2beba13781f66b7aabb8709a2 100644 (file)
--- a/altosui/AltosUIPreferences.java
+++ b/altosui/AltosUIPreferences.java
@@ -19,12 +19,8 @@ package altosui;
 
 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;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosUIPreferences extends AltosPreferences {
@@ -58,7 +54,7 @@ public class AltosUIPreferences extends AltosPreferences {
 
                ui_listeners = new LinkedList<AltosUIListener>();
                serial_debug = preferences.getBoolean(serialDebugPreference, false);
-               AltosSerial.set_debug(serial_debug);
+               AltosLink.set_debug(serial_debug);
        }
 
        static { init(); }
@@ -102,15 +98,17 @@ public class AltosUIPreferences extends AltosPreferences {
                }
        }
        public static int font_size() {
-               return font_size;
+               synchronized (preferences) {
+                       return font_size;
+               }
        }
 
        static void set_fonts() {
        }
 
        public static void set_font_size(int new_font_size) {
-               font_size = new_font_size;
                synchronized (preferences) {
+                       font_size = new_font_size;
                        preferences.putInt(fontSizePreference, font_size);
                        flush_preferences();
                        Altos.set_fonts(font_size);
@@ -132,12 +130,12 @@ public class AltosUIPreferences extends AltosPreferences {
        }
 
        public static void set_look_and_feel(String new_look_and_feel) {
-               look_and_feel = new_look_and_feel;
                try {
-                       UIManager.setLookAndFeel(look_and_feel);
+                       UIManager.setLookAndFeel(new_look_and_feel);
                } catch (Exception e) {
                }
                synchronized(preferences) {
+                       look_and_feel = new_look_and_feel;
                        preferences.put(lookAndFeelPreference, look_and_feel);
                        flush_preferences();
                        for (AltosUIListener l : ui_listeners)
@@ -146,7 +144,9 @@ public class AltosUIPreferences extends AltosPreferences {
        }
 
        public static String look_and_feel() {
-               return look_and_feel;
+               synchronized (preferences) {
+                       return look_and_feel;
+               }
        }
 
        public static void register_ui_listener(AltosUIListener l) {
@@ -161,16 +161,18 @@ public class AltosUIPreferences extends AltosPreferences {
                }
        }
        public static void set_serial_debug(boolean new_serial_debug) {
-               serial_debug = new_serial_debug;
-               AltosSerial.set_debug(serial_debug);
+               AltosLink.set_debug(new_serial_debug);
                synchronized (preferences) {
+                       serial_debug = new_serial_debug;
                        preferences.putBoolean(serialDebugPreference, serial_debug);
                        flush_preferences();
                }
        }
 
        public static boolean serial_debug() {
-               return serial_debug;
+               synchronized (preferences) {
+                       return serial_debug;
+               }
        }
 
 }
\ No newline at end of file