Merge remote-tracking branch 'mjb/altosui_mjb'

[fw/altos] / altosui / AltosUIPreferences.java

diff --git a/altosui/AltosUIPreferences.java b/altosui/AltosUIPreferences.java
index da6c39689614c9f8db4f9ae4e424fce1d7546031..a026d12302a27af2beba13781f66b7aabb8709a2 100644 (file)
--- a/altosui/AltosUIPreferences.java
+++ b/altosui/AltosUIPreferences.java
@@ -19,16 +19,11 @@ 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.*;
 
-/* import org.altusmetrum.AltosLib.*; */
-
-class AltosUIPreferences extends AltosPreferences {
+public class AltosUIPreferences extends AltosPreferences {
 
        /* font size preferences name */
        final static String fontSizePreference = "FONT-SIZE";
@@ -47,6 +42,9 @@ class AltosUIPreferences extends AltosPreferences {
 
        static String look_and_feel = null;
 
+       /* Serial debug */
+       static boolean serial_debug;
+
        public static void init() {
                font_listeners = new LinkedList<AltosFontListener>();
 
@@ -55,6 +53,8 @@ class AltosUIPreferences extends AltosPreferences {
                look_and_feel = preferences.get(lookAndFeelPreference, UIManager.getSystemLookAndFeelClassName());
 
                ui_listeners = new LinkedList<AltosUIListener>();
+               serial_debug = preferences.getBoolean(serialDebugPreference, false);
+               AltosLink.set_debug(serial_debug);
        }
 
        static { init(); }
@@ -98,15 +98,17 @@ 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);
@@ -128,12 +130,12 @@ 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)
@@ -142,7 +144,9 @@ 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) {
@@ -156,4 +160,19 @@ class AltosUIPreferences extends AltosPreferences {
                        ui_listeners.remove(l);
                }
        }
+       public static void set_serial_debug(boolean new_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() {
+               synchronized (preferences) {
+                       return serial_debug;
+               }
+       }
+
 }
\ No newline at end of file