Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosui / AltosUIPreferences.java

diff --git a/altosui/AltosUIPreferences.java b/altosui/AltosUIPreferences.java
index c1087dd6a5de7decab800a958fc7003d6f35e0bb..9c56d0318e35eb26372e7554e7d27086640d3f52 100644 (file)
--- a/altosui/AltosUIPreferences.java
+++ b/altosui/AltosUIPreferences.java
@@ -22,6 +22,7 @@ import java.util.*;
 import java.awt.Component;
 import javax.swing.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
 public class AltosUIPreferences extends AltosPreferences {
 
@@ -45,8 +46,8 @@ public class AltosUIPreferences extends AltosPreferences {
        /* Serial debug */
        static boolean serial_debug;
 
-       public static void init(AltosUIPreferencesBackend in_backend) {
-               super(in_backend);
+       public static void init() {
+               AltosPreferences.init(new AltosUIPreferencesBackend());
 
                font_listeners = new LinkedList<AltosFontListener>();
 
@@ -59,6 +60,8 @@ public class AltosUIPreferences extends AltosPreferences {
                AltosLink.set_debug(serial_debug);
        }
 
+       static { init(); }
+
        static void set_component(Component in_component) {
                component = in_component;
        }
@@ -161,7 +164,7 @@ public class AltosUIPreferences extends AltosPreferences {
                }
        }
        public static void set_serial_debug(boolean new_serial_debug) {
-               AltosLink.set_debug(serial_debug);
+               AltosLink.set_debug(new_serial_debug);
                synchronized (backend) {
                        serial_debug = new_serial_debug;
                        backend.putBoolean(serialDebugPreference, serial_debug);