From 0fb5caa7ba97adddb67397d388af8c303a046a63 Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Mon, 3 Nov 2014 19:29:01 +0100
Subject: [PATCH] Rename AWTSystemTray=>SystemTray and remove statics

---
 src/main/java/io/bitsquare/BitsquareUI.java   |  8 ++--
 .../{AWTSystemTray.java => SystemTray.java}   | 38 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)
 rename src/main/java/io/bitsquare/gui/{AWTSystemTray.java => SystemTray.java} (79%)

diff --git a/src/main/java/io/bitsquare/BitsquareUI.java b/src/main/java/io/bitsquare/BitsquareUI.java
index b9c7b24a4a..7815a51d09 100644
--- a/src/main/java/io/bitsquare/BitsquareUI.java
+++ b/src/main/java/io/bitsquare/BitsquareUI.java
@@ -18,7 +18,7 @@
 package io.bitsquare;
 
 import io.bitsquare.di.BitsquareModule;
-import io.bitsquare.gui.AWTSystemTray;
+import io.bitsquare.gui.SystemTray;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.ImageUtil;
@@ -110,12 +110,12 @@ public class BitsquareUI extends Application {
 
         // configure the system tray
 
-        AWTSystemTray.createSystemTray(primaryStage, injector.getInstance(ActorSystem.class), this);
-        primaryStage.setOnCloseRequest(e -> AWTSystemTray.setStageHidden());
+        SystemTray systemTray = new SystemTray(primaryStage, injector.getInstance(ActorSystem.class), this);
+        primaryStage.setOnCloseRequest(e -> systemTray.setStageHidden());
         KeyCodeCombination keyCodeCombination = new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN);
         scene.setOnKeyReleased(keyEvent -> {
             if (keyCodeCombination.match(keyEvent))
-                AWTSystemTray.setStageHidden();
+                systemTray.setStageHidden();
         });
 
 
diff --git a/src/main/java/io/bitsquare/gui/AWTSystemTray.java b/src/main/java/io/bitsquare/gui/SystemTray.java
similarity index 79%
rename from src/main/java/io/bitsquare/gui/AWTSystemTray.java
rename to src/main/java/io/bitsquare/gui/SystemTray.java
index 8a222787a4..e9de5fa14b 100644
--- a/src/main/java/io/bitsquare/gui/AWTSystemTray.java
+++ b/src/main/java/io/bitsquare/gui/SystemTray.java
@@ -17,7 +17,6 @@
 
 package io.bitsquare.gui;
 
-
 import io.bitsquare.Bitsquare;
 import io.bitsquare.BitsquareUI;
 import io.bitsquare.gui.util.ImageUtil;
@@ -39,27 +38,28 @@ import scala.concurrent.duration.Duration;
 
 /**
  * There is no JavaFX support yet, so we need to use AWT.
- * TODO research more
  */
-public class AWTSystemTray {
-    private static final Logger log = LoggerFactory.getLogger(AWTSystemTray.class);
-    private static boolean isStageVisible = true;
-    private static MenuItem showGuiItem;
-    private static Stage stage;
-    private static ActorSystem actorSystem;
-    private static BitsquareUI application;
-    private static TrayIcon trayIcon;
+public class SystemTray {
+    private static final Logger log = LoggerFactory.getLogger(SystemTray.class);
 
-    public static void createSystemTray(Stage stage, ActorSystem actorSystem, BitsquareUI application) {
-        AWTSystemTray.stage = stage;
-        AWTSystemTray.actorSystem = actorSystem;
-        AWTSystemTray.application = application;
+    private final Stage stage;
+    private final ActorSystem actorSystem;
+    private final BitsquareUI application;
 
-        if (SystemTray.isSupported()) {
+    private boolean isStageVisible = true;
+    private MenuItem showGuiItem;
+    private TrayIcon trayIcon;
+
+    public SystemTray(Stage stage, ActorSystem actorSystem, BitsquareUI application) {
+        this.stage = stage;
+        this.actorSystem = actorSystem;
+        this.application = application;
+
+        if (java.awt.SystemTray.isSupported()) {
             // prevent exiting the app when the last window get closed
             Platform.setImplicitExit(false);
 
-            SystemTray systemTray = SystemTray.getSystemTray();
+            java.awt.SystemTray systemTray = java.awt.SystemTray.getSystemTray();
             if (ImageUtil.isRetina())
                 trayIcon = new TrayIcon(getImage(ImageUtil.SYS_TRAY_HI_RES));
             else
@@ -121,13 +121,13 @@ public class AWTSystemTray {
         }
     }
 
-    public static void setStageHidden() {
+    public void setStageHidden() {
         stage.hide();
         isStageVisible = false;
         showGuiItem.setLabel("Open exchange window");
     }
 
-    private static Image getImage(String path) {
-        return new ImageIcon(AWTSystemTray.class.getResource(path), "system tray icon").getImage();
+    private Image getImage(String path) {
+        return new ImageIcon(SystemTray.class.getResource(path), "system tray icon").getImage();
     }
 }