fix RecentActivityToolWindowIconChanger

Author: shalom938

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/pluginapi/RecentActivityBadgeCommand.kt

@@ -2,17 +2,11 @@ package org.digma.intellij.plugin.ui.jcef.pluginapi
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.intellij.execution.runners.ExecutionUtil
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.wm.ToolWindow
-import com.intellij.openapi.wm.ToolWindowManager
-import org.digma.intellij.plugin.PluginId
-import org.digma.intellij.plugin.common.EDT
 import org.digma.intellij.plugin.common.objectToJson
-import org.digma.intellij.plugin.icons.AppIcons
 import org.digma.intellij.plugin.ui.jcef.jsonToObject
+import org.digma.intellij.plugin.ui.recentactivity.RecentActivityToolWindowIconChanger
 import java.beans.ConstructorProperties
-import javax.swing.Icon
 
 class RecentActivityBadgeCommand : Command() {
 
@@ -43,7 +37,7 @@ class RecentActivityBadgeCommand : Command() {
                 )
             }
 
-            val recentActivityToolWindowIconChanger = RecentActivityToolWindowIconChanger(project)
+            val recentActivityToolWindowIconChanger = RecentActivityToolWindowIconChanger.getInstance(project)
             if (badgeRequest.status) {
                 recentActivityToolWindowIconChanger.showBadge()
             } else {
@@ -84,61 +78,3 @@ constructor(
     @param:JsonProperty("status")
     val status: Boolean
 )
-
-
-private class RecentActivityToolWindowIconChanger(val project: Project) {
-
-    private val defaultIcon = AppIcons.TOOL_WINDOW_OBSERVABILITY
-    private var actualIcon: Icon? = null
-    private var badgeIcon: Icon? = null
-
-
-    fun showBadge() {
-
-        val toolWindow = getToolWindow() ?: return
-
-        createBadgeIcon()
-
-        EDT.ensureEDT {
-            badgeIcon?.let {
-                toolWindow.setIcon(it)
-            }
-        }
-    }
-
-    private fun createBadgeIcon() {
-
-        if (badgeIcon == null) {
-            val icon = actualIcon ?: defaultIcon
-            badgeIcon = ExecutionUtil.getLiveIndicator(icon)
-        }
-    }
-
-
-    fun hideBadge() {
-
-        //if badgeIcon is null then it was never created and no need to do anything
-        if (badgeIcon == null) {
-            return
-        }
-
-        val toolWindow = getToolWindow() ?: return
-
-        EDT.ensureEDT {
-            toolWindow.setIcon(actualIcon ?: defaultIcon)
-        }
-    }
-
-    private fun getToolWindow(): ToolWindow? {
-        val toolWindow = ToolWindowManager.getInstance(project).getToolWindow(PluginId.OBSERVABILITY_WINDOW_ID)
-
-        if (actualIcon == null) {
-            //capture the actual icon the first time we got a non-null tool window.
-            // and make sure it is initialized at least to the default icon
-            actualIcon = toolWindow?.icon ?: defaultIcon
-        }
-
-        return toolWindow
-    }
-
-}

src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityToolWindowIconChanger.kt

@@ -0,0 +1,77 @@
+package org.digma.intellij.plugin.ui.recentactivity
+
+import com.intellij.execution.runners.ExecutionUtil
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindow
+import com.intellij.openapi.wm.ToolWindowManager
+import org.digma.intellij.plugin.PluginId
+import org.digma.intellij.plugin.common.EDT
+import org.digma.intellij.plugin.icons.AppIcons
+import javax.swing.Icon
+
+//must be a singleton because it relies on null and non-null properties
+@Service(Service.Level.PROJECT)
+class RecentActivityToolWindowIconChanger(val project: Project) {
+
+    private val defaultIcon = AppIcons.TOOL_WINDOW_OBSERVABILITY
+    private var actualIcon: Icon? = null
+    private var badgeIcon: Icon? = null
+
+
+    companion object{
+        fun getInstance(project: Project): RecentActivityToolWindowIconChanger {
+            return project.service<RecentActivityToolWindowIconChanger>()
+        }
+    }
+
+    fun showBadge() {
+
+        val toolWindow = getToolWindow() ?: return
+
+        createBadgeIcon()
+
+        EDT.ensureEDT {
+            badgeIcon?.let {
+                toolWindow.setIcon(it)
+            }
+        }
+    }
+
+    private fun createBadgeIcon() {
+
+        if (badgeIcon == null) {
+            val icon = actualIcon ?: defaultIcon
+            badgeIcon = ExecutionUtil.getLiveIndicator(icon)
+        }
+    }
+
+
+    fun hideBadge() {
+
+        //if badgeIcon is null then it was never created and no need to do anything
+        if (badgeIcon == null) {
+            return
+        }
+
+        val toolWindow = getToolWindow() ?: return
+
+        EDT.ensureEDT {
+            toolWindow.setIcon(actualIcon ?: defaultIcon)
+        }
+    }
+
+    private fun getToolWindow(): ToolWindow? {
+        val toolWindow = ToolWindowManager.getInstance(project).getToolWindow(PluginId.OBSERVABILITY_WINDOW_ID)
+
+        if (actualIcon == null) {
+            //capture the actual icon the first time we got a non-null tool window.
+            // and make sure it is initialized at least to the default icon
+            actualIcon = toolWindow?.icon ?: defaultIcon
+        }
+
+        return toolWindow
+    }
+
+}