Merge pull request #6095 from microsoft/fix-dialog-dispose

fix npe when open connector dialog

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureDialog.java

@@ -4,13 +4,10 @@
  */
 package com.microsoft.azure.toolkit.intellij.common;
 
-import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.ValidationInfo;
-import com.intellij.openapi.util.Disposer;
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
-import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
 import lombok.extern.java.Log;
@@ -35,16 +32,6 @@ public AzureDialog() {
         this(null);
     }
 
-    @Override
-    protected void init() {
-        super.init();
-        for (final AzureFormInput<?> input : this.getForm().getInputs()) {
-            if (input instanceof Disposable) {
-                Disposer.register(this.getDisposable(), (Disposable) input);
-            }
-        }
-    }
-
     @Override
     protected void doOKAction() {
         try {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureFormInputComponent.java

@@ -8,19 +8,20 @@
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.ui.ComponentValidator;
 import com.intellij.openapi.ui.ValidationInfo;
+import com.intellij.openapi.util.Disposer;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 
 import javax.accessibility.AccessibleRelation;
 import javax.annotation.Nullable;
 import javax.swing.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.util.Objects;
 import java.util.Optional;
 
-import static com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo.Type.PENDING;
-import static com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo.Type.SUCCESS;
-import static com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo.Type.WARNING;
+import static com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo.Type.*;
 
 public interface AzureFormInputComponent<T> extends AzureFormInput<T>, Disposable {
     default JComponent getInputComponent() {
@@ -44,7 +45,16 @@ default void setValidationInfo(@Nullable AzureValidationInfo vi) {
         input.revalidate();
         input.repaint();
         // see com.intellij.openapi.ui.DialogWrapper.setErrorInfoAll
-        final ComponentValidator v = ComponentValidator.getInstance(input).orElseGet(() -> (new ComponentValidator(this)).installOn(input));
+        final ComponentValidator v = ComponentValidator.getInstance(input).orElseGet(() -> {
+            Optional.ofNullable(SwingUtilities.getWindowAncestor(this.getInputComponent()))
+                .ifPresent(w -> w.addWindowListener(new WindowAdapter() {
+                    @Override
+                    public void windowClosed(WindowEvent e) {
+                        Disposer.dispose(AzureFormInputComponent.this);
+                    }
+                }));
+            return new ComponentValidator(AzureFormInputComponent.this).installOn(input);
+        });
         if (v != null) {
             AzureTaskManager.getInstance().runLater(() -> v.updateInfo(info));
         }