Fix the Spark AdvConf dialog cancel button issue.

Signed-off-by: Wei Zhang <[email protected]>

Author: wezhang

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionAdvancedConfigDialog.java

@@ -33,7 +33,6 @@
 import com.intellij.ui.InplaceButton;
 import com.intellij.util.PathUtil;
 import com.intellij.util.ui.JBUI;
-import com.jcraft.jsch.JSchException;
 import com.microsoft.azure.hdinsight.common.CallBack;
 import com.microsoft.azure.hdinsight.common.ClusterManagerEx;
 import com.microsoft.azure.hdinsight.common.Docs;
@@ -42,7 +41,6 @@
 import com.microsoft.azure.hdinsight.sdk.common.HDIException;
 import com.microsoft.azure.hdinsight.spark.common.SparkBatchDebugSession;
 import com.microsoft.azure.hdinsight.spark.common.SparkSubmitAdvancedConfigModel;
-import com.microsoft.azure.hdinsight.spark.run.SparkBatchJobRemoteDebugProcess;
 import com.microsoft.azuretools.utils.Pair;
 import org.jetbrains.annotations.NotNull;
 import rx.Subscription;
@@ -52,6 +50,8 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.util.Locale;
 import java.util.Optional;
@@ -68,7 +68,7 @@
 public class SparkSubmissionAdvancedConfigDialog extends JDialog
                                                  implements SettableControl<SparkSubmitAdvancedConfigModel> {
     SparkSubmissionAdvancedConfigDialog() {
-        this.advancedConfigModel = new SparkSubmitAdvancedConfigModel();
+        this.initialModel = new SparkSubmitAdvancedConfigModel();
 
         // FIXME!!! Since the Intellij has no locale setting, just set en-us here.
         this.helpUrl = new Docs(Locale.US).getDocUrlByTopic(Docs.TOPIC_CONNECT_HADOOP_LINUX_USING_SSH);
@@ -119,11 +119,11 @@ protected void textChanged(DocumentEvent ev) {
         pack();
     }
 
-    public SparkSubmitAdvancedConfigModel getAdvancedConfigModel() {
-        return advancedConfigModel;
+    private SparkSubmitAdvancedConfigModel getInitialModel() {
+        return initialModel;
     }
 
-    private SparkSubmitAdvancedConfigModel advancedConfigModel;
+    private SparkSubmitAdvancedConfigModel initialModel;
     private String helpUrl;
     private Boolean doesAuthAutoVerify = false;
 
@@ -429,8 +429,6 @@ private Subscription registerAsyncSshAuthCheck(PublishSubject<String> checkEvent
     }
 
     private void onOk() {
-        this.advancedConfigModel = saveParameters();
-
         if (updateCallBack != null) {
             updateCallBack.run();
         }
@@ -439,6 +437,9 @@ private void onOk() {
     }
 
     private void onCancel() {
+        // Restore to the initial state
+        setData(getInitialModel());
+
         dispose();
     }
 
@@ -452,6 +453,16 @@ public void addCallbackOnOk(CallBack cb) {
         this.updateCallBack = cb;
     }
 
+    @Override
+    public void setVisible(boolean isVisible) {
+        if (isVisible) {
+            // Save the initial state
+            getData(getInitialModel());
+        }
+
+        super.setVisible(isVisible);
+    }
+
     @Override
     public void dispose() {
         getSshCheckSubscription().ifPresent(Subscription::unsubscribe);

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionContentPanelConfigurable.java

@@ -99,7 +99,6 @@ private void createUIComponents() {
 
             advConfDialog.setAuthenticationAutoVerify(submitModel.getSelectedClusterDetail().map(IClusterDetail::getName)
                                                                                             .orElse(null));
-            advConfDialog.setData(submitModel.getAdvancedConfigModel());
             advConfDialog.setModal(true);
             advConfDialog.setVisible(true);
         });