Skip to content

Commit 387fc85

Browse files
wangmingliang-mswangmingliang-ms
authored
Merge pull request #6957 from microsoft/endgame-202209
Endgame 202209
2 parents 031c3b3 + 3905f7e commit 387fc85

33 files changed

Lines changed: 33 additions & 487 deletions

File tree

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/FunctionAppCreationDialog.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
1616
import com.microsoft.azure.toolkit.lib.auth.IAccountActions;
1717
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
18+
import com.microsoft.azure.toolkit.lib.common.messager.ExceptionNotification;
1819
import com.microsoft.azure.toolkit.lib.common.model.Subscription;
1920
import org.apache.commons.lang3.StringUtils;
2021

@@ -59,6 +60,7 @@ protected JComponent createCenterPanel() {
5960
return contentPane;
6061
}
6162

63+
@ExceptionNotification
6264
private void createUIComponents() {
6365
// TODO: place custom component creation code here
6466
final List<Subscription> selectedSubscriptions = az(AzureAccount.class).account().getSelectedSubscriptions();

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/FunctionDeploymentPanel.form‎

Lines changed: 9 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy.ui.FunctionDeploymentPanel">
3-
<grid id="27dc6" binding="pnlRoot" layout-manager="GridLayoutManager" row-count="6" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
3+
<grid id="27dc6" binding="pnlRoot" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="0" left="0" bottom="0" right="0"/>
55
<constraints>
66
<xy x="20" y="20" width="604" height="220"/>
@@ -23,15 +23,15 @@
2323
<grid id="76234" binding="pnlAppSettings" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
2424
<margin top="0" left="0" bottom="0" right="0"/>
2525
<constraints>
26-
<grid row="5" column="1" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
26+
<grid row="3" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
2727
</constraints>
2828
<properties/>
2929
<border type="none"/>
3030
<children/>
3131
</grid>
3232
<component id="82c52" class="javax.swing.JLabel" binding="lblAppSettings">
3333
<constraints>
34-
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false">
34+
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false">
3535
<minimum-size width="-1" height="24"/>
3636
<preferred-size width="-1" height="24"/>
3737
<maximum-size width="-1" height="24"/>
@@ -67,41 +67,21 @@
6767
</component>
6868
<component id="760ca" class="com.microsoft.azure.toolkit.intellij.legacy.function.FunctionAppComboBox" binding="functionAppComboBox" custom-create="true">
6969
<constraints>
70-
<grid row="1" column="1" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
70+
<grid row="1" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
7171
</constraints>
7272
<properties/>
7373
</component>
74-
<component id="84523" class="javax.swing.JLabel">
74+
<component id="35551" class="com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy.ui.components.DeploymentSlotComboBox" binding="cbDeploymentSlot" custom-create="true">
7575
<constraints>
76-
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
77-
<minimum-size width="-1" height="24"/>
78-
<preferred-size width="-1" height="24"/>
79-
<maximum-size width="-1" height="24"/>
80-
</grid>
81-
</constraints>
82-
<properties>
83-
<text value="Deployment Slot:"/>
84-
</properties>
85-
</component>
86-
<component id="cc22a" class="com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy.ui.components.DeploymentSlotComboBox" binding="cbDeploymentSlot" custom-create="true">
87-
<constraints>
88-
<grid row="3" column="2" row-span="1" col-span="2" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
76+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
8977
</constraints>
9078
<properties>
9179
<visible value="true"/>
9280
</properties>
9381
</component>
94-
<component id="35551" class="com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy.ui.components.DeploymentSlotComboBox" custom-create="true">
82+
<component id="60952" class="javax.swing.JCheckBox" binding="chkSlot">
9583
<constraints>
96-
<grid row="2" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
97-
</constraints>
98-
<properties>
99-
<visible value="true"/>
100-
</properties>
101-
</component>
102-
<component id="60952" class="javax.swing.JCheckBox" binding="checkBox1" default-binding="true">
103-
<constraints>
104-
<grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
84+
<grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
10585
</constraints>
10686
<properties>
10787
<contentAreaFilled value="true"/>
@@ -110,42 +90,12 @@
11090
<text value="Deploy To Slot"/>
11191
</properties>
11292
</component>
113-
<component id="8ebaf" class="javax.swing.JCheckBox" binding="chkSlot">
114-
<constraints>
115-
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
116-
</constraints>
117-
<properties>
118-
<contentAreaFilled value="true"/>
119-
<hideActionText value="false"/>
120-
<horizontalTextPosition value="4"/>
121-
<text value=""/>
122-
</properties>
123-
</component>
12493
<component id="2bbdf" class="javax.swing.JComboBox" binding="cbFunctionModule">
12594
<constraints>
126-
<grid row="0" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
95+
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
12796
</constraints>
12897
<properties/>
12998
</component>
130-
<component id="f1359" class="javax.swing.JCheckBox">
131-
<constraints>
132-
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
133-
</constraints>
134-
<properties>
135-
<contentAreaFilled value="true"/>
136-
<hideActionText value="false"/>
137-
<horizontalTextPosition value="4"/>
138-
<text value="Deploy To Slot"/>
139-
</properties>
140-
</component>
141-
<component id="2c66b" class="com.microsoft.azure.toolkit.intellij.legacy.function.runner.deploy.ui.components.DeploymentSlotComboBox" binding="deploymentSlotComboBox1" custom-create="true" default-binding="true">
142-
<constraints>
143-
<grid row="4" column="1" row-span="1" col-span="3" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
144-
</constraints>
145-
<properties>
146-
<visible value="true"/>
147-
</properties>
148-
</component>
14999
</children>
150100
</grid>
151101
</form>

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/FunctionDeploymentPanel.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ public class FunctionDeploymentPanel extends AzureSettingPanel<FunctionDeployCon
6666
private JCheckBox chkSlot;
6767
private DeploymentSlotComboBox cbDeploymentSlot;
6868
private JLabel lblDeploymentSlot;
69-
private JCheckBox checkBox1;
70-
private DeploymentSlotComboBox deploymentSlotComboBox1;
7169
private FunctionAppSettingsTable appSettingsTable;
7270
private String appSettingsKey;
7371
private String appSettingsResourceId;

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/runner/deploy/ui/components/DeploymentSlotComboBox.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.microsoft.azure.toolkit.lib.Azure;
1414
import com.microsoft.azure.toolkit.lib.appservice.IDeploymentSlotModule;
1515
import com.microsoft.azure.toolkit.lib.common.model.AbstractAzResource;
16-
import com.microsoft.azure.toolkit.lib.common.model.AbstractAzResourceModule;
1716
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
1817
import org.apache.commons.lang3.StringUtils;
1918

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/webapp/WebAppCreationDialog.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
1515
import com.microsoft.azure.toolkit.lib.auth.IAccountActions;
1616
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
17+
import com.microsoft.azure.toolkit.lib.common.messager.ExceptionNotification;
1718
import com.microsoft.azure.toolkit.lib.common.model.Subscription;
1819
import org.jetbrains.annotations.Nullable;
1920

@@ -61,6 +62,7 @@ protected String getDialogTitle() {
6162
return message("webapp.create.dialog.title");
6263
}
6364

65+
@ExceptionNotification
6466
private void createUIComponents() {
6567
// TODO: place custom component creation code here
6668
advancedForm = new WebAppConfigFormPanelAdvance(project);

0 commit comments

Comments
 (0)