projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 10ab26c3f3ef79e2b06d11785d64bccb7fe6748e..8f1e45d93e5e48116ac077fe4ef1d8cf6f54ed90 100644
(file)
--- a/
altosui/AltosUIPreferences.java
+++ b/
altosui/AltosUIPreferences.java
@@
-102,15
+102,17
@@
public class AltosUIPreferences extends AltosPreferences {
}
}
public static int font_size() {
}
}
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) {
}
static void set_fonts() {
}
public static void set_font_size(int new_font_size) {
- font_size = new_font_size;
synchronized (preferences) {
synchronized (preferences) {
+ font_size = new_font_size;
preferences.putInt(fontSizePreference, font_size);
flush_preferences();
Altos.set_fonts(font_size);
preferences.putInt(fontSizePreference, font_size);
flush_preferences();
Altos.set_fonts(font_size);
@@
-132,12
+134,12
@@
public class AltosUIPreferences extends AltosPreferences {
}
public static void set_look_and_feel(String new_look_and_feel) {
}
public static void set_look_and_feel(String new_look_and_feel) {
- look_and_feel = new_look_and_feel;
try {
try {
- UIManager.setLookAndFeel(look_and_feel);
+ UIManager.setLookAndFeel(
new_
look_and_feel);
} catch (Exception e) {
}
synchronized(preferences) {
} 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)
preferences.put(lookAndFeelPreference, look_and_feel);
flush_preferences();
for (AltosUIListener l : ui_listeners)
@@
-146,7
+148,9
@@
public class AltosUIPreferences extends AltosPreferences {
}
public static String look_and_feel() {
}
public static String look_and_feel() {
- return look_and_feel;
+ synchronized (preferences) {
+ return look_and_feel;
+ }
}
public static void register_ui_listener(AltosUIListener l) {
}
public static void register_ui_listener(AltosUIListener l) {
@@
-161,16
+165,18
@@
public class AltosUIPreferences extends AltosPreferences {
}
}
public static void set_serial_debug(boolean new_serial_debug) {
}
}
public static void set_serial_debug(boolean new_serial_debug) {
- serial_debug = new_serial_debug;
- AltosLink.set_debug(serial_debug);
+ AltosLink.set_debug(new_serial_debug);
synchronized (preferences) {
synchronized (preferences) {
+ serial_debug = new_serial_debug;
preferences.putBoolean(serialDebugPreference, serial_debug);
flush_preferences();
}
}
public static boolean serial_debug() {
preferences.putBoolean(serialDebugPreference, serial_debug);
flush_preferences();
}
}
public static boolean serial_debug() {
- return serial_debug;
+ synchronized (preferences) {
+ return serial_debug;
+ }
}
}
\ No newline at end of file
}
}
\ No newline at end of file