Changeset 12539 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2017-07-30T01:00:55+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
r11453 r12539 47 47 * and for TMS imagery 48 48 */ 49 private static ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getNewThreadPoolExecutor("TMS-downloader-%d"); 50 49 private static final ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getNewThreadPoolExecutor("TMS-downloader-%d"); 51 50 52 51 private ThreadPoolExecutor downloadExecutor = DEFAULT_DOWNLOAD_JOB_DISPATCHER; -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r12481 r12539 206 206 } 207 207 208 private static Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();208 private static final Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>(); 209 209 210 210 /** -
trunk/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
r11129 r12539 30 30 * List of keys subject to URL validation. 31 31 */ 32 private static String[] URL_KEYS = new String[] {32 private static final String[] URL_KEYS = new String[] { 33 33 "url", "source:url", 34 34 "website", "contact:website", "heritage:website", "source:website" … … 38 38 * List of keys subject to email validation. 39 39 */ 40 private static String[] EMAIL_KEYS = new String[] {40 private static final String[] EMAIL_KEYS = new String[] { 41 41 "email", "contact:email" 42 42 }; -
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.