Author: echatellier Date: 2010-06-21 11:21:32 +0200 (Mon, 21 Jun 2010) New Revision: 137 Url: http://nuiton.org/repositories/revision/wikitty/137 Log: Remove generation tags in comment and import. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 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/Contains.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,16 +1,9 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; import java.util.List; -// End of user code for import - /** - * <!-- Start of user code for And --> - * - * <p> * And operator is used to build conjunctive restriction for request on content. * It take at least 2 args. <br> * <br> @@ -21,9 +14,6 @@ * <li>RestrictionHelper.and( * my_JavaUtilList_Of_Restriction_Witch_Size_Is_Upper_Than2 )</li> * </ul> - * </p> - * - * <!-- End of user code for And --> */ public class And extends Restriction implements Serializable { @@ -45,6 +35,7 @@ * @param restrictions */ public And(List<Restriction> restrictions) { + this(); this.restrictions = restrictions; } 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-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-06-21 09:21:32 UTC (rev 137) @@ -3,16 +3,10 @@ import java.io.Serializable; /** - * <!-- Start of user code for Between --> - * - * <p> * Between operator is used to build restriction containing "min < element * < max" where element could be a Integer, a Float or a Date. <br> * <br> * For example, use: RestrictionHelper.between( myElement , "15.5" , "22.5" ) - * </p> - * - * <!-- End of user code for Between --> */ public class Between extends Restriction implements Serializable { 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-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-06-21 09:21:32 UTC (rev 137) @@ -3,14 +3,8 @@ import java.io.Serializable; /** - * <!-- Start of user code for BinaryOperator --> - * - * <p> * This class is an abstract class that's used to factor each operator that * handle two parameters (=, !=, <, <=, >, >=, end, begin). - * </p> - * - * <!-- End of user code for BinaryOperator --> */ public class BinaryOperator extends Restriction implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,16 +1,9 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; import java.util.List; -// End of user code for import - /** - * <!-- Start of user code for Contains --> - * - * <p> * Contains operator is used to build restriction containing "(element like * *value1 or element like value1*) and (element like *value2 or element like * value2*)" where element could be a String, a multimedia, a text or an xhtml @@ -23,9 +16,6 @@ * <li>RestrictionHelper.contains( myElement , * a_list_containing_at_least_one_string )</li> * </ul> - * </p> - * - * <!-- End of user code for Contains --> */ public class Contains extends Restriction implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java 2010-06-21 09:21:32 UTC (rev 137) @@ -19,7 +19,8 @@ import java.io.Serializable; /** - * Search on field + * Search on field. + * * @author ruchaud */ public class Element implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ 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 EndsWith --> - * - * <p> * EndsWith operator is used to build restriction containing "element like * *value" where element could be a String, a multimedia, a text or an xhtml * <br> * <br> * For example, use: RestrictionHelper.end( myElement , "value" ) - * </p> - * - * <!-- End of user code for EndsWith --> */ public class EndsWith extends BinaryOperator implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ 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 Equals --> - * - * <p> * Equals operator is used to build restriction containing "element == value" * where element could be an Id, a String, a multimedia, a closed list, an * Integer, a Float or a Date. <br> * <br> * For example, use: RestrictionHelper.eq( myElement , "REF1234567890" ) - * </p> - * - * <!-- End of user code for Equals --> */ public class Equals extends BinaryOperator implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ 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 Greater --> - * - * <p> * Greater operator is used to build restriction containing "element > value" * where element could be a Integer, a Float or a Date. <br> * <br> * For example, use: RestrictionHelper.less( myElement , * RestrictionHelper.DATE_FORMAT.format(new Date()) ) - * </p> - * - * <!-- End of user code for Greater --> */ public class Greater extends BinaryOperator implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ 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 GreaterOrEqual --> - * - * <p> * GreatOrEqual operator is used to build restriction containing "element >= * value" where element could be a Integer, a Float or a Date. <br> * <br> * For example, use: RestrictionHelper.greatEq( myElement , * RestrictionHelper.DATE_FORMAT.format(new Date()) ) - * </p> - * - * <!-- End of user code for GreaterOrEqual --> */ public class GreaterOrEqual extends BinaryOperator implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,16 +1,9 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; import java.util.List; -// End of user code for import - /** - * <!-- Start of user code for Contains --> - * - * <p> * Contains operator is used to build restriction containing "(element like * *value1 or element like value1*) and (element like *value2 or element like * value2*)" where element could be a String, a multimedia, a text or an xhtml @@ -23,9 +16,6 @@ * <li>RestrictionHelper.contains( myElement , * a_list_containing_at_least_one_string )</li> * </ul> - * </p> - * - * <!-- End of user code for Contains --> */ public class In extends Restriction implements Serializable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java 2010-06-21 09:21:32 UTC (rev 137) @@ -17,7 +17,8 @@ package org.nuiton.wikitty.search; /** - * Search keyword in all wikitty + * Search keyword in all wikitty. + * * @author ruchaud */ public class Keyword extends Restriction { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ 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 Less --> - * - * <p> * Less operator is used to build restriction containing "element < value" * where element could be a Integer, a Float or a Date. <br> * <br> * For example, use: RestrictionHelper.less( myElement , * RestrictionHelper.DATE_FORMAT.format(new Date()) ) - * </p> - * - * <!-- End of user code for Less --> */ public class Less extends BinaryOperator implements Serializable { @@ -34,8 +24,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ 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 LessOrEqual --> - * - * <p> * LessOrEqual operator is used to build restriction containing "element <= * value" where element could be a Integer, a Float or a Date. <br> * <br> * For example, use: RestrictionHelper.lessEq( myElement , * RestrictionHelper.DATE_FORMAT.format(new Date()) ) - * </p> - * - * <!-- End of user code for LessOrEqual --> */ public class LessOrEqual extends BinaryOperator implements Serializable { @@ -34,8 +24,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { 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-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-06-21 09:21:32 UTC (rev 137) @@ -3,17 +3,11 @@ import java.io.Serializable; /** - * <!-- Start of user code for Not --> - * - * <p> * Not operator is used to build negative restriction for request on content. * <br> * <br> * For example, use: RestrictionHelper.not( RestrictionHelper.eq( myElement , * "myValue" ) ) - * </p> - * - * <!-- End of user code for Not --> */ public class Not extends Restriction implements Serializable { @@ -59,8 +53,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ 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 NotEquals --> - * - * <p> * NotEquals operator is used to build restriction containing "element != value" * where element could be an Id, a String, a multimedia, a closed list, an * Integer, a Float or a Date. <br> * <br> * For example, use: RestrictionHelper.neq( myElement , "REF1234567890" ) - * </p> - * - * <!-- End of user code for NotEquals --> */ public class NotEquals extends BinaryOperator implements Serializable { @@ -34,8 +24,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,16 +1,9 @@ package org.nuiton.wikitty.search; -// Start of user code for import - import java.io.Serializable; import java.util.List; -// End of user code for import - /** - * <!-- Start of user code for Or --> - * - * <p> * Or operator is used to build disjunctive restriction for request on content. * It take at least 2 args. <br> * <br> @@ -21,9 +14,6 @@ * <li>RestrictionHelper.or( * my_JavaUtilList_Of_Restriction_Witch_Size_Is_Upper_Than2 )</li> * </ul> - * </p> - * - * <!-- End of user code for Or --> */ public class Or extends Restriction implements Serializable { @@ -69,8 +59,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { 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-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-06-21 09:21:32 UTC (rev 137) @@ -3,14 +3,8 @@ import java.io.Serializable; /** - * <!-- Start of user code for RestrictionDto --> - * - * <p> * This element is a symbolic interface implemented by all operators used to * request contents (And, Or, Not, Equals, NotEquals, EndsWith, ...). - * </p> - * - * <!-- End of user code for RestrictionDto --> */ public class Restriction implements Serializable { @@ -32,6 +26,7 @@ * @param name */ public Restriction(RestrictionName name) { + this(); this.name = name; } @@ -56,8 +51,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,6 +1,5 @@ package org.nuiton.wikitty.search; - /** * <p> * This enum contains all kind of restriction used to request content. It's used Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,17 +1,10 @@ package org.nuiton.wikitty.search; -// Start of user code for import - -// End of user code for import - /** - * <!-- Start of user code for SearchOperand --> - * <p> * Represents the possible operands for client search. The supported type of * each AttributeSearchDto depends of its type. - * </p> - * <!-- End of user code for SearchOperand --> */ public enum SearchOperand { - EQUALS, NOT_EQUALS, LESS, LESS_OR_EQUALS, GREATER, GREATER_OR_EQUALS, BEGINS_WITH, ENDS_WITH, CONTAINS, NOT_CONTAINS, BETWEEN + EQUALS, NOT_EQUALS, LESS, LESS_OR_EQUALS, GREATER, GREATER_OR_EQUALS, + BEGINS_WITH, ENDS_WITH, CONTAINS, NOT_CONTAINS, BETWEEN } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java 2010-06-21 09:21:32 UTC (rev 137) @@ -1,23 +1,13 @@ 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 StartsWith --> - * - * <p> * StartsWith operator is used to build restriction containing "element like * value*" where element could be a String, a multimedia, a text or an xhtml * <br> * <br> * For example, use: RestrictionHelper.start( myElement , "value" ) - * </p> - * - * <!-- End of user code for StartsWith --> */ public class StartsWith extends BinaryOperator implements Serializable { @@ -34,8 +24,7 @@ /** * Equality test based attributes values * - * @param value - * Value to compare + * @param other Value to compare */ public boolean equals(Object other) { if (this == other) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java 2010-06-21 08:25:48 UTC (rev 136) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java 2010-06-21 09:21:32 UTC (rev 137) @@ -2,8 +2,8 @@ public class SubSearch extends Search { - String foreignName; - Search parent; + protected String foreignName; + protected Search parent; public SubSearch(String foreignFieldName, Search search) { this.foreignName = foreignFieldName;