ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/conditions/test and.ant AndConditionTestCase.java
Date Sun, 23 Jun 2002 10:44:41 GMT
adammurdoch    2002/06/23 03:44:41

  Modified:    framework/src/java/org/apache/myrmidon/framework/conditions
                        AndCondition.java
               framework/src/test/org/apache/myrmidon/framework/conditions/test
                        and.ant AndConditionTestCase.java
  Log:
  Make <and> condition into a <condition-set> data type.
  
  Revision  Changes    Path
  1.2       +4 -2      jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
  
  Index: AndCondition.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AndCondition.java	14 Apr 2002 09:30:14 -0000	1.1
  +++ AndCondition.java	23 Jun 2002 10:44:40 -0000	1.2
  @@ -10,6 +10,7 @@
   import java.util.ArrayList;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.framework.DataType;
   
   /**
    * &lt;and&gt; condition container. <p>
  @@ -21,9 +22,10 @@
    * @version $Revision$
    *
    * @ant.type type="condition" name="and"
  + * @ant.data-type name="condition-set"
    */
   public class AndCondition
  -    implements Condition
  +    implements Condition, DataType
   {
       private final ArrayList m_conditions = new ArrayList();
   
  
  
  
  1.2       +10 -0     jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/conditions/test/and.ant
  
  Index: and.ant
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/conditions/test/and.ant,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- and.ant	14 Apr 2002 09:33:13 -0000	1.1
  +++ and.ant	23 Jun 2002 10:44:41 -0000	1.2
  @@ -37,4 +37,14 @@
           </assert>
       </target>
   
  +    <!-- Check <and> condition can be used as a <condition-set> data type
-->
  +    <target name="condition-set">
  +        <condition-set id="cond">
  +            <true/>
  +        </condition-set>
  +        <assert>
  +            <condition-ref id="cond"/>
  +        </assert>
  +    </target>
  +
   </project>
  
  
  
  1.4       +2 -1      jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/conditions/test/AndConditionTestCase.java
  
  Index: AndConditionTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/conditions/test/AndConditionTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AndConditionTestCase.java	5 Jun 2002 07:58:22 -0000	1.3
  +++ AndConditionTestCase.java	23 Jun 2002 10:44:41 -0000	1.4
  @@ -33,5 +33,6 @@
           executeTarget( projectFile, "empty" );
           executeTarget( projectFile, "truth-table" );
           executeTarget( projectFile, "lazy" );
  +        executeTarget( projectFile, "condition-set" );
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message