change environments in background

Signed-off-by: shalom <[email protected]>

Author: shalom938

ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java

@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import org.digma.intellij.plugin.log.Log;
 import org.digma.intellij.plugin.model.rest.errordetails.CodeObjectErrorDetails;
@@ -20,18 +22,14 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.net.ssl.SSLException;
+import javax.swing.*;
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.ConnectException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class AnalyticsService implements Disposable {
@@ -77,7 +75,7 @@ public Environment getEnvironment() {
     }
 
     //just replace the client and do not fire any events
-    private void replaceClient(String url, String token) {
+    private synchronized void replaceClient(String url, String token) {
         if (analyticsProviderProxy != null) {
             try {
                 analyticsProviderProxy.close();
@@ -92,14 +90,31 @@ private void replaceClient(String url, String token) {
 
     private void replaceClientAndFireChange(String url, String token) {
 
-        replaceClient(url,token);
+        replaceClient(url, token);
 
-        List<String> envs = getEnvironments();
-        if (envs == null) {
-            envs = new ArrayList<>();
+        var r = new Runnable() {
+            @Override
+            public void run() {
+                List<String> envs = getEnvironments();
+                if (envs == null) {
+                    envs = new ArrayList<>();
+                }
+
+                environment.replaceEnvironmentsList(envs);
+            }
+        };
+
+        if (SwingUtilities.isEventDispatchThread()) {
+            new Task.Backgroundable(project, "Digma: Environments list changed...") {
+                @Override
+                public void run(@NotNull ProgressIndicator indicator) {
+                    r.run();
+                }
+            }.queue();
+        } else {
+            r.run();
         }
 
-        environment.replaceEnvironmentsList(envs);
     }
 
 

ide-common/src/main/java/org/digma/intellij/plugin/analytics/Environment.java

@@ -68,7 +68,18 @@ public void setCurrent(String newEnv) {
         this.current = newEnv;
         persistenceData.setCurrentEnv(newEnv);
 
-        notifyEnvironmentChanged(oldEnv, newEnv);
+        if (SwingUtilities.isEventDispatchThread()) {
+            new Task.Backgroundable(project, "Digma: Environment Changed...") {
+                @Override
+                public void run(@NotNull ProgressIndicator indicator) {
+                    notifyEnvironmentChanged(oldEnv, newEnv);
+                }
+            }.queue();
+        } else {
+            notifyEnvironmentChanged(oldEnv, newEnv);
+        }
+
+
     }
 
 

src/main/kotlin/org/digma/intellij/plugin/ui/common/EnvironmentsPanel.kt

@@ -24,6 +24,7 @@ import java.util.*
 import java.util.function.Function
 import javax.swing.Icon
 import javax.swing.JComponent
+import javax.swing.SwingUtilities
 
 //need to remember we have two instances of this panel , one for the insights tab and one for the errors tab.
 //both instances need to be in sync with the selected button and the environments list.
@@ -47,7 +48,13 @@ class EnvironmentsPanel(
         //need to change also in the errors tab, and vice versa.
         val messageBusConnection = project.messageBus.connect()
         messageBusConnection.subscribe(EnvironmentChanged.ENVIRONMENT_CHANGED_TOPIC, EnvironmentChanged {
-            select(it)
+            if (SwingUtilities.isEventDispatchThread()) {
+                select(it)
+            } else {
+                SwingUtilities.invokeLater {
+                    select(it)
+                }
+            }
         })
         Disposer.register(project, messageBusConnection)
     }