projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mjb/prefs_interface'
[fw/altos]
/
altoslib
/
AltosPreferences.java
diff --git
a/altoslib/AltosPreferences.java
b/altoslib/AltosPreferences.java
index ef30f8e92fd81549ddb016ef1783c6610725435b..a82ea3f67f0e4ba5229a5dc6d2abb0314c9ab663 100644
(file)
--- a/
altoslib/AltosPreferences.java
+++ b/
altoslib/AltosPreferences.java
@@
-137,8
+137,8
@@
public class AltosPreferences {
public static int launcher_channel;
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);
/* 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);
}
AltosConvert.imperial_units = backend.getBoolean(unitsPreference, false);
}
- static { init(); }
-
public static void flush_preferences() {
backend.flush();
}
public static void flush_preferences() {
backend.flush();
}