Use Option to simplify logic

Author: dcbriccetti

desktop/src/main/scala/org/talkingpuffin/ui/util/DesktopUtil.scala

@@ -12,7 +12,7 @@ import org.talkingpuffin.util.Loggable
 object DesktopUtil extends Loggable {
   private case class Browse(uri: String)
 
-  private val browser = actorOf(new Actor() {
+  private lazy val browser = actorOf(new Actor() {
     def receive = {
       case browse: Browse => {
         info("Before desktop.browse")
@@ -22,16 +22,15 @@ object DesktopUtil extends Loggable {
     }
   }).start()
 
-  private val trayIcon: TrayIcon = SystemTray.isSupported match {
-    case true =>
+  private lazy val trayIcon: Option[TrayIcon] =
+    if (SystemTray.isSupported) {
       val icon = new TrayIcon(new ImageIcon(getClass.getResource("/TalkingPuffin_16.png")).getImage,Main.title)
       SystemTray.getSystemTray.add(icon)
-      icon
-    case _ => null
-  }
+      Some(icon)
+    } else None
 
   def browse(uri: String) = if (Desktop.isDesktopSupported) browser ! Browse(uri)
 
-  def notify(message: String, header: String) = if (SystemTray.isSupported) 
-    trayIcon.displayMessage(header, message, TrayIcon.MessageType.INFO)
+  def notify(message: String, header: String) =
+    trayIcon.foreach(_.displayMessage(header, message, TrayIcon.MessageType.INFO))
 }