From c1d66dbc0cb573a6afe5fcaea76e661622337a00 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Fri, 25 Jan 2002 11:18:49 +0000
Subject: [PATCH] Rebadge ContextException as a TaskException

Submitted By: "Adam Murdoch" <adammurdoch_ml@yahoo.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270846 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/java/org/apache/myrmidon/framework/Condition.java   | 5 +++--
 .../src/java/org/apache/myrmidon/framework/Pattern.java     | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
index 13240668f..c74f34f0f 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
@@ -45,7 +45,7 @@ public class Condition
     }
 
     public boolean evaluate( final TaskContext context )
-        throws ContextException
+        throws TaskException
     {
         boolean result = false;
 
@@ -66,8 +66,9 @@ public class Condition
                 }
             }
         }
-        catch( final TaskException te )
+        catch( final ContextException ce )
         {
+            // Unknown property
             result = false;
         }
         /*
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
index 550599c58..842bea1b8 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
@@ -9,10 +9,8 @@ package org.apache.myrmidon.framework;
 
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.Project;
+import org.apache.myrmidon.api.TaskException;
 
 /**
  * Basic data type for holding patterns.
@@ -103,7 +101,7 @@ public class Pattern
                 return getName();
             }
         }
-        catch( final ContextException ce )
+        catch( final TaskException te )
         {
             //ignore for the moment
         }