diff --git a/docs/manual/CoreTasks/conditions.html b/docs/manual/CoreTasks/conditions.html index 9c0eb006a..ff6f4f366 100644 --- a/docs/manual/CoreTasks/conditions.html +++ b/docs/manual/CoreTasks/conditions.html @@ -213,7 +213,7 @@ or the filenames match the answer is so obvious the detailed test is omitted.

contains

-

Tests whether the a given Strings contains another one.

+

Tests whether a string contains another one.

@@ -238,6 +238,46 @@ or the filenames match the answer is so obvious the detailed test is omitted.
Attribute
+

istrue

+

Tests whether a string equals any of the ant definitions of true, +that is "true","yes", or "on"

+ + + + + + + + + + + +
AttributeDescriptionRequired
valuevalue to testYes
+
+    <istrue value="${someproperty}" />
+    <istrue value="false" />
+
+ +

isfalse

+

Tests whether a string is not true, the negation of <istrue> +

+ + + + + + + + + + + +
AttributeDescriptionRequired
valuevalue to testYes
+
+    <isfalse value="${someproperty}" />
+    <isfalse value="false" />
+
+

Copyright © 2001-2002 Apache Software Foundation. All rights Reserved.

diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java index 2c5f55be8..79c51b062 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java @@ -152,36 +152,50 @@ public abstract class ConditionBase extends ProjectComponent { /** * Add an <isset> condition. * - * @since 1.2, Ant 1.5 + * @since Ant 1.5 */ public void addIsSet(IsSet i) {conditions.addElement(i);} /** * Add an <http> condition. * - * @since 1.7, Ant 1.5 + * @since Ant 1.5 */ public void addHttp(Http h) {conditions.addElement(h);} /** * Add a <socket> condition. * - * @since 1.7, Ant 1.5 + * @since Ant 1.5 */ public void addSocket(Socket s) {conditions.addElement(s);} /** * Add a <filesmatch> condition. * - * @since 1.8, Ant 1.5 + * @since Ant 1.5 */ public void addFilesMatch(FilesMatch test) {conditions.addElement(test);} /** - * Add a <filesmatch> condition. + * Add a <contains> condition. * - * @since 1.10, Ant 1.5 + * @since Ant 1.5 */ public void addContains(Contains test) {conditions.addElement(test);} - + + /** + * Add a <istrue> condition. + * + * @since Ant 1.5 + */ + public void addIsTrue(IsTrue test) {conditions.addElement(test);} + + /** + * Add a <isfalse> condition. + * + * @since Ant 1.5 + */ + public void addIsFalse(IsFalse test) {conditions.addElement(test);} + } diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java new file mode 100644 index 000000000..c8f657cb3 --- /dev/null +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java @@ -0,0 +1,91 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Ant", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + */ + +package org.apache.tools.ant.taskdefs.condition; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ProjectComponent; + +/** + * Condition that tests whether a given string evals to false + * + * @author Steve Loughran + * @since Ant 1.5 + */ +public class IsFalse extends ProjectComponent implements Condition { + /** + * what we eval + */ + private Boolean value=null; + + /** + * set the value to be tested; let ant eval it to true/false + */ + public void setValue(boolean value) { + this.value = new Boolean(value); + } + + /** + * return the inverted value; + * @throws BuildException if someone forgot to spec a value + */ + public boolean eval() throws BuildException { + if (value == null) { + throw new BuildException("Nothing to test for falsehood"); + } + return !value.booleanValue(); + } + +} + diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java new file mode 100644 index 000000000..0dfd9f5ad --- /dev/null +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java @@ -0,0 +1,91 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Ant", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + */ + +package org.apache.tools.ant.taskdefs.condition; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ProjectComponent; + +/** + * Condition that tests whether a given string evals to true + * + * @author Steve Loughran + * @since Ant 1.5 + */ +public class IsTrue extends ProjectComponent implements Condition { + /** + * what we eval + */ + private Boolean value=null; + + /** + * set the value to be tested; let ant eval it to true/false + */ + public void setValue(boolean value) { + this.value = new Boolean(value); + } + + /** + * return the value; + * @throws BuildException if someone forgot to spec a value + */ + public boolean eval() throws BuildException { + if (value == null) { + throw new BuildException("Nothing to test for truth"); + } + return value.booleanValue(); + } + +} +