Skip to content

Commit d7b6aee

Browse files
jdneoadashen
authored andcommitted
fix some bugs
1 parent b6fed99 commit d7b6aee

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/container/webapponlinux/WebAppOnLinuxDeployConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public class WebAppOnLinuxDeployConfiguration extends RunConfigurationBase {
6565
private static final String MISSING_ARTIFACT = "A web archive (.war) artifact has not been configured.";
6666
private static final String INVALID_WAR_FILE = "The artifact name %s is invalid. "
6767
+ "An artifact name may contain only the ASCII letters 'a' through 'z' (case-insensitive), "
68-
+ "and the digits '0' through '9', '-' and '_'.";
69-
private static final String WAR_NAME_REGEX = "^[A-Za-z0-9_-]+\\.war$";
68+
+ "and the digits '0' through '9', '.', '-' and '_'.";
69+
private static final String WAR_NAME_REGEX = "^[.A-Za-z0-9_-]+\\.war$";
7070
private static final String DOMAIN_NAME_REGEX = "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,}$";
7171

7272
private final WebAppOnLinuxDeployModel deployModel;

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/webapp/webappconfig/WebAppConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public class WebAppConfiguration extends RunConfigurationBase {
6161
private static final String MISSING_ARTIFACT = "A web archive (.war) artifact has not been configured.";
6262
private static final String INVALID_WAR_FILE = "The artifact name %s is invalid. "
6363
+ "An artifact name may contain only the ASCII letters 'a' through 'z' (case-insensitive), "
64-
+ "the digits '0' through '9', '-' and '_'.";
64+
+ "the digits '0' through '9', '.', '-' and '_'.";
6565

66-
private static final String WAR_NAME_REGEX = "^[A-Za-z0-9_-]+\\.war$";
66+
private static final String WAR_NAME_REGEX = "^[.A-Za-z0-9_-]+\\.war$";
6767
private static final String WEB_APP_CONFIGURATION_NODE = "AzureWebAppConfig";
6868
private final WebAppSettingModel webAppSettingModel;
6969
private boolean firstTimeCreated = true;

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/ui/webapp/deploysetting/WebAppSettingPanel.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,12 @@ public void customize(JList list, Artifact artifact, int index, boolean isSelect
325325
private void setupArtifactCombo(List<Artifact> artifacts) {
326326
isCbArtifactInited = false;
327327
cbArtifact.removeAllItems();
328-
for (Artifact artifact: artifacts) {
329-
cbArtifact.addItem(artifact);
330-
if (Comparing.equal(artifact.getOutputFilePath(), webAppConfiguration.getTargetPath())) {
331-
cbArtifact.setSelectedItem(artifact);
328+
if (null != artifacts) {
329+
for (Artifact artifact: artifacts) {
330+
cbArtifact.addItem(artifact);
331+
if (Comparing.equal(artifact.getOutputFilePath(), webAppConfiguration.getTargetPath())) {
332+
cbArtifact.setSelectedItem(artifact);
333+
}
332334
}
333335
}
334336
cbArtifact.setVisible(true);

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/MavenRunTaskUtil.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ public static MavenProject getMavenProject(Project project) {
6060

6161
public static List<Artifact> collectProjectArtifact(@NotNull Project project) {
6262
ArtifactType warArtifactType = ArtifactType.findById(MavenConstants.TYPE_WAR);
63+
if (warArtifactType == null) {
64+
return null;
65+
}
6366
return (List<Artifact>) ArtifactManager.getInstance(project).getArtifactsByType(warArtifactType);
6467
}
6568

0 commit comments

Comments
 (0)