Skip to content

Commit 307b268

Browse files
committed
reload jaeger and dashboard
1 parent a9b9553 commit 307b268

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

src/main/java/org/digma/intellij/plugin/dashboard/DashboardFileEditor.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.digma.intellij.plugin.dashboard;
22

3+
import com.intellij.openapi.application.ApplicationManager;
34
import com.intellij.openapi.fileEditor.*;
45
import com.intellij.openapi.project.Project;
56
import com.intellij.openapi.util.*;
@@ -8,6 +9,7 @@
89
import org.cef.CefApp;
910
import org.cef.browser.*;
1011
import org.cef.handler.CefLifeSpanHandlerAdapter;
12+
import org.digma.intellij.plugin.reload.ReloadObserver;
1113
import org.digma.intellij.plugin.ui.jcef.JBCefBrowserBuilderCreator;
1214
import org.digma.intellij.plugin.ui.settings.*;
1315
import org.jetbrains.annotations.*;
@@ -66,11 +68,13 @@ public void onAfterCreated(CefBrowser browser) {
6668
jbCefBrowser.getJBCefClient().addLifeSpanHandler(lifeSpanHandler, jbCefBrowser.getCefBrowser());
6769

6870
Disposer.register(this, () -> jbCefBrowser.getJBCefClient().removeLifeSpanHandler(lifeSpanHandler, jbCefBrowser.getCefBrowser()));
71+
72+
ApplicationManager.getApplication().getService(ReloadObserver.class).register(project, "Dashboard." + file.getName(), jbCefBrowser.getComponent(), this);
6973
}
7074

7175
private void registerAppSchemeHandler(Project project, DashboardVirtualFile file) {
7276
CefApp.getInstance().registerSchemeHandlerFactory("http", DOMAIN_NAME,
73-
new DashboardSchemeHandlerFactory(project,file));
77+
new DashboardSchemeHandlerFactory(project, file));
7478
}
7579

7680
@Override
@@ -120,8 +124,10 @@ public void removePropertyChangeListener(@NotNull PropertyChangeListener listene
120124

121125
@Override
122126
public void dispose() {
123-
jbCefBrowser.dispose();
124-
cefMessageRouter.dispose();
127+
if (jbCefBrowser != null) {
128+
Disposer.dispose(jbCefBrowser);
129+
cefMessageRouter.dispose();
130+
}
125131
}
126132

127133
}

src/main/java/org/digma/intellij/plugin/jaegerui/JaegerUIFileEditor.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package org.digma.intellij.plugin.jaegerui;
22

3+
import com.intellij.openapi.application.ApplicationManager;
34
import com.intellij.openapi.fileEditor.*;
45
import com.intellij.openapi.project.Project;
5-
import com.intellij.openapi.util.UserDataHolderBase;
6+
import com.intellij.openapi.util.*;
67
import com.intellij.openapi.vfs.VirtualFile;
78
import com.intellij.ui.jcef.JBCefApp;
9+
import org.digma.intellij.plugin.reload.ReloadObserver;
810
import org.digma.intellij.plugin.ui.jcef.*;
911
import org.jetbrains.annotations.*;
1012

@@ -25,6 +27,7 @@ public class JaegerUIFileEditor extends UserDataHolderBase implements FileEditor
2527
public JaegerUIFileEditor(Project project, JaegerUIVirtualFile file) {
2628
this.file = file;
2729
jCefComponent = createJcefComponent(project, file);
30+
ApplicationManager.getApplication().getService(ReloadObserver.class).register(project, "JaegerUI." + file.getName(), jCefComponent.getComponent(), this);
2831
}
2932

3033
@Nullable
@@ -101,7 +104,7 @@ public void removePropertyChangeListener(@NotNull PropertyChangeListener listene
101104
@Override
102105
public void dispose() {
103106
if (jCefComponent != null) {
104-
jCefComponent.dispose();
107+
Disposer.dispose(jCefComponent);
105108
jCefComponent = null;
106109
}
107110
disposed = true;

0 commit comments

Comments
 (0)