Changeset 12539 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
- Timestamp:
- 2017-07-30T01:00:55+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
r12303 r12539 137 137 * a JOSM session. Should have a listener listening to preference changes. 138 138 */ 139 private static volatile String DEFAULT_FONT_NAME;140 private static volatile Float DEFAULT_FONT_SIZE;139 private static volatile String defaultFontName; 140 private static volatile Float defaultFontSize; 141 141 private static final Object lock = new Object(); 142 142 143 143 // thread save access (double-checked locking) 144 144 private static Float getDefaultFontSize() { 145 Float s = DEFAULT_FONT_SIZE;145 Float s = defaultFontSize; 146 146 if (s == null) { 147 147 synchronized (lock) { 148 s = DEFAULT_FONT_SIZE;148 s = defaultFontSize; 149 149 if (s == null) { 150 DEFAULT_FONT_SIZE= s = (float) Main.pref.getInteger("mappaint.fontsize", 8);150 defaultFontSize = s = (float) Main.pref.getInteger("mappaint.fontsize", 8); 151 151 } 152 152 } … … 156 156 157 157 private static String getDefaultFontName() { 158 String n = DEFAULT_FONT_NAME;158 String n = defaultFontName; 159 159 if (n == null) { 160 160 synchronized (lock) { 161 n = DEFAULT_FONT_NAME;161 n = defaultFontName; 162 162 if (n == null) { 163 DEFAULT_FONT_NAME= n = Main.pref.get("mappaint.font", "Droid Sans");163 defaultFontName = n = Main.pref.get("mappaint.font", "Droid Sans"); 164 164 } 165 165 }
Note:
See TracChangeset
for help on using the changeset viewer.