Merge pull request #6141 from microsoft/andy-fix-sp

fix eclipse ui thread issue for sp: Widget is disposed

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/handlers/SignInCommandHandler.java

@@ -131,11 +131,17 @@ private static AuthConfiguration showSignInWindowAndGetAuthConfiguration(Shell p
 
         AuthConfiguration auth = dialog.getData();
         if (auth.getType() == AuthType.SERVICE_PRINCIPAL) {
+            CompletableFuture<AuthConfiguration> future = new CompletableFuture<>();
             ServicePrincipalLoginDialog servicePrincipalLoginDialog = new ServicePrincipalLoginDialog(parentShell);
+            servicePrincipalLoginDialog.setOkActionListener(value -> {
+                future.complete(value);
+                servicePrincipalLoginDialog.close();
+            });
+
             if (servicePrincipalLoginDialog.open() == Window.CANCEL) {
                 throw new InterruptedException("user cancel");
             }
-            auth = servicePrincipalLoginDialog.getForm().getValue();
+            auth = future.getNow(null);
         }
         return auth;
     }

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/ui/SignInDialog.java

@@ -160,6 +160,7 @@ private void disableAzureCliLogin() {
 
     private Button createRadioButton(Composite parent, String label, AuthType type) {
         final Button radioButton = new Button(parent, SWT.RADIO);
+        radioButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
         radioButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/ui/login/ServicePrincipalLoginDialog.java

@@ -309,25 +309,25 @@ protected void checkSubclass() {
         public AuthConfiguration getValue() {
             AuthConfiguration data = new AuthConfiguration();
 
-            data.setClient(txtClientId.getText());
-            data.setTenant(txtTenantId.getText());
+            data.setClient(txtClientId.getValue());
+            data.setTenant(txtTenantId.getValue());
             if (radioPassword.getSelection()) {
-                data.setKey(txtPassword.getText());
+                data.setKey(txtPassword.getValue());
             } else {
-                data.setCertificate(this.txtCertificate.getText());
+                data.setCertificate(this.txtCertificate.getValue());
             }
             data.setType(AuthType.SERVICE_PRINCIPAL);
             return data;
         }
 
         @Override
         public void setValue(AuthConfiguration model) {
-            this.txtTenantId.setText(StringUtils.defaultString(model.getTenant()));
-            this.txtClientId.setText(StringUtils.defaultString(model.getClient()));
+            this.txtTenantId.setValue(StringUtils.defaultString(model.getTenant()));
+            this.txtClientId.setValue(StringUtils.defaultString(model.getClient()));
 
             if (!StringUtils.isAllBlank(model.getCertificate(), model.getKey())) {
                 if (model.getKey() != null) {
-                    this.txtPassword.setText(model.getKey());
+                    this.txtPassword.setValue(model.getKey());
                     this.radioPassword.setSelection(true);
                     this.radioCertificate.setSelection(false);
                 } else {