Skip to content

Commit 154206f

Browse files
add Modality for runLater in spring cloud dialogs
1 parent 9617771 commit 154206f

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.intellij.openapi.util.Disposer;
1212
import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
1313
import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
14+
import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
1415
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
1516

1617
import javax.accessibility.AccessibleRelation;
@@ -56,7 +57,7 @@ public void windowClosed(WindowEvent e) {
5657
return new ComponentValidator(AzureFormInputComponent.this).installOn(input);
5758
});
5859
if (v != null) {
59-
AzureTaskManager.getInstance().runLater(() -> v.updateInfo(info));
60+
AzureTaskManager.getInstance().runLater(() -> v.updateInfo(info), AzureTask.Modality.ANY);
6061
}
6162
}
6263

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/component/SpringCloudAppConfigPanel.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
1515
import com.microsoft.azure.toolkit.intellij.common.EnvironmentVariablesTextFieldWithBrowseButton;
1616
import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
17+
import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
1718
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
1819
import com.microsoft.azure.toolkit.lib.common.utils.TailingDebouncer;
1920
import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
@@ -134,7 +135,7 @@ public synchronized void updateForm(@Nonnull SpringCloudApp app) {
134135
this.txtEndpoint.setIcon(null);
135136
this.txtEndpoint.setText("---");
136137
}
137-
});
138+
}, AzureTask.Modality.ANY);
138139
});
139140
final SpringCloudSku sku = app.getCluster().entity().getSku();
140141
final boolean basic = sku.getTier().toLowerCase().startsWith("b");
@@ -158,7 +159,7 @@ public synchronized void updateForm(@Nonnull SpringCloudApp app) {
158159
.map(SpringCloudDeployment::entity)
159160
.orElse(new SpringCloudDeploymentEntity("default", app.entity()));
160161
final List<SpringCloudDeploymentInstanceEntity> instances = deploymentEntity.getInstances();
161-
AzureTaskManager.getInstance().runLater(() -> this.numInstance.setRealMin(Math.min(instances.size(), 1)));
162+
AzureTaskManager.getInstance().runLater(() -> this.numInstance.setRealMin(Math.min(instances.size(), 1)), AzureTask.Modality.ANY);
162163
});
163164
}
164165

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/creation/AbstractSpringCloudAppInfoPanel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo.AzureValidationInfoBuilder;
1616
import com.microsoft.azure.toolkit.lib.common.messager.AzureMessageBundle;
1717
import com.microsoft.azure.toolkit.lib.common.model.Subscription;
18+
import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
1819
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
1920
import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
2021
import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudAppEntity;
@@ -95,7 +96,7 @@ protected void onAppChanged(SpringCloudApp app) {
9596
if (Objects.isNull(this.originalConfig)) {
9697
AzureTaskManager.getInstance().runOnPooledThread(() -> {
9798
this.originalConfig = SpringCloudAppConfig.fromApp(app);
98-
AzureTaskManager.getInstance().runLater(() -> this.setValue(this.originalConfig));
99+
AzureTaskManager.getInstance().runLater(() -> this.setValue(this.originalConfig), AzureTask.Modality.ANY);
99100
});
100101
}
101102
}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/creation/SpringCloudAppInfoAdvancedPanel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.microsoft.azure.toolkit.intellij.springcloud.component.SpringCloudAppConfigPanel;
1111
import com.microsoft.azure.toolkit.intellij.springcloud.component.SpringCloudClusterComboBox;
1212
import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
13+
import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
1314
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
1415
import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudApp;
1516
import com.microsoft.azure.toolkit.lib.springcloud.SpringCloudCluster;
@@ -37,7 +38,7 @@ public SpringCloudAppInfoAdvancedPanel(@Nullable final SpringCloudCluster cluste
3738
}
3839

3940
protected void onAppChanged(SpringCloudApp app) {
40-
AzureTaskManager.getInstance().runLater(() -> this.formConfig.updateForm(app));
41+
AzureTaskManager.getInstance().runLater(() -> this.formConfig.updateForm(app), AzureTask.Modality.ANY);
4142
super.onAppChanged(app);
4243
}
4344

0 commit comments

Comments
 (0)