donaldp 02/01/24 03:36:54
Modified:
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
Resources.properties DefaultExecutor.java
Log:
Made tasks receive contexts directly rather than through Contextualizable
interface as all tasks will most likely use the context in some fashion
Also fixed up misnamed error message
Revision Changes Path
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Resources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resources.properties 19 Nov 2001 12:37:25 -0000 1.2
+++ Resources.properties 24 Jan 2002 11:36:53 -0000 1.3
@@ -10,7 +10,7 @@
no-create.error=Unable to create task {0}.
config.error=Error configuring task {0} at {1} (Reason: {2}).
compose.error=Error composing task {0} at {1} (Reason: {2}).
-context.error=Error contextualizing task {0} at {1} (Reason: {2}).
+contextualize.error=Error contextualizing task {0} at {1} (Reason: {2}).
dispose.error=Error disposing task {0} at {1} (Reason: {2}).
init.error=Error initializing task {0} at {1} (Reason: {2}).
logger.error=Error setting logger for task {0} at {1} (Reason: {2}).
1.19 +2 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
Index: DefaultExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultExecutor.java 20 Jan 2002 17:32:56 -0000 1.18
+++ DefaultExecutor.java 24 Jan 2002 11:36:53 -0000 1.19
@@ -143,15 +143,12 @@
{
try
{
- if( task instanceof Contextualizable )
- {
- ( (Contextualizable)task ).contextualize( context );
- }
+ task.contextualize( context );
}
catch( final Throwable throwable )
{
final String message =
- REZ.getString( "compose.error",
+ REZ.getString( "contextualize.error",
taskModel.getName(),
taskModel.getLocation(),
throwable.getMessage() );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>