fetch disposable instance from ToolWindow

Author: samgst-amazon

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt

@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.toolwindow
 
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.project.DumbAware
@@ -37,9 +36,7 @@ import software.aws.toolkits.telemetry.FeatureId
 import java.awt.event.ComponentAdapter
 import java.awt.event.ComponentEvent
 
-class AmazonQToolWindowFactory(
-    private val disposable: Disposable,
-) : ToolWindowFactory, DumbAware {
+class AmazonQToolWindowFactory: ToolWindowFactory, DumbAware {
 
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
         val mainPanel = BorderLayoutPanel()
@@ -61,7 +58,7 @@ class AmazonQToolWindowFactory(
         }
         val contentManager = toolWindow.contentManager
 
-        project.messageBus.connect(disposable).subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             ToolkitConnectionManagerListener.TOPIC,
             object : ToolkitConnectionManagerListener {
                 override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
@@ -70,7 +67,7 @@ class AmazonQToolWindowFactory(
             }
         )
 
-        project.messageBus.connect(disposable).subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             RefreshQChatPanelButtonPressedListener.TOPIC,
             object : RefreshQChatPanelButtonPressedListener {
                 override fun onRefresh() {
@@ -81,7 +78,7 @@ class AmazonQToolWindowFactory(
             }
         )
 
-        project.messageBus.connect(disposable).subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             BearerTokenProviderListener.TOPIC,
             object : BearerTokenProviderListener {
                 override fun onChange(providerId: String, newScopes: List<String>?) {

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerFactory.kt

@@ -4,7 +4,6 @@
 package software.aws.toolkits.jetbrains.core.explorer
 
 import com.intellij.icons.AllIcons
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.application.ApplicationManager
@@ -47,9 +46,7 @@ import software.aws.toolkits.telemetry.FeatureId
 import java.util.EventListener
 import javax.swing.JComponent
 
-class AwsToolkitExplorerFactory(
-    private val disposable: Disposable,
-) : ToolWindowFactory, DumbAware {
+class AwsToolkitExplorerFactory: ToolWindowFactory, DumbAware {
 
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
         val notificationPanel = NotificationPanel()
@@ -115,7 +112,7 @@ class AwsToolkitExplorerFactory(
         toolWindow.activate(null)
         contentManager.setSelectedContent(content)
 
-        project.messageBus.connect(disposable).subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             ToolkitConnectionManagerListener.TOPIC,
             object : ToolkitConnectionManagerListener {
                 override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
@@ -124,7 +121,7 @@ class AwsToolkitExplorerFactory(
             }
         )
 
-        project.messageBus.connect(disposable).subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             AwsConnectionManager.CONNECTION_SETTINGS_STATE_CHANGED,
             object : ConnectionSettingsStateChangeNotifier {
                 override fun settingsStateChanged(newState: ConnectionState) {
@@ -133,7 +130,7 @@ class AwsToolkitExplorerFactory(
             }
         )
 
-        project.messageBus.connect(disposable).subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             BearerTokenProviderListener.TOPIC,
             object : BearerTokenProviderListener {
                 override fun onChange(providerId: String, newScopes: List<String>?) {
@@ -146,7 +143,7 @@ class AwsToolkitExplorerFactory(
             }
         )
 
-        project.messageBus.connect(disposable).subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             ShowToolkitListener.TOPIC,
             object : ShowToolkitListener {
                 override fun showWebview(project: Project) {