Browse Source

ContextException - lets kill you!

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271479 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
07c3b5de55
1 changed files with 6 additions and 26 deletions
  1. +6
    -26
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java

+ 6
- 26
proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java View File

@@ -8,7 +8,6 @@
package org.apache.myrmidon.framework; package org.apache.myrmidon.framework;


import org.apache.avalon.framework.component.Component; 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.TaskContext;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;


@@ -45,35 +44,16 @@ public class Condition
{ {
boolean result = false; 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 ) if( !m_isIfCondition )
{ {
result = !result; result = !result;


Loading…
Cancel
Save