compare deice lists instead of just size

Author: shalom938

ide-common/src/main/kotlin/org/digma/intellij/plugin/reload/ReloadObserver.kt

@@ -23,7 +23,6 @@ import java.beans.PropertyChangeListener
 import java.util.Queue
 import java.util.concurrent.ConcurrentLinkedQueue
 import javax.swing.JComponent
-import javax.swing.JPanel
 import kotlin.time.Duration.Companion.seconds
 
 
@@ -73,7 +72,7 @@ class ReloadObserver(cs: CoroutineScope) {
     }
 
 
-    fun register(project: Project, jcefWrapperPanel: JPanel, jcefUiComponent: JComponent, parentDisposable: Disposable) {
+    fun register(project: Project, appName: String, jcefUiComponent: JComponent, parentDisposable: Disposable) {
 
         if (GraphicsEnvironment.isHeadless()) {
             Log.log(logger::trace, "GraphicsEnvironment is headless, not registering components")
@@ -86,7 +85,7 @@ class ReloadObserver(cs: CoroutineScope) {
         }
 
         val jcefPropertyChangeListener =
-            MyPropertyChangeListener(project, jcefUiComponent, "${jcefWrapperPanel.javaClass.simpleName}.jcefUiComponent")
+            MyPropertyChangeListener(project, jcefUiComponent, "$appName.jcefUiComponent")
         jcefUiComponent.addPropertyChangeListener(jcefPropertyChangeListener)
 
         Disposer.register(parentDisposable) {

ide-common/src/main/kotlin/org/digma/intellij/plugin/reload/ReloadService.kt

@@ -16,7 +16,6 @@ import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower
 import org.digma.intellij.plugin.ui.MainToolWindowCardsController
 import org.digma.intellij.plugin.ui.ToolWindowShower
-import org.digma.intellij.plugin.ui.panels.ReloadablePanel
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
 import kotlin.time.Duration.Companion.seconds
@@ -26,22 +25,22 @@ class ReloadService : DisposableAdaptor {
 
     private val logger = Logger.getInstance(ReloadService::class.java)
 
-    private val reloadables = mutableListOf<ReloadablePanel>()
+    private val reloadables = mutableListOf<ReloadableJCefContainer>()
 
     private val latestReloadForProject = mutableMapOf<String, Instant>()
 
     private val myReloadLock = ReentrantLock(true)
 
 
-    fun register(reloadablePanel: ReloadablePanel, parentDisposable: Disposable) {
-        reloadables.add(reloadablePanel)
+    fun register(reloadableJCefContainer: ReloadableJCefContainer, parentDisposable: Disposable) {
+        reloadables.add(reloadableJCefContainer)
         Disposer.register(parentDisposable) {
-            remove(reloadablePanel)
+            remove(reloadableJCefContainer)
         }
     }
 
-    fun remove(reloadablePanel: ReloadablePanel) {
-        reloadables.remove(reloadablePanel)
+    fun remove(reloadableJCefContainer: ReloadableJCefContainer) {
+        reloadables.remove(reloadableJCefContainer)
     }
 
 

…llij/plugin/ui/panels/ReloadablePanel.kt …plugin/reload/ReloadableJCefContainer.ktide-common/src/main/kotlin/org/digma/intellij/plugin/ui/panels/ReloadablePanel.kt renamed to ide-common/src/main/kotlin/org/digma/intellij/plugin/reload/ReloadableJCefContainer.kt ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/panels/ReloadablePanel.kt renamed to ide-common/src/main/kotlin/org/digma/intellij/plugin/reload/ReloadableJCefContainer.kt

@@ -1,8 +1,8 @@
-package org.digma.intellij.plugin.ui.panels
+package org.digma.intellij.plugin.reload
 
 import com.intellij.openapi.project.Project
 
-interface ReloadablePanel {
+interface ReloadableJCefContainer {
     fun reload()
     fun getProject(): Project
 }

src/main/kotlin/org/digma/intellij/plugin/ui/mainapp/MainAppPanel.kt

@@ -14,14 +14,14 @@ import org.digma.intellij.plugin.ui.list.listBackground
 import org.digma.intellij.plugin.ui.navigation.CodeButtonCaretContextService
 import org.digma.intellij.plugin.ui.navigation.NavigationService
 import org.digma.intellij.plugin.ui.panels.DisposablePanel
-import org.digma.intellij.plugin.ui.panels.ReloadablePanel
+import org.digma.intellij.plugin.reload.ReloadableJCefContainer
 import org.digma.intellij.plugin.ui.tests.TestsUpdater
 import java.awt.BorderLayout
 import java.awt.Insets
 import javax.swing.JComponent
 import javax.swing.JLabel
 
-class MainAppPanel(private val project: Project) : DisposablePanel(), ReloadablePanel {
+class MainAppPanel(private val project: Project) : DisposablePanel(), ReloadableJCefContainer {
 
     private var jCefComponent: JCefComponent? = null
 
@@ -31,7 +31,7 @@ class MainAppPanel(private val project: Project) : DisposablePanel(), Reloadable
         jCefComponent = build()
         jCefComponent?.let {
             service<ReloadService>().register(this, parentDisposable)
-            service<ReloadObserver>().register(project, this, it.getComponent(), parentDisposable)
+            service<ReloadObserver>().register(project, "MainApp", it.getComponent(), parentDisposable)
         }
         Disposer.register(MainAppService.getInstance(project)) {
             dispose()
@@ -69,7 +69,7 @@ class MainAppPanel(private val project: Project) : DisposablePanel(), Reloadable
         jCefComponent = build()
         jCefComponent?.let {
             service<ReloadService>().register(this, parentDisposable)
-            service<ReloadObserver>().register(project, this, it.getComponent(), parentDisposable)
+            service<ReloadObserver>().register(project, "MainApp", it.getComponent(), parentDisposable)
         }
     }
 

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

@@ -11,13 +11,13 @@ import org.digma.intellij.plugin.ui.jcef.JCefComponent
 import org.digma.intellij.plugin.ui.jcef.JCefComponent.JCefComponentBuilder
 import org.digma.intellij.plugin.ui.list.listBackground
 import org.digma.intellij.plugin.ui.panels.DisposablePanel
-import org.digma.intellij.plugin.ui.panels.ReloadablePanel
+import org.digma.intellij.plugin.reload.ReloadableJCefContainer
 import java.awt.BorderLayout
 import java.awt.Insets
 import javax.swing.JComponent
 import javax.swing.JLabel
 
-class RecentActivityPanel(private val project: Project) : DisposablePanel(), ReloadablePanel {
+class RecentActivityPanel(private val project: Project) : DisposablePanel(), ReloadableJCefContainer {
 
     private var jCefComponent: JCefComponent? = null
 
@@ -27,7 +27,7 @@ class RecentActivityPanel(private val project: Project) : DisposablePanel(), Rel
         jCefComponent = build()
         jCefComponent?.let {
             service<ReloadService>().register(this, parentDisposable)
-            service<ReloadObserver>().register(project, this, it.getComponent(), parentDisposable)
+            service<ReloadObserver>().register(project, "RecentActivity", it.getComponent(), parentDisposable)
         }
         Disposer.register(project.service<RecentActivityService>()) {
             dispose()
@@ -64,7 +64,7 @@ class RecentActivityPanel(private val project: Project) : DisposablePanel(), Rel
         jCefComponent = build()
         jCefComponent?.let {
             service<ReloadService>().register(this, parentDisposable)
-            service<ReloadObserver>().register(project, this, it.getComponent(), parentDisposable)
+            service<ReloadObserver>().register(project, "RecentActivity", it.getComponent(), parentDisposable)
         }
     }