Update of /var/cvs/src/org/mmbase/storage/search/implementation
In directory james.mmbase.org:/tmp/cvs-serv24610
Modified Files:
BasicCompositeConstraint.java
Log Message:
using java 1.5 varargs, changed the constructor just a bit, to make it
possible to make a bit more concisely use of this
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/search/implementation
Index: BasicCompositeConstraint.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/BasicCompositeConstraint.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- BasicCompositeConstraint.java 11 Feb 2007 14:46:13 -0000 1.10
+++ BasicCompositeConstraint.java 12 Apr 2008 14:10:31 -0000 1.11
@@ -17,7 +17,7 @@
* Basic implementation.
*
* @author Rob van Maris
- * @version $Id: BasicCompositeConstraint.java,v 1.10 2007/02/11 14:46:13
nklasens Exp $
+ * @version $Id: BasicCompositeConstraint.java,v 1.11 2008/04/12 14:10:31
michiel Exp $
* @since MMBase-1.7
*/
public class BasicCompositeConstraint extends BasicConstraint implements
CompositeConstraint {
@@ -35,7 +35,7 @@
* @param logicalOperator The logical operator.
* @throws IllegalArgumentException when an invalid argument is supplied.
*/
- public BasicCompositeConstraint(int logicalOperator) {
+ public BasicCompositeConstraint(int logicalOperator, Constraint... childs)
{
// Invalid argument, must be either LOGICAL_AND or LOGICAL_OR.
if (logicalOperator != CompositeConstraint.LOGICAL_AND
&& logicalOperator != CompositeConstraint.LOGICAL_OR) {
@@ -45,6 +45,9 @@
+ CompositeConstraint.LOGICAL_OR));
}
this.logicalOperator = logicalOperator;
+ for (Constraint child : childs) {
+ addChild(child);
+ }
}
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
