|
@@ -30,6 +30,7 @@ import com.google.common.collect.Lists;
|
30
|
30
|
|
31
|
31
|
import java.awt.Font;
|
32
|
32
|
import java.awt.GraphicsEnvironment;
|
|
33
|
+import java.util.ArrayList;
|
33
|
34
|
import java.util.List;
|
34
|
35
|
|
35
|
36
|
import javax.swing.DefaultComboBoxModel;
|
|
@@ -59,7 +60,7 @@ public class FontPicker extends JComboBox<Object> {
|
59
|
60
|
this.fontFamily = fontFamily;
|
60
|
61
|
|
61
|
62
|
setRenderer(new FontListCellRenderer(getRenderer()));
|
62
|
|
- UIUtilities.<String[]>invokeOffEDT(eventBus, this::getFonts, this::loadFonts);
|
|
63
|
+ UIUtilities.invokeOffEDT(eventBus, this::getFonts, this::loadFonts);
|
63
|
64
|
}
|
64
|
65
|
|
65
|
66
|
/**
|
|
@@ -67,7 +68,7 @@ public class FontPicker extends JComboBox<Object> {
|
67
|
68
|
*
|
68
|
69
|
* @param fonts Fonts to load
|
69
|
70
|
*/
|
70
|
|
- private void loadFonts(final String... fonts) {
|
|
71
|
+ private void loadFonts(final List<String> fonts) {
|
71
|
72
|
checkNotNull(fonts);
|
72
|
73
|
final int size = getFont() == null ? 12 : getFont().getSize();
|
73
|
74
|
for (final String font : fonts) {
|
|
@@ -77,8 +78,12 @@ public class FontPicker extends JComboBox<Object> {
|
77
|
78
|
}
|
78
|
79
|
|
79
|
80
|
private List<String> getFonts() {
|
80
|
|
- return Lists.newArrayList(GraphicsEnvironment.getLocalGraphicsEnvironment()
|
81
|
|
- .getAvailableFontFamilyNames());
|
|
81
|
+ final String[] fonts = GraphicsEnvironment.getLocalGraphicsEnvironment()
|
|
82
|
+ .getAvailableFontFamilyNames();
|
|
83
|
+ if (fonts == null) {
|
|
84
|
+ return new ArrayList<>();
|
|
85
|
+ }
|
|
86
|
+ return Lists.newArrayList(fonts);
|
82
|
87
|
}
|
83
|
88
|
|
84
|
89
|
}
|