Merge pull request #402 from greboid/dev3

Potentially fix NPE in FontPicker.

ui_swing/src/com/dmdirc/addons/ui_swing/components/FontPicker.java

@@ -26,13 +26,19 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.renderers.FontListCellRenderer;
 
+import com.google.common.collect.Lists;
+
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.MutableComboBoxModel;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * System font picking component.
  */
@@ -54,9 +60,7 @@ public class FontPicker extends JComboBox<Object> {
         this.fontFamily = fontFamily;
 
         setRenderer(new FontListCellRenderer(getRenderer()));
-        UIUtilities.<String[]>invokeOffEDT(eventBus,
-                () -> GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames(),
-                this::loadFonts);
+        UIUtilities.invokeOffEDT(eventBus, this::getFonts, this::loadFonts);
     }
 
     /**
@@ -64,12 +68,22 @@ public class FontPicker extends JComboBox<Object> {
      *
      * @param fonts Fonts to load
      */
-    private void loadFonts(final String... fonts) {
-        final int size = getFont().getSize();
+    private void loadFonts(final List<String> fonts) {
+        checkNotNull(fonts);
+        final int size = getFont() == null ? 12 : getFont().getSize();
         for (final String font : fonts) {
             ((MutableComboBoxModel<Object>) getModel()).addElement(new Font(font, Font.PLAIN, size));
         }
         setSelectedItem(new Font(fontFamily, Font.PLAIN, size));
     }
 
+    private List<String> getFonts() {
+        final String[] fonts = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                .getAvailableFontFamilyNames();
+        if (fonts == null) {
+            return new ArrayList<>();
+        }
+        return Lists.newArrayList(fonts);
+    }
+
 }