From: Mike Beattie <mike@ethernal.org>
Date: Thu, 13 Sep 2012 12:53:56 +0000 (+1200)
Subject: altosui/altoslib: Add call to …Preferences.init() with backend object, remove static... 
X-Git-Tag: 1.1.9.1~54^2~5
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=08345b8909922f2ff8f9ed8b4497b9cbea6b26e9

altosui/altoslib: Add call to …Preferences.init() with backend object, remove static init()

Signed-off-by: Mike Beattie <mike@ethernal.org>
---

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<AltosFontListener>();
 
 		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;
 	}