cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework Condition.java

[donaldp]

donaldp     02/02/21 01:37:52

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/framework
                        Condition.java
  Log:
  ContextException - lets kill you!
  
  Revision  Changes    Path
  1.13      +7 -27     
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
  
  Index: Condition.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Condition.java    7 Feb 2002 13:01:02 -0000       1.12
  +++ Condition.java    21 Feb 2002 09:37:52 -0000      1.13
  @@ -8,7 +8,6 @@
   package org.apache.myrmidon.framework;
   
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.context.ContextException;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
   
  @@ -16,7 +15,7 @@
    * Class representing a condition.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
  - * @version $Revision: 1.12 $ $Date: 2002/02/07 13:01:02 $
  + * @version $Revision: 1.13 $ $Date: 2002/02/21 09:37:52 $
    */
   public class Condition
       implements Component
  @@ -45,35 +44,16 @@
       {
           boolean result = false;
   
  -        try
  +        final Object resolved = context.resolveValue( getCondition() );
  +        if( null != resolved )
           {
  -            final Object resolved = context.resolveValue( getCondition() );
  -            if( null != resolved )
  +            final Object object = context.getProperty( resolved.toString() );
  +            if( object != null && !object.toString().equals( "false" ) )
               {
  -                final Object object = context.get( resolved );
  -                final String string = object.toString();
  -                if( null == string || string.equals( "false" ) )
  -                {
  -                    result = false;
  -                }
  -                else
  -                {
  -                    result = true;
  -                }
  +                result = true;
               }
           }
  -        catch( final ContextException ce )
  -        {
  -            // Unknown property
  -            result = false;
  -        }
  -        /*
  -                catch( final PropertyException pe )
  -                {
  -                    final String message = REZ.getString( 
"condition.no-resolve.error", m_condition );
  -                    throw new ContextException( message, pe );
  -                }
  -        */
  +
           if( !m_isIfCondition )
           {
               result = !result;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>