Merge pull request #4885 from microsoft/qianjin-bugfix-20210112

Bug Fix #4720 & #4885 Subscription Selection Related Issues.

Author: shenqianjin

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azuretools/ijidea/ui/SubscriptionsDialog.java

@@ -36,6 +36,7 @@
 import com.microsoft.azuretools.authmanage.SubscriptionManager;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
 import com.microsoft.azuretools.ijidea.actions.SelectSubscriptionsAction;
+import com.microsoft.azuretools.ijidea.utility.JTableUtils;
 import com.microsoft.azuretools.sdkmanage.AzureManager;
 import com.microsoft.azuretools.telemetry.AppInsightsClient;
 import com.microsoft.azuretools.telemetrywrapper.EventType;
@@ -50,8 +51,6 @@
 import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.List;
 
 import static com.microsoft.azuretools.telemetry.TelemetryConstants.ACCOUNT;
@@ -156,30 +155,10 @@ private void createUIComponents() {
         column.setHeaderValue(""); // Don't show title text
         column.setMinWidth(23);
         column.setMaxWidth(23);
+        JTableUtils.enableBatchSelection(table, CHECKBOX_COLUMN);
         table.getTableHeader().setReorderingAllowed(false);
         new TableSpeedSearch(table);
 
-        // secret functionality: select all subs
-        table.getTableHeader().addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                int col = table.columnAtPoint(e.getPoint());
-                if (col == CHECKBOX_COLUMN) {
-                    boolean anySelected = false;
-                    for (int row = 0; row < table.getRowCount(); row++) {
-                        Boolean b = (Boolean) table.getValueAt(row, CHECKBOX_COLUMN);
-                        if (b) {
-                            anySelected = true;
-                            break;
-                        }
-                    }
-                    for (int row = 0; row < table.getRowCount(); row++) {
-                        table.getModel().setValueAt(!anySelected, row, CHECKBOX_COLUMN);
-                    }
-                }
-            }
-        });
-
         AnActionButton refreshAction = new AnActionButton("Refresh", AllIcons.Actions.Refresh) {
             @Override
             public void actionPerformed(AnActionEvent anActionEvent) {

Utils/azuretools-core/src/com/microsoft/azure/toolkit/lib/common/task/AzureTaskManager.java

@@ -25,7 +25,6 @@
 import lombok.extern.java.Log;
 import rx.Emitter;
 import rx.Observable;
-import rx.observables.ConnectableObservable;
 
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
@@ -253,8 +252,8 @@ public final <T> Observable<T> runInModalAsObservable(AzureTask<T> task) {
         return this.runInObservable(this::doRunInModal, task);
     }
 
-    private <T> ConnectableObservable<T> runInObservable(final BiConsumer<? super Runnable, ? super AzureTask<T>> consumer, final AzureTask<T> task) {
-        final ConnectableObservable<T> observable = Observable.create((Emitter<T> emitter) -> {
+    private <T> Observable<T> runInObservable(final BiConsumer<? super Runnable, ? super AzureTask<T>> consumer, final AzureTask<T> task) {
+        return Observable.create((Emitter<T> emitter) -> {
             final AzureTaskContext.Node context = AzureTaskContext.current().derive();
             task.setContext(context);
             context.setTask(task);
@@ -268,9 +267,7 @@ private <T> ConnectableObservable<T> runInObservable(final BiConsumer<? super Ru
                 }
             }, context);
             consumer.accept(t, task);
-        }, Emitter.BackpressureMode.BUFFER).publish();
-        observable.connect();
-        return observable;
+        }, Emitter.BackpressureMode.BUFFER);
     }
 
     protected abstract void doRead(Runnable runnable, AzureTask<?> task);