Lior Vernia has uploaded a new change for review. Change subject: webadmin: Fix subnet format error message ......................................................................
webadmin: Fix subnet format error message Previous message talked of "IP address", now of subnet. Change-Id: I105493febb618cbd0e9bb20991e064cb9c81c428 Bug-Url: https://bugzilla.redhat.com/1062603 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 3 files changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/25433/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java index 97d146d..94354db 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IpAddressValidation.java @@ -4,7 +4,7 @@ public class IpAddressValidation extends RegexValidation { - protected static final String IP_ADDRESS_REGEX = + public static final String IP_ADDRESS_REGEX = "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"; //$NON-NLS-1$ public IpAddressValidation() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java index 85d089e..3ee7181 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java @@ -7,10 +7,8 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; -@SuppressWarnings("unused") -public class SubnetMaskValidation implements IValidation +public class SubnetMaskValidation extends RegexValidation { - private final static IpAddressValidation IP_VALIDATOR = new IpAddressValidation(); private final static Set<Integer> CORRECT_RANGE = new HashSet<Integer>(); private final static List<String> reasons = new ArrayList<String>(); @@ -28,9 +26,14 @@ reasons.add(ConstantsManager.getInstance().getConstants().subnetMaskIsNotValid()); } + public SubnetMaskValidation() { + setExpression("^" + IpAddressValidation.IP_ADDRESS_REGEX + "$"); //$NON-NLS-1$ $NON-NLS-2$ + setMessage(ConstantsManager.getInstance().getConstants().thisFieldMustContainSubnetInFormatMsg()); + } + @Override public ValidationResult validate(Object value) { - ValidationResult ipValidation = IP_VALIDATOR.validate(value); + ValidationResult ipValidation = super.validate(value); if (!ipValidation.getSuccess()) { return ipValidation; } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index bc04564..b3214e8 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -842,6 +842,9 @@ @DefaultStringValue("This field must contain an IP address in format xxx.xxx.xxx.xxx") String thisFieldMustContainIPaddressInFormatMsg(); + @DefaultStringValue("This field must contain a subnet in format xxx.xxx.xxx.xxx") + String thisFieldMustContainSubnetInFormatMsg(); + @DefaultStringValue("This field must contain a CIDR in format xxx.xxx.xxx.xxx/yy") String thisFieldMustContainCidrInFormatMsg(); -- To view, visit http://gerrit.ovirt.org/25433 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I105493febb618cbd0e9bb20991e064cb9c81c428 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
