Skip to content

Commit d8af52d

Browse files
fix validation logic of AzureIntegerInput
1 parent 887fc12 commit d8af52d

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import javax.annotation.Nonnull;
1414
import javax.annotation.Nullable;
15+
import java.util.Objects;
1516

1617
public class AzureIntegerInput extends BaseAzureTextInput<Integer> {
1718

@@ -39,8 +40,12 @@ public void setValue(final Integer val) {
3940

4041
@Nonnull
4142
public AzureValidationInfo doValidate(Integer value) {
42-
if (value < minValue || value > maxValue) {
43+
if (Objects.nonNull(minValue) && Objects.nonNull(maxValue) && (value < minValue || value > maxValue)) {
4344
return AzureValidationInfo.error(String.format("Value should be in range [%d, %d]", minValue, maxValue), this);
45+
} else if (Objects.nonNull(minValue) && value < minValue) {
46+
return AzureValidationInfo.error(String.format("Value should be >= %d", minValue), this);
47+
} else if (Objects.nonNull(maxValue) && value > maxValue) {
48+
return AzureValidationInfo.error(String.format("Value should be <= %d", maxValue), this);
4449
} else {
4550
return AzureValidationInfo.success(this);
4651
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
package com.microsoft.azure.toolkit.intellij.common;
77

8-
import javax.annotation.Nullable;
8+
import javax.annotation.Nonnull;
99
import javax.swing.*;
1010

1111
public class AzureTextInput extends BaseAzureTextInput<String> {
1212
public AzureTextInput() {
13-
this(null);
13+
super();
1414
}
1515

16-
public AzureTextInput(@Nullable JTextField comp) {
16+
public AzureTextInput(@Nonnull JTextField comp) {
1717
super(comp);
1818
}
1919

0 commit comments

Comments
 (0)