You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2014/12/29 16:52:49 UTC
svn commit: r1648376 - in /commons/proper/validator/trunk/src:
main/java/org/apache/commons/validator/routines/InetAddressValidator.java
test/java/org/apache/commons/validator/GenericValidatorImpl.java
Author: ggregory
Date: Mon Dec 29 15:52:49 2014
New Revision: 1648376
URL: http://svn.apache.org/r1648376
Log:
Convert control statement bodies to block.
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java?rev=1648376&r1=1648375&r2=1648376&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java Mon Dec 29 15:52:49 2014
@@ -75,7 +75,9 @@ public class InetAddressValidator implem
// verify that address conforms to generic IPv4 format
String[] groups = ipv4Validator.match(inet4Address);
- if (groups == null) return false;
+ if (groups == null) {
+ return false;
+ }
// verify that address subgroups are legal
for (int i = 0; i <= 3; i++) {
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java?rev=1648376&r1=1648375&r2=1648376&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java Mon Dec 29 15:52:49 2014
@@ -218,8 +218,9 @@ public class GenericValidatorImpl {
String dependTest = field.getVarValue("fieldTest[" + i + "]");
String dependTestValue = field.getVarValue("fieldValue[" + i + "]");
String dependIndexed = field.getVarValue("fieldIndexed[" + i + "]");
- if (dependIndexed == null)
+ if (dependIndexed == null) {
dependIndexed = "false";
+ }
String dependVal = null;
boolean this_required = false;
if (field.isIndexed() && dependIndexed.equalsIgnoreCase("true")) {
@@ -267,7 +268,9 @@ public class GenericValidatorImpl {
private static Class stringClass = new String().getClass();
private static boolean isString(Object o) {
- if (o == null) return true;
+ if (o == null) {
+ return true;
+ }
return (stringClass.isInstance(o));
}