Author: echatellier Date: 2010-06-04 14:27:37 +0200 (Fri, 04 Jun 2010) New Revision: 93 Url: http://nuiton.org/repositories/revision/wikitty/93 Log: If Stmts Must Use Braces Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-06-04 12:20:17 UTC (rev 92) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-06-04 12:27:37 UTC (rev 93) @@ -1,11 +1,7 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** * <!-- Start of user code for Between --> * @@ -118,15 +114,17 @@ final Between between = (Between) other; if ((element == null && between.getElement() != null) - || (element != null && !element.equals(between.getElement()))) + || (element != null && !element.equals(between.getElement()))) { return false; - if ((min == null && between.getMin() != null) - || (min != null && !min.equals(between.getMin()))) + } + if ((min == null && between.getMin() != null) + || (min != null && !min.equals(between.getMin()))) { return false; + } if ((max == null && between.getMax() != null) - || (max != null && !max.equals(between.getMax()))) + || (max != null && !max.equals(between.getMax()))) { return false; - + } return true; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-06-04 12:20:17 UTC (rev 92) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-06-04 12:27:37 UTC (rev 93) @@ -1,11 +1,7 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** * <!-- Start of user code for BinaryOperator --> * @@ -96,12 +92,13 @@ if ((element == null && binaryOperator.getElement() != null) || (element != null && !element.equals(binaryOperator - .getElement()))) + .getElement()))) { return false; + } if ((value == null && binaryOperator.getValue() != null) - || (value != null && !value.equals(binaryOperator.getValue()))) + || (value != null && !value.equals(binaryOperator.getValue()))) { return false; - + } return true; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-06-04 12:20:17 UTC (rev 92) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-06-04 12:27:37 UTC (rev 93) @@ -1,11 +1,7 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** * <!-- Start of user code for Not --> * @@ -78,8 +74,9 @@ if ((restriction == null && not.getRestriction() != null) || (restriction != null && !restriction.equals(not - .getRestriction()))) + .getRestriction()))) { return false; + } return true; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-06-04 12:20:17 UTC (rev 92) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-06-04 12:27:37 UTC (rev 93) @@ -1,11 +1,7 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; -// End of user code for import - /** * <!-- Start of user code for RestrictionDto --> * @@ -74,8 +70,9 @@ final Restriction restrictionDto = (Restriction) other; if ((name == null && restrictionDto.getName() != null) - || (name != null && !name.equals(restrictionDto.getName()))) + || (name != null && !name.equals(restrictionDto.getName()))) { return false; + } return true; }