From 08345b8909922f2ff8f9ed8b4497b9cbea6b26e9 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Fri, 14 Sep 2012 00:53:56 +1200 Subject: [PATCH] =?utf8?q?altosui/altoslib:=20Add=20call=20to=20=E2=80=A6P?= =?utf8?q?references.init()=20with=20backend=20object,=20remove=20static?= =?utf8?q?=20init()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Mike Beattie --- altoslib/AltosPreferences.java | 6 ++---- altosui/AltosUI.java | 1 + altosui/AltosUIPreferences.java | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java index ef30f8e9..a82ea3f6 100644 --- a/altoslib/AltosPreferences.java +++ b/altoslib/AltosPreferences.java @@ -137,8 +137,8 @@ public class AltosPreferences { public static int launcher_channel; - public static void init() { - //preferences = Preferences.userRoot().node("/org/altusmetrum/altosui"); + public static void init(AltosPreferencesBackend in_backend) { + backend = in_backend; /* Initialize logdir from preferences */ String logdir_string = backend.getString(logdirPreference, null); @@ -179,8 +179,6 @@ public class AltosPreferences { AltosConvert.imperial_units = backend.getBoolean(unitsPreference, false); } - static { init(); } - public static void flush_preferences() { backend.flush(); } diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index b5cbefe7..52b6b128 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -98,6 +98,7 @@ public class AltosUI extends AltosFrame { load_library(null); + AltosUIPreferences.init(new AltosUIPreferencesBackend()); AltosUIPreferences.set_component(this); pane = getContentPane(); diff --git a/altosui/AltosUIPreferences.java b/altosui/AltosUIPreferences.java index 6e4c9097..c1087dd6 100644 --- a/altosui/AltosUIPreferences.java +++ b/altosui/AltosUIPreferences.java @@ -45,7 +45,9 @@ public class AltosUIPreferences extends AltosPreferences { /* Serial debug */ static boolean serial_debug; - public static void init() { + public static void init(AltosUIPreferencesBackend in_backend) { + super(in_backend); + font_listeners = new LinkedList(); font_size = backend.getInt(fontSizePreference, Altos.font_size_medium); @@ -57,8 +59,6 @@ public class AltosUIPreferences extends AltosPreferences { AltosLink.set_debug(serial_debug); } - static { init(); } - static void set_component(Component in_component) { component = in_component; } -- 2.30.2